diff --git a/assets/Scripts/chat18x/manager/ChatHistoryManager.ts b/assets/Scripts/chat18x/manager/ChatHistoryManager.ts
index d4d6a139..0e9057e8 100644
--- a/assets/Scripts/chat18x/manager/ChatHistoryManager.ts
+++ b/assets/Scripts/chat18x/manager/ChatHistoryManager.ts
@@ -41,10 +41,22 @@ export class ChatHistoryManager {
   public saveHistory(roleId: number, messages: ChatMessage[]): void {
     const key = `chat_history_${roleId}`;
     try {
+      // 检查是否已存在历史记录以保留创建时间
+      let createdAt = Date.now();
+      const existingData = sys.localStorage.getItem(key);
+      if (existingData) {
+        try {
+          const existingHistory: ChatHistory = JSON.parse(existingData);
+          createdAt = existingHistory.createdAt;
+        } catch (parseError) {
+          console.warn(`Failed to parse existing history for role ${roleId}, using current time as createdAt`);
+        }
+      }
+
       const history: ChatHistory = {
         roleId: roleId,
         messages: messages,
-        createdAt: Date.now(),
+        createdAt: createdAt,
         updatedAt: Date.now(),
       };
 
@@ -200,6 +212,31 @@ export class ChatHistoryManager {
     }
   }
 
+  /**
+   * 获取指定角色的最后聊天时间
+   * @param roleId 角色ID
+   * @returns 最后聊天时间戳，如果没有历史记录则返回null
+   */
+  public getLastChatTime(roleId: number): number | null {
+    const key = `chat_history_${roleId}`;
+    try {
+      const data = sys.localStorage.getItem(key);
+      if (data) {
+        const history: ChatHistory = JSON.parse(data);
+        if (history.messages && history.messages.length > 0) {
+          // 获取最后一条消息的时间戳
+          const lastMessage = history.messages[history.messages.length - 1];
+          return lastMessage.timestamp || history.updatedAt;
+        }
+        // 如果有历史但没有消息，返回创建时间
+        return history.createdAt;
+      }
+    } catch (error) {
+      console.error(`Failed to get last chat time for role ${roleId}:`, error);
+    }
+    return null;
+  }
+
   /**
    * 从远程服务器下载历史（预留接口）
    * @param roleId 角色ID
diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts
index 46fec887..dff3f727 100644
--- a/assets/Scripts/chat18x/manager/NavigationManager.ts
+++ b/assets/Scripts/chat18x/manager/NavigationManager.ts
@@ -23,7 +23,7 @@ export enum PageTransitionType {
 export enum PanelType {
   THEME = "ThemePanel",
   GIRL_DETAIL = "GirlDetailPanel",
-  CHAT = "ChatPanel",
+  PAST_GIRL_LIST = "PastGirlListPanel",
   PERSONAL = "PersonalPanel",
 }
 
@@ -51,18 +51,14 @@ export class NavigationManager {
 
   // NavigationPanel相关属性
   private navigationPanel: any = null; // NavigationPanel实例引用
-  private currentActivePanelType: PanelType = PanelType.THEME;
-  private currentActivePanel: Node;
+  private currentActivePanelType: PanelType = PanelType.PAST_GIRL_LIST;
+  private currentActivePanel: Node = null; // 初始化为null
   private panelCache: Map<PanelType, Node> = new Map(); // 面板缓存
-  private currentVisiblePanel: Node = null;
 
   // 选中的角色相关信息
   private selectedGirlId: number = 10002; // 当前选中的角色ID
   private selectedCategoryId: number = -1; // 当前选中的主题ID
 
-  private themePanel: ThemePanel = null;
-  private girlListPanel: GirlListPanel = null;
-
   private static LastSelectGirlID = "LastSelectGirlID";
 
   /**
@@ -119,22 +115,27 @@ export class NavigationManager {
    * @param panelType 目标面板类型
    */
   public switchToPanel(panelType: PanelType, force: boolean = false): Node {
-    if (this.currentActivePanelType === panelType && !force) {
-      if (panelType === PanelType.THEME) {
-        this.girlListPanel?.hide();
-      }
+    if (!panelType) {
+      console.error("[NavigationManager] switchToPanel: panelType is invalid");
+      return null;
+    }
 
-      return;
+    if (this.currentActivePanelType === panelType && !force) {
+      console.log(`[NavigationManager] Already on ${panelType}, skipping switch`);
+      return this.currentActivePanel;
     }
 
     if (!this.navigationPanel) {
       console.warn(
         "[NavigationManager] NavigationPanel not registered, fallback to direct ViewManager call"
       );
-      this.fallbackSwitchPanel(panelType);
-      return;
+      //this.fallbackSwitchPanel(panelType);
+      return null;
     }
 
+    // 切换面板前先关闭所有弹窗
+    this.closeAllPopups();
+
     // 通知NavigationPanel显示加载状态
     this.navigationPanel.showLoading?.();
 
@@ -147,28 +148,17 @@ export class NavigationManager {
     const showDirection = isMovingRight ? "right" : "left";
 
     // 隐藏当前面板（包括子页面）
-    this.hideCurrentPanelWithChildren(hideDirection);
+    if (!this.currentActivePanel || !this.currentActivePanel.isValid) {
+      return;
+    }
+    this.hidePanelWithAnimation(this.currentActivePanel, hideDirection);
 
     // 加载并显示目标面板
     this.loadOrGetPanel(panelType, (panel: Node) => {
+      // 清理当前面板的subPanel（在hidePanelWithAnimation中已经清理，这里不需要重复）
+
       this.currentActivePanelType = panelType;
-      this.currentVisiblePanel = panel;
 
-      if (this.subPanelDic.has(this.currentActivePanel)) {
-        //如果有子页面，关闭掉
-        let subs = this.subPanelDic.get(this.currentActivePanel);
-        if (subs) {
-          subs.forEach((n) => {
-            if (n.name != "") {
-              n.getComponent(li_BaseView)?.close();
-            } else {
-              //n.destroy();
-            }
-          });
-        }
-
-        this.subPanelDic.delete(this.currentActivePanel);
-      }
       // 更新NavigationPanel按钮状态
       this.navigationPanel.updateButtonStates?.(panelType);
 
@@ -181,17 +171,217 @@ export class NavigationManager {
   }
 
   private subPanelDic: Map<Node, Node[]> = new Map();
+  private subPanelMapping: Map<Node, PanelType> = new Map();
+
+  // 弹窗管理相关属性
+  private popupPanels: Set<Node> = new Set(); // 管理所有打开的弹窗
+
+  /**
+   * 统一的subPanel清理方法
+   * @param basePanel 主面板节点
+   * @param destroyPanels 是否销毁面板，默认为true
+   */
+  private clearSubPanels(basePanel: Node, destroyPanels: boolean = true): void {
+    if (!basePanel || !basePanel.isValid) {
+      return;
+    }
+
+    const subPanels = this.subPanelDic.get(basePanel);
+    if (!subPanels || subPanels.length === 0) {
+      return;
+    }
+
+    // 清理所有子面板
+    for (let i = subPanels.length - 1; i >= 0; i--) {
+      const subPanel = subPanels[i];
+      if (subPanel && subPanel.isValid) {
+        // 清理subPanelMapping
+        this.subPanelMapping.delete(subPanel);
+
+        if (destroyPanels) {
+          const baseView = subPanel.getComponent(li_BaseView);
+          if (baseView) {
+            baseView.close();
+          } else {
+            subPanel.destroy();
+          }
+        }
+      }
+    }
+
+    // 清理subPanelDic
+    this.subPanelDic.delete(basePanel);
+  }
   public openSubPanel(panelName: string, basePanel: Node, data: any = null) {
+    if (!panelName) {
+      console.error("[NavigationManager] openSubPanel: panelName is empty");
+      return;
+    }
+
+    if (!basePanel || !basePanel.isValid) {
+      console.error("[NavigationManager] openSubPanel: basePanel is invalid");
+      return;
+    }
+
     const callback = (n: Node) => {
+      if (!n || !n.isValid) {
+        console.error("[NavigationManager] openSubPanel: created panel is invalid");
+        return;
+      }
+
       if (!this.subPanelDic.has(basePanel)) {
         this.subPanelDic.set(basePanel, []);
       }
-      this.subPanelDic.get(basePanel).push(n);
+
+      const subPanels = this.subPanelDic.get(basePanel);
+      subPanels.push(n);
+
+      const basePanelType = this.getPanelType(basePanel);
+      if (basePanelType) {
+        this.subPanelMapping.set(n, basePanelType);
+      } else {
+        console.warn(`[NavigationManager] 无法确定basePanel类型: ${basePanel.name}`);
+      }
+
+      n.setParent(basePanel, true);
     };
 
     ViewManager.I.openBundlesView(panelName, data, callback);
   }
 
+  /**
+   * 打开弹窗面板
+   * @param panelName 弹窗面板名称
+   * @param data 传递的数据
+   * @param callback 可选的回调函数
+   */
+  public openPopupPanel(panelName: string, data: any = null, callback?: Function): void {
+    if (!panelName) {
+      console.error("[NavigationManager] openPopupPanel: panelName is empty");
+      return;
+    }
+
+    const popupCallback = (panel: Node) => {
+      if (!panel || !panel.isValid) {
+        console.error("[NavigationManager] openPopupPanel: created panel is invalid");
+        return;
+      }
+
+      // 将弹窗添加到管理集合中
+      this.popupPanels.add(panel);
+      console.log(`[NavigationManager] Popup panel opened: ${panelName}, total popups: ${this.popupPanels.size}`);
+
+      if (callback) {
+        callback(panel);
+      }
+    };
+
+    ViewManager.I.openBundlesPopupView(panelName, data, popupCallback);
+  }
+
+  /**
+   * 关闭弹窗面板
+   * @param panel 要关闭的弹窗节点
+   */
+  public closePopupPanel(panel: Node): void {
+    if (!panel || !panel.isValid) {
+      console.warn("[NavigationManager] closePopupPanel: panel is invalid");
+      return;
+    }
+
+    // 从弹窗管理集合中移除
+    if (this.popupPanels.has(panel)) {
+      this.popupPanels.delete(panel);
+      console.log(`[NavigationManager] Popup panel closed: ${panel.name}, total popups: ${this.popupPanels.size}`);
+    }
+
+    // 关闭面板
+    try {
+      const baseView = panel.getComponent(li_BaseView);
+      if (baseView) {
+        baseView.close();
+      } else {
+        panel.destroy();
+      }
+    } catch (error) {
+      console.error("[NavigationManager] closePopupPanel error:", error);
+    }
+  }
+
+  /**
+   * 关闭所有弹窗
+   */
+  private closeAllPopups(): void {
+    if (this.popupPanels.size === 0) {
+      return;
+    }
+
+    console.log(`[NavigationManager] Closing all popups, count: ${this.popupPanels.size}`);
+
+    // 复制Set以避免在迭代过程中修改
+    const popupPanelsToClose = Array.from(this.popupPanels);
+
+    for (const panel of popupPanelsToClose) {
+      if (panel && panel.isValid) {
+        this.closePopupPanel(panel);
+      }
+    }
+
+    // 确保清空集合
+    this.popupPanels.clear();
+  }
+  public closeSubPanel(panel: Node | li_BaseView) {
+    if (!panel) {
+      console.warn("[NavigationManager] closeSubPanel: panel is null or undefined");
+      return;
+    }
+
+    let panelNode: Node;
+    if (panel instanceof Node) {
+      panelNode = panel;
+    } else {
+      panelNode = panel.node;
+    }
+
+    if (!panelNode || !panelNode.isValid) {
+      console.warn("[NavigationManager] closeSubPanel: panelNode is invalid");
+      return;
+    }
+
+    // 从subPanelMapping和subPanelDic中移除
+    if (this.subPanelMapping.has(panelNode)) {
+      const baseType = this.subPanelMapping.get(panelNode);
+      const baseNode = this.panelCache.get(baseType);
+
+      if (baseNode && this.subPanelDic.has(baseNode)) {
+        const subPanels = this.subPanelDic.get(baseNode);
+        const index = subPanels.indexOf(panelNode);
+        if (index !== -1) {
+          subPanels.splice(index, 1);
+          // 如果subPanels为空，删除整个条目
+          if (subPanels.length === 0) {
+            this.subPanelDic.delete(baseNode);
+          }
+        } else {
+          console.warn(`[NavigationManager] ${panelNode.name} 不在子页面列表中`);
+        }
+      }
+
+      this.subPanelMapping.delete(panelNode);
+    }
+
+    // 销毁或关闭panel
+    try {
+      if (panel instanceof Node) {
+        panel.destroy();
+      } else {
+        panel.close();
+      }
+    } catch (error) {
+      console.error("[NavigationManager] closeSubPanel error:", error);
+    }
+  }
+
   /**
    * 获取面板索引（用于动画方向计算）
    */
@@ -201,7 +391,7 @@ export class NavigationManager {
         return 0;
       case PanelType.GIRL_DETAIL:
         return 1;
-      case PanelType.CHAT:
+      case PanelType.PAST_GIRL_LIST:
         return 2;
       case PanelType.PERSONAL:
         return 3;
@@ -209,6 +399,26 @@ export class NavigationManager {
         return 0;
     }
   }
+  private getPanelType(node: Node): PanelType {
+    if (!node || !node.isValid) {
+      console.warn("[NavigationManager] getPanelType: node is invalid");
+      return null;
+    }
+
+    switch (node.name) {
+      case "ThemePanel":
+        return PanelType.THEME;
+      case "GirlDetailPanel":
+        return PanelType.GIRL_DETAIL;
+      case "PastGirlListPanel":
+        return PanelType.PAST_GIRL_LIST;
+      case "PersonalPanel":
+        return PanelType.PERSONAL;
+      default:
+        console.warn(`[NavigationManager] Unknown panel type for node: ${node.name}`);
+        return null;
+    }
+  }
 
   /**
    * 获取面板名称
@@ -224,8 +434,6 @@ export class NavigationManager {
     switch (panelType) {
       case PanelType.GIRL_DETAIL:
         return this.selectedGirlId; // 使用当前选中的角色ID
-      case PanelType.CHAT:
-        return { girlId: this.selectedGirlId }; // 使用当前选中的角色ID
       default:
         return null;
     }
@@ -242,6 +450,9 @@ export class NavigationManager {
     if (this.panelCache.has(panelType)) {
       const cachedPanel = this.panelCache.get(panelType);
       if (cachedPanel && cachedPanel.isValid) {
+        // 确保缓存panel的subPanel状态正确，清理可能残留的subPanel引用
+        this.clearSubPanels(cachedPanel, false); // 不销毁panel，只清理引用
+
         // 特殊处理：主题面板刷新（避免重复调用Show）
         if (panelType === PanelType.THEME) {
           const themePanel = cachedPanel.getComponent(ThemePanel);
@@ -268,72 +479,11 @@ export class NavigationManager {
     ViewManager.I.openBundlesView(panelName, openData, (panel: Node) => {
       if (panel && panel.isValid) {
         this.panelCache.set(panelType, panel);
-
-        if (panelName === "ThemePanel") {
-          this.themePanel = panel.getComponent(ThemePanel);
-        }
-
         callback(panel);
       }
     });
   }
 
-  /**
-   * 隐藏当前面板及其子页面
-   */
-  private hideCurrentPanelWithChildren(direction: "left" | "right") {
-    if (!this.currentVisiblePanel) {
-      return;
-    }
-
-    // 如果当前是ThemePanel，需要同时处理可能的子页面（GirlListPanel）
-    if (this.currentActivePanelType === PanelType.THEME) {
-      // 查找并隐藏GirlListPanel子页面
-      this.hideThemePanelChildren(direction);
-
-      // 隐藏ThemePanel主面板
-      this.hidePanelWithAnimation(this.currentVisiblePanel, direction);
-    } else {
-      // 其他面板直接隐藏
-      this.hidePanelWithAnimation(this.currentVisiblePanel, direction);
-    }
-  }
-
-  /**
-   * 隐藏ThemePanel的子页面
-   */
-  private hideThemePanelChildren(direction: "left" | "right") {
-    const themePanel = this.findThemePanelNode();
-    if (themePanel) {
-      // 获取子页面节点
-      const childPanel = this.getThemePanelChildNode(themePanel);
-      if (childPanel && childPanel.active) {
-        console.log(
-          "[NavigationManager] Hiding ThemePanel child with animation"
-        );
-        this.hidePanelWithAnimation(childPanel, direction);
-      }
-    }
-  }
-
-  /**
-   * 获取ThemePanel的子页面节点
-   */
-  private getThemePanelChildNode(themePanel: ThemePanel): Node | null {
-    try {
-      // ThemePanel存储子页面在currentChildPanel属性中
-      const childPanel = themePanel.getChildPanel();
-      if (childPanel) return childPanel.node;
-      return null;
-    } catch (error) {
-      console.error(
-        "[NavigationManager] Error getting child panel node:",
-        error
-      );
-      return null;
-    }
-  }
-
   /**
    * 隐藏面板动画
    */
@@ -347,16 +497,17 @@ export class NavigationManager {
       return;
     }
 
+    const animationCallback = () => {
+      panel.active = false;
+      // 使用统一的subPanel清理方法
+      this.clearSubPanels(panel, true);
+      callback && callback();
+    };
+
     if (direction === "left") {
-      UITransitionHelper.slideOutToLeft(panel, 0.3, () => {
-        panel.active = false;
-        callback && callback();
-      });
+      UITransitionHelper.slideOutToLeft(panel, 0.3, animationCallback);
     } else {
-      UITransitionHelper.slideOutToRight(panel, 0.3, () => {
-        panel.active = false;
-        callback && callback();
-      });
+      UITransitionHelper.slideOutToRight(panel, 0.3, animationCallback);
     }
   }
 
@@ -375,10 +526,6 @@ export class NavigationManager {
 
     panel.active = true;
 
-    if (panel.name === "ThemePanel" && this.girlListPanel) {
-      this.showPanelWithAnimation(this.girlListPanel.node, direction, callback);
-    }
-
     if (direction === "right") {
       UITransitionHelper.slideInFromRight(panel, 0.3, () => {
         callback && callback();
@@ -390,15 +537,6 @@ export class NavigationManager {
     }
   }
 
-  /**
-   * 后备切换方法（当NavigationPanel未注册时）
-   */
-  private fallbackSwitchPanel(panelType: PanelType): void {
-    const panelName = this.getPanelName(panelType);
-    const openData = this.getPanelData(panelType);
-    ViewManager.I.openBundlesView(panelName, openData);
-  }
-
   /**
    * 获取当前激活的面板类型
    */
@@ -440,152 +578,4 @@ export class NavigationManager {
   public getSelectedCategoryId(): number {
     return this.selectedCategoryId;
   }
-
-  /**
-   * 进入角色列表页面（作为 ThemePanel 的子页面）
-   *
-   * @param {number} themeId - 主题ID，用于筛选角色
-   *
-   * @example
-   * ```typescript
-   * NavigationManager.Instance.navigateToGirlList(1);
-   * ```
-   */
-  public navigateToGirlList(themeId: number): void {
-    if (themeId == null || themeId < 0) {
-      console.warn("Invalid theme ID for girl list navigation:", themeId);
-      return;
-    }
-
-    // 更新选中的主题ID
-    this.setSelectedCategoryId(themeId);
-
-    console.log(
-      `[NavigationManager] Navigating to girl list with theme ID: ${themeId}`
-    );
-
-    // 先检查是否已有GirlListPanel存在
-    const existingGirlListPanel = this.findExistingGirlListPanel();
-
-    if (existingGirlListPanel) {
-      // 如果面板已存在，重新显示并刷新数据
-      console.log("[NavigationManager] Reactivating existing GirlListPanel");
-      this.reactivateGirlListPanel(existingGirlListPanel);
-    } else {
-      // 如果面板不存在，创建新的
-      console.log("[NavigationManager] Creating new GirlListPanel");
-      ViewManager.I.openBundlesView(
-        "GirlListPanel",
-        {
-          themeId: themeId,
-          parentPanel: "ThemePanel", // 标记父页面
-        },
-        (girlListPanelNode) => {
-          this.girlListPanel = girlListPanelNode.getComponent(GirlListPanel);
-          // 获取 ThemePanel 实例并设置子页面关系
-          console.log(
-            "[NavigationManager] GirlListPanel opened, setting up parent-child relationship"
-          );
-          this.setupParentChildRelationship(girlListPanelNode);
-        }
-      );
-    }
-  }
-
-  /**
-   * 查找已存在的GirlListPanel
-   */
-  private findExistingGirlListPanel(): GirlListPanel {
-    if (this.girlListPanel) return this.girlListPanel;
-    else return null;
-  }
-
-  /**
-   * 重新激活已存在的GirlListPanel
-   */
-  private reactivateGirlListPanel(panel: GirlListPanel): void {
-    try {
-      // 重新激活面板
-      panel.node.active = true;
-
-      // 获取面板组件并刷新数据
-      //const girlListComponent = panelNode.getComponent("GirlListPanel");
-      if (panel) {
-        // 如果有刷新方法，调用它来更新主题数据
-        panel.refresh();
-        console.log(
-          "[NavigationManager] GirlListPanel reactivated with theme:",
-          this.selectedCategoryId
-        );
-      }
-
-      // 重新建立父子关系
-      this.setupParentChildRelationship(panel);
-    } catch (error) {
-      console.error(
-        "[NavigationManager] Error reactivating GirlListPanel:",
-        error
-      );
-    }
-  }
-
-  /**
-   * 建立父子页面关系的私有方法
-   * @private
-   * @param girlListPanelNode GirlListPanel 节点
-   */
-  private setupParentChildRelationship(girlListPanelNode: any): void {
-    try {
-      // 查找 ThemePanel 实例
-      const themePanel = this.findThemePanelNode();
-      if (themePanel) {
-        const girlListPanelComponent =
-          girlListPanelNode.getComponent(GirlListPanel);
-
-        if (themePanel && girlListPanelComponent) {
-          console.log(
-            "[NavigationManager] Setting up parent-child relationship"
-          );
-          this.themePanel.setChildPanel(girlListPanelComponent);
-        } else {
-          console.warn("[NavigationManager] Failed to get panel components");
-        }
-      } else {
-        console.warn("[NavigationManager] ThemePanel not found");
-      }
-    } catch (error) {
-      console.error(
-        "[NavigationManager] Error setting up parent-child relationship:",
-        error
-      );
-    }
-  }
-
-  /**
-   * 查找 ThemePanel 节点的私有方法
-   * @private
-   * @returns ThemePanel 节点或 null
-   */
-  private findThemePanelNode(): ThemePanel {
-    if (this.themePanel) return this.themePanel;
-    return null;
-  }
-
-  /**
-   * 处理导航时 ThemePanel 子页面的隐藏逻辑
-   * @private
-   */
-  private handleThemePanelChildPanelsOnNavigation(): void {
-    console.log(
-      "[NavigationManager] Handling ThemePanel child panels on navigation"
-    );
-
-    const themePanelNode = this.findThemePanelNode();
-    if (themePanelNode) {
-      if (themePanelNode && themePanelNode.hideChildPanel) {
-        console.log("[NavigationManager] Closing ThemePanel child panels");
-        themePanelNode.hideChildPanel();
-      }
-    }
-  }
 }
diff --git a/assets/Scripts/chat18x/ui/components/ImagePopup.ts b/assets/Scripts/chat18x/ui/components/ImagePopup.ts
index 5d7d97ec..b1cdddb9 100644
--- a/assets/Scripts/chat18x/ui/components/ImagePopup.ts
+++ b/assets/Scripts/chat18x/ui/components/ImagePopup.ts
@@ -17,6 +17,7 @@ import { GirlData } from "../../data/GirlData";
 import { EnvData } from "../../data/EnvData";
 import proto from "db://assets/Scripts/proto/proto.pb.js";
 import { GButton } from "../../../Main/Common/GButton";
+import { NavigationManager } from "../../manager/NavigationManager";
 const { ccclass, property } = _decorator;
 
 @ccclass("ImagePopup")
@@ -105,9 +106,9 @@ export class ImagePopup extends Component {
         url: girlData.getGrilPhotoPic(this.categoryId, this.girlId, this.resId),
         isImg: true,
       };
-      ViewManager.I.openBundlesView("ShowPanel", data);
+      NavigationManager.Instance.openPopupPanel("ShowPanel", data);
     } else {
-      ViewManager.I.openBundlesView("PopupGirlDetailPanel", {
+      NavigationManager.Instance.openPopupPanel("PopupGirlDetailPanel", {
         category: this.categoryId,
         resId: this.resId,
         girlId: this.girlId,
diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
index b200a838..c7d48813 100644
--- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
@@ -168,7 +168,7 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
     );
     if (!isFree && !isRelease) {
       //未解锁
-      ViewManager.I.openBundlesPopupView("GirlListPopupPanel", {
+      NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", {
         base: this,
         category: this.categoryId,
         id: this.id,
@@ -507,7 +507,7 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
     NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL);
   }
   onClickRecord() {
-    ViewManager.I.openBundlesView("RecordPanel", this.id);
+    NavigationManager.Instance.openPopupPanel("RecordPanel", this.id);
   }
 
   /**
diff --git a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts
index fb26cafa..8ad50a81 100644
--- a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts
@@ -15,7 +15,7 @@ export class NavigationPanel extends li_BaseView {
 
   private themeBtn: NavigationBtn;
   private girlDetailBtn: NavigationBtn;
-  private chatBtn: NavigationBtn;
+  private pastGirlListBtn: NavigationBtn;
   private settingBtn: NavigationBtn;
 
   private loadingView: Node;
@@ -26,7 +26,7 @@ export class NavigationPanel extends li_BaseView {
     this.themeBtn = this._nodeTab.themeBtn.getComponent(NavigationBtn);
     this.girlDetailBtn =
       this._nodeTab.girlDetailBtn.getComponent(NavigationBtn);
-    this.chatBtn = this._nodeTab.chatBtn.getComponent(NavigationBtn);
+    this.pastGirlListBtn = this._nodeTab.chatBtn.getComponent(NavigationBtn);
     this.settingBtn = this._nodeTab.settingBtn.getComponent(NavigationBtn);
     this.loadingView = this._nodeTab.loadingView;
 
@@ -36,7 +36,7 @@ export class NavigationPanel extends li_BaseView {
     NavigationManager.Instance.registerNavigationPanel(this);
 
     this.registerListener();
-    this.updateButtonStates(PanelType.THEME);
+    this.updateButtonStates(PanelType.PAST_GIRL_LIST);
 
     // 初次打开时通过NavigationManager切换到主题面板
     this.initializeFirstPanel();
@@ -57,8 +57,8 @@ export class NavigationPanel extends li_BaseView {
       this
     );
     GButton.BandClick(
-      this.chatBtn.node,
-      () => NavigationManager.Instance.switchToPanel(PanelType.CHAT),
+      this.pastGirlListBtn.node,
+      () => NavigationManager.Instance.switchToPanel(PanelType.PAST_GIRL_LIST),
       this
     );
     GButton.BandClick(
@@ -101,13 +101,13 @@ export class NavigationPanel extends li_BaseView {
     this.girlDetailBtn.setFocus(
       this.currentActivePanel === PanelType.GIRL_DETAIL
     );
-    this.chatBtn.setFocus(this.currentActivePanel === PanelType.CHAT);
+    this.pastGirlListBtn.setFocus(this.currentActivePanel === PanelType.PAST_GIRL_LIST);
     this.settingBtn.setFocus(this.currentActivePanel === PanelType.PERSONAL);
   }
 
   private initializeFirstPanel() {
-    // 初次打开时通过NavigationManager切换到主题面板
-    NavigationManager.Instance.switchToPanel(PanelType.THEME, true);
+    // 初次打开时通过NavigationManager切换到历史女孩列表面板
+    NavigationManager.Instance.switchToPanel(PanelType.PAST_GIRL_LIST, true);
   }
 
   public showPanel() {
diff --git a/assets/Scripts/chat18x/ui/panels/RecordPanel.ts b/assets/Scripts/chat18x/ui/panels/RecordPanel.ts
index b85b4f2e..e082e9bd 100644
--- a/assets/Scripts/chat18x/ui/panels/RecordPanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/RecordPanel.ts
@@ -294,6 +294,6 @@ export class RecordPanel extends li_BaseView {
    */
   returnBtn() {
     this.onClose();
-    ViewManager.I.closeView(this.node);
+    this.close(); // 使用li_BaseView的close方法
   }
 }
diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
index 17dcdc88..13310a27 100644
--- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
@@ -53,7 +53,6 @@ export class ThemePanel extends li_BaseView {
   cache: ThemeItem[] = [];
 
   // 子页面管理
-  private listPanel: GirlListPanel = null;
 
   // 加载状态保护
   private isLoading: boolean = false;
@@ -209,7 +208,7 @@ export class ThemePanel extends li_BaseView {
     for (let id of themeIds) {
       let newNode = instantiate(this.itemInst.node);
       let item = newNode.getComponent(ThemeItem);
-      item.refresh(id, this);
+      item.refresh(id, this.node);
       newNode.active = true;
       this.cache.push(item);
       this.content.addChild(newNode);
@@ -320,17 +319,11 @@ export class ThemePanel extends li_BaseView {
     } else {
       //未解锁
 
-      NavigationManager.Instance.openSubPanel("GirlListPopupPanel", this.node, {
+      NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", {
         base: this,
         category: girlData.getGrilCategoryById(this.recId),
         id: this.recId,
       });
-
-      // ViewManager.I.openBundlesPopupView("GirlListPopupPanel", {
-      //   base: this,
-      //   category: girlData.getGrilCategoryById(this.recId),
-      //   id: this.recId,
-      // });
     }
   }
 
@@ -394,43 +387,11 @@ export class ThemePanel extends li_BaseView {
     }
   }
 
-  public getChildPanel(): GirlListPanel {
-    if (this.listPanel) return this.listPanel;
-    return null;
-  }
-  public setChildPanel(panel: GirlListPanel) {
-    this.listPanel = panel;
-  }
-  /**
-   * 隐藏子页面
-   */
-  public hideChildPanel(): void {
-    if (this.listPanel) {
-      console.log("[ThemePanel] Closing child panel");
-      if (this.listPanel.hide) {
-        this.listPanel.hide();
-      }
-    }
-  }
-  /**
-   * 关闭子页面
-   */
-  public clostChildPanel(): void {
-    if (this.listPanel) {
-      console.log("[ThemePanel] Closing child panel");
-      if (this.listPanel.close) {
-        this.listPanel.close();
-      }
-      this.listPanel = null;
-    }
-  }
-
   /**
    * 页面被隐藏时调用
    */
   public onHide(): void {
     console.log("[ThemePanel] onHide called");
-    this.hideChildPanel();
     this.cancelCurrentOperation();
   }
 
@@ -451,9 +412,6 @@ export class ThemePanel extends li_BaseView {
     // 取消当前操作
     this.cancelCurrentOperation();
 
-    // 关闭子页面
-    this.clostChildPanel();
-
     // 清理缓存
     this.clearCache();
 
diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts
index 909602d9..0b94b87f 100644
--- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts
+++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts
@@ -69,21 +69,17 @@ export class DetailImageItem extends Component {
         },
       };
       if (this.url) {
-        ViewManager.I.openBundlesView("ShowPanel", data);
+        NavigationManager.Instance.openPopupPanel("ShowPanel", data);
         this.base.setVideEnable(false);
       }
     } else {
-      NavigationManager.Instance.openSubPanel(
-        "PopupGirlDetailPanel",
-        this.base.node,
-        {
-          category: this.category,
-          resId: this.resId,
-          girlId: this.girlId,
-          base: this,
-          type: this.type,
-        }
-      );
+      NavigationManager.Instance.openPopupPanel("PopupGirlDetailPanel", {
+        category: this.category,
+        resId: this.resId,
+        girlId: this.girlId,
+        base: this,
+        type: this.type,
+      });
 
       // ViewManager.I.openBundlesView("PopupGirlDetailPanel", {
       //   category: this.category,
diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts
index 4b537a25..6c2e6e54 100644
--- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts
+++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts
@@ -216,16 +216,11 @@ export class GirlListItem extends Component {
       NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL);
     } else {
       //未解锁
-      NavigationManager.Instance.openSubPanel("GirlListPopupPanel", this.baseNode, {
+      NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", {
         base: this,
         category: this.category,
         id: this.id,
       });
-      // ViewManager.I.openBundlesPopupView("GirlListPopupPanel", {
-      //   base: this,
-      //   category: this.category,
-      //   id: this.id,
-      // });
     }
   }
 }
diff --git a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts
index 19255a49..5785d8e6 100644
--- a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts
+++ b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts
@@ -8,6 +8,7 @@ import { InnerMsgCode } from "../../Main/Config/InnerMsgCode";
 import { DataManager, DataId } from "../data/DataManager";
 import { GirlData } from "../data/GirlData";
 import { EnvData } from "../data/EnvData";
+import { ChatHistoryManager } from "../manager/ChatHistoryManager";
 
 const { ccclass, property } = _decorator;
 
@@ -63,11 +64,11 @@ export class PastGirlListItem extends Component {
     );
   }
 
-  refreshData( girlId: number, baseNode: Node) {
+  refreshData(girlId: number, baseNode: Node) {
     if (!this.stars) {
       this.stars = this.starParent.getComponentsInChildren(Sprite);
     }
-    
+
     this.baseNode = baseNode;
     this.id = girlId;
 
@@ -120,21 +121,13 @@ export class PastGirlListItem extends Component {
     this.updateLastChatTime();
   }
 
-  // TODO: 实现获取最近聊天时间的逻辑
-  // 需要从聊天记录中获取最后一条消息的时间戳
-  private getLastChatTime(category: number, id: number): number | null {
-    // TODO: 实现获取最近聊天时间的逻辑
-    // 需要实现的逻辑：
-    // 1. 获取该女孩的聊天记录
-    // 2. 找到最后一条消息的时间戳
-    // 3. 返回时间戳或null（如果没有聊天记录）
-    console.log("TODO: 实现获取最近聊天时间逻辑");
-    return null;
+  private getLastChatTime(id: number): number | null {
+    return ChatHistoryManager.Instance.getLastChatTime(id);
   }
 
   // 更新最近聊天时间显示
   private updateLastChatTime() {
-    const lastTime = this.getLastChatTime(this.category, this.id);
+    const lastTime = this.getLastChatTime(this.id);
     this.lastChatTime.string = Utils.formatChatTime(lastTime);
   }
 
@@ -170,12 +163,17 @@ export class PastGirlListItem extends Component {
     }
   }
 
-  onClickDetail() {
-    // 由于都是已解锁的女孩，直接跳转到角色详情
+  onClickGirl() {
+    // 由于都是已解锁的女孩，直接打开聊天面板作为子面板
     // 先设置选中的角色ID
     NavigationManager.Instance.setSelectedGirlId(this.id);
 
-    // 通过switchToPanel切换到角色详情面板，保持动画和状态同步
-    NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL);
+    // 通过openSubPanel打开ChatPanel作为子面板
+    const chatData = { girlId: this.id };
+    NavigationManager.Instance.openSubPanel(
+      "ChatPanel",
+      this.baseNode,
+      chatData
+    );
   }
 }
diff --git a/assets/Scripts/chat18x/uiitems/ThemeItem.ts b/assets/Scripts/chat18x/uiitems/ThemeItem.ts
index 145c1241..e402518d 100644
--- a/assets/Scripts/chat18x/uiitems/ThemeItem.ts
+++ b/assets/Scripts/chat18x/uiitems/ThemeItem.ts
@@ -34,7 +34,7 @@ export class ThemeItem extends Component {
 
   private isLocked: boolean;
 
-  private parentPanel: any;
+  private baseNode: any;
 
   key: string;
   protected onLoad(): void {
@@ -62,9 +62,9 @@ export class ThemeItem extends Component {
     }, 0);
   }
 
-  refresh(themeId: number, parentPanel?: any) {
+  refresh(themeId: number, parentPanel?: Node) {
     if (this.loading) this.loading.active = true;
-    this.parentPanel = parentPanel;
+    this.baseNode = parentPanel;
     // 主题数据
     const themeData = DataManager.I.getDataById<ThemeData>(DataId.Theme);
     this.lockImg.node.active = this.lockCover.node.active =
@@ -95,7 +95,7 @@ export class ThemeItem extends Component {
       "[ThemeItem] Opening GirlListPanel for category:",
       this.category
     );
-    // 不使用过渡动画，直接打开
-    NavigationManager.Instance.navigateToGirlList(this.category);
+    NavigationManager.Instance.setSelectedCategoryId(this.category);
+    NavigationManager.Instance.openSubPanel("GirlListPanel", this.baseNode);
   }
 }
diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab
index fd07ce14..6e53cdce 100644
--- a/assets/bundles/Chat18x/ChatPanel.prefab
+++ b/assets/bundles/Chat18x/ChatPanel.prefab
@@ -6261,6 +6261,8 @@
       "__id__": 0
     },
     "fileId": "62v7vq63lHA58MuVNEke4K",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -6410,6 +6412,8 @@
       "__id__": 0
     },
     "fileId": "ac8s2fO3xFpatPN9NIfLey",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
diff --git a/assets/bundles/Chat18x/PersonalPanel.prefab b/assets/bundles/Chat18x/PersonalPanel.prefab
index 8318cee0..68b4d10e 100644
--- a/assets/bundles/Chat18x/PersonalPanel.prefab
+++ b/assets/bundles/Chat18x/PersonalPanel.prefab
@@ -2645,7 +2645,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "fc6b1644-35ec-4462-aa66-8b576b95f7b1@f9941",
+      "__uuid__": "e72d6e10-73bf-44e8-82d5-da3a20f908b2@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
diff --git a/assets/resources/ui/common/common_atlas.pac b/assets/resources/ui/common/common_atlas.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/common/common_atlas.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/common/common_atlas.pac.meta b/assets/resources/ui/common/common_atlas.pac.meta
new file mode 100644
index 00000000..c350eff9
--- /dev/null
+++ b/assets/resources/ui/common/common_atlas.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "1b8f817c-45d7-463a-9ff8-091ac76e0196",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/girl_detail_pop/图层 39.png b/assets/resources/ui/girl_detail_pop/图层 39.png
deleted file mode 100644
index a504792a..00000000
Binary files a/assets/resources/ui/girl_detail_pop/图层 39.png and /dev/null differ
diff --git a/assets/resources/ui/girl_detail_pop/图层 39.png.meta b/assets/resources/ui/girl_detail_pop/图层 39.png.meta
deleted file mode 100644
index 25f10b54..00000000
--- a/assets/resources/ui/girl_detail_pop/图层 39.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "21f984ca-7867-4b21-8590-6a7710bba037",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "21f984ca-7867-4b21-8590-6a7710bba037@6c48a",
-      "displayName": "图层 39",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "21f984ca-7867-4b21-8590-6a7710bba037",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "21f984ca-7867-4b21-8590-6a7710bba037@f9941",
-      "displayName": "图层 39",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 102,
-        "height": 89,
-        "rawWidth": 102,
-        "rawHeight": 89,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -51,
-            -44.5,
-            0,
-            51,
-            -44.5,
-            0,
-            -51,
-            44.5,
-            0,
-            51,
-            44.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            89,
-            102,
-            89,
-            0,
-            0,
-            102,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -51,
-            -44.5,
-            0
-          ],
-          "maxPos": [
-            51,
-            44.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "21f984ca-7867-4b21-8590-6a7710bba037@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "21f984ca-7867-4b21-8590-6a7710bba037@6c48a"
-  }
-}
diff --git a/assets/resources/ui/girl_detail_pop/矩形 12 拷贝.png b/assets/resources/ui/girl_detail_pop/矩形 12 拷贝.png
deleted file mode 100644
index ef6e8e3d..00000000
Binary files a/assets/resources/ui/girl_detail_pop/矩形 12 拷贝.png and /dev/null differ
diff --git a/assets/resources/ui/girl_detail_pop/矩形 12 拷贝.png.meta b/assets/resources/ui/girl_detail_pop/矩形 12 拷贝.png.meta
deleted file mode 100644
index c9ea8b72..00000000
--- a/assets/resources/ui/girl_detail_pop/矩形 12 拷贝.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "993e1746-625f-478b-8cd1-d36c7851a4c1",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "993e1746-625f-478b-8cd1-d36c7851a4c1@6c48a",
-      "displayName": "矩形 12 拷贝",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "993e1746-625f-478b-8cd1-d36c7851a4c1",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "993e1746-625f-478b-8cd1-d36c7851a4c1@f9941",
-      "displayName": "矩形 12 拷贝",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 117,
-        "height": 117,
-        "rawWidth": 117,
-        "rawHeight": 117,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -58.5,
-            -58.5,
-            0,
-            58.5,
-            -58.5,
-            0,
-            -58.5,
-            58.5,
-            0,
-            58.5,
-            58.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            117,
-            117,
-            117,
-            0,
-            0,
-            117,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -58.5,
-            -58.5,
-            0
-          ],
-          "maxPos": [
-            58.5,
-            58.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "993e1746-625f-478b-8cd1-d36c7851a4c1@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "993e1746-625f-478b-8cd1-d36c7851a4c1@6c48a"
-  }
-}
diff --git a/assets/resources/ui/girl_detail_pop/矩形 6.png b/assets/resources/ui/girl_detail_pop/矩形 6.png
deleted file mode 100644
index 54896c65..00000000
Binary files a/assets/resources/ui/girl_detail_pop/矩形 6.png and /dev/null differ
diff --git a/assets/resources/ui/girl_detail_pop/矩形 6.png.meta b/assets/resources/ui/girl_detail_pop/矩形 6.png.meta
deleted file mode 100644
index 40569547..00000000
--- a/assets/resources/ui/girl_detail_pop/矩形 6.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "25ca9011-b8f7-474a-b18c-fa3c72bdcba8",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "25ca9011-b8f7-474a-b18c-fa3c72bdcba8@6c48a",
-      "displayName": "矩形 6",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "25ca9011-b8f7-474a-b18c-fa3c72bdcba8",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "25ca9011-b8f7-474a-b18c-fa3c72bdcba8@f9941",
-      "displayName": "矩形 6",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 541,
-        "height": 146,
-        "rawWidth": 541,
-        "rawHeight": 146,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -270.5,
-            -73,
-            0,
-            270.5,
-            -73,
-            0,
-            -270.5,
-            73,
-            0,
-            270.5,
-            73,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            146,
-            541,
-            146,
-            0,
-            0,
-            541,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -270.5,
-            -73,
-            0
-          ],
-          "maxPos": [
-            270.5,
-            73,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "25ca9011-b8f7-474a-b18c-fa3c72bdcba8@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "25ca9011-b8f7-474a-b18c-fa3c72bdcba8@6c48a"
-  }
-}
diff --git a/assets/resources/ui/girls_list/1112.png b/assets/resources/ui/girls_list/1112.png
deleted file mode 100644
index 262ef5b1..00000000
Binary files a/assets/resources/ui/girls_list/1112.png and /dev/null differ
diff --git a/assets/resources/ui/girls_list/1112.png.meta b/assets/resources/ui/girls_list/1112.png.meta
deleted file mode 100644
index 86447065..00000000
--- a/assets/resources/ui/girls_list/1112.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "777b36cd-bd39-44ec-a4f1-f8f9c8bc723b",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "777b36cd-bd39-44ec-a4f1-f8f9c8bc723b@6c48a",
-      "displayName": "1112",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "777b36cd-bd39-44ec-a4f1-f8f9c8bc723b",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "777b36cd-bd39-44ec-a4f1-f8f9c8bc723b@f9941",
-      "displayName": "1112",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 101,
-        "height": 72,
-        "rawWidth": 101,
-        "rawHeight": 72,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -50.5,
-            -36,
-            0,
-            50.5,
-            -36,
-            0,
-            -50.5,
-            36,
-            0,
-            50.5,
-            36,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            72,
-            101,
-            72,
-            0,
-            0,
-            101,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -50.5,
-            -36,
-            0
-          ],
-          "maxPos": [
-            50.5,
-            36,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "777b36cd-bd39-44ec-a4f1-f8f9c8bc723b@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "777b36cd-bd39-44ec-a4f1-f8f9c8bc723b@6c48a"
-  }
-}
diff --git a/assets/resources/ui/girls_list/girllist_atals.pac b/assets/resources/ui/girls_list/girllist_atals.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/girls_list/girllist_atals.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/girls_list/girllist_atals.pac.meta b/assets/resources/ui/girls_list/girllist_atals.pac.meta
new file mode 100644
index 00000000..0461bfda
--- /dev/null
+++ b/assets/resources/ui/girls_list/girllist_atals.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "a8848b13-698c-4ca1-8580-69f62860624b",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/girls_list/图层 41.png b/assets/resources/ui/girls_list/图层 41.png
deleted file mode 100644
index 7126ae8b..00000000
Binary files a/assets/resources/ui/girls_list/图层 41.png and /dev/null differ
diff --git a/assets/resources/ui/girls_list/图层 41.png.meta b/assets/resources/ui/girls_list/图层 41.png.meta
deleted file mode 100644
index f472ae2e..00000000
--- a/assets/resources/ui/girls_list/图层 41.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "984630d2-b8ee-40a5-8cd3-c14bcd4bd857",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "984630d2-b8ee-40a5-8cd3-c14bcd4bd857@6c48a",
-      "displayName": "图层 41",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "984630d2-b8ee-40a5-8cd3-c14bcd4bd857",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "984630d2-b8ee-40a5-8cd3-c14bcd4bd857@f9941",
-      "displayName": "图层 41",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 102,
-        "height": 89,
-        "rawWidth": 102,
-        "rawHeight": 89,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -51,
-            -44.5,
-            0,
-            51,
-            -44.5,
-            0,
-            -51,
-            44.5,
-            0,
-            51,
-            44.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            89,
-            102,
-            89,
-            0,
-            0,
-            102,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -51,
-            -44.5,
-            0
-          ],
-          "maxPos": [
-            51,
-            44.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "984630d2-b8ee-40a5-8cd3-c14bcd4bd857@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "984630d2-b8ee-40a5-8cd3-c14bcd4bd857@6c48a"
-  }
-}
diff --git a/assets/resources/ui/girls_list/组 14 拷贝.png b/assets/resources/ui/girls_list/组 14 拷贝.png
index 5418a149..72d727eb 100644
Binary files a/assets/resources/ui/girls_list/组 14 拷贝.png and b/assets/resources/ui/girls_list/组 14 拷贝.png differ
diff --git a/assets/resources/ui/girls_list/组 14 拷贝.png.meta b/assets/resources/ui/girls_list/组 14 拷贝.png.meta
index e3b5828c..f24ead1b 100644
--- a/assets/resources/ui/girls_list/组 14 拷贝.png.meta	
+++ b/assets/resources/ui/girls_list/组 14 拷贝.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 1080,
-        "height": 150,
-        "rawWidth": 1080,
-        "rawHeight": 150,
+        "width": 700,
+        "height": 97,
+        "rawWidth": 700,
+        "rawHeight": 97,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -540,
-            -75,
+            -350,
+            -48.5,
             0,
-            540,
-            -75,
+            350,
+            -48.5,
             0,
-            -540,
-            75,
+            -350,
+            48.5,
             0,
-            540,
-            75,
+            350,
+            48.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            150,
-            1080,
-            150,
+            97,
+            700,
+            97,
             0,
             0,
-            1080,
+            700,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -540,
-            -75,
+            -350,
+            -48.5,
             0
           ],
           "maxPos": [
-            540,
-            75,
+            350,
+            48.5,
             0
           ]
         },
diff --git a/assets/resources/ui/girls_list_pop/girllistpop_atals.pac b/assets/resources/ui/girls_list_pop/girllistpop_atals.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/girls_list_pop/girllistpop_atals.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/girls_list_pop/girllistpop_atals.pac.meta b/assets/resources/ui/girls_list_pop/girllistpop_atals.pac.meta
new file mode 100644
index 00000000..5df9f79a
--- /dev/null
+++ b/assets/resources/ui/girls_list_pop/girllistpop_atals.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "ae2d7c52-b016-4b49-b4b5-bebdad3455c1",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/girls_list_pop/ref.png b/assets/resources/ui/girls_list_pop/ref.png
deleted file mode 100644
index f1c302ed..00000000
Binary files a/assets/resources/ui/girls_list_pop/ref.png and /dev/null differ
diff --git a/assets/resources/ui/girls_list_pop/ref.png.meta b/assets/resources/ui/girls_list_pop/ref.png.meta
deleted file mode 100644
index 6b1d3c77..00000000
--- a/assets/resources/ui/girls_list_pop/ref.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "676f1adf-04c0-4024-b145-c4c1a3c1c07e",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "676f1adf-04c0-4024-b145-c4c1a3c1c07e@6c48a",
-      "displayName": "ref",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "676f1adf-04c0-4024-b145-c4c1a3c1c07e",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "676f1adf-04c0-4024-b145-c4c1a3c1c07e@f9941",
-      "displayName": "ref",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 865,
-        "height": 1116,
-        "rawWidth": 865,
-        "rawHeight": 1116,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -432.5,
-            -558,
-            0,
-            432.5,
-            -558,
-            0,
-            -432.5,
-            558,
-            0,
-            432.5,
-            558,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            1116,
-            865,
-            1116,
-            0,
-            0,
-            865,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -432.5,
-            -558,
-            0
-          ],
-          "maxPos": [
-            432.5,
-            558,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "676f1adf-04c0-4024-b145-c4c1a3c1c07e@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "676f1adf-04c0-4024-b145-c4c1a3c1c07e@6c48a"
-  }
-}
diff --git a/assets/resources/ui/girls_list_pop/图层 39.png b/assets/resources/ui/girls_list_pop/图层 39.png
deleted file mode 100644
index c8726a12..00000000
Binary files a/assets/resources/ui/girls_list_pop/图层 39.png and /dev/null differ
diff --git a/assets/resources/ui/girls_list_pop/图层 39.png.meta b/assets/resources/ui/girls_list_pop/图层 39.png.meta
deleted file mode 100644
index ed33974f..00000000
--- a/assets/resources/ui/girls_list_pop/图层 39.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "2f0e1611-f934-4832-9f0f-e0cbb765aa16",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "2f0e1611-f934-4832-9f0f-e0cbb765aa16@6c48a",
-      "displayName": "图层 39",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "2f0e1611-f934-4832-9f0f-e0cbb765aa16",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "2f0e1611-f934-4832-9f0f-e0cbb765aa16@f9941",
-      "displayName": "图层 39",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 102,
-        "height": 89,
-        "rawWidth": 102,
-        "rawHeight": 89,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -51,
-            -44.5,
-            0,
-            51,
-            -44.5,
-            0,
-            -51,
-            44.5,
-            0,
-            51,
-            44.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            89,
-            102,
-            89,
-            0,
-            0,
-            102,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -51,
-            -44.5,
-            0
-          ],
-          "maxPos": [
-            51,
-            44.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "2f0e1611-f934-4832-9f0f-e0cbb765aa16@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "2f0e1611-f934-4832-9f0f-e0cbb765aa16@6c48a"
-  }
-}
diff --git a/assets/resources/ui/girls_list_pop/组 1 拷贝.png b/assets/resources/ui/girls_list_pop/组 1 拷贝.png
deleted file mode 100644
index 49234853..00000000
Binary files a/assets/resources/ui/girls_list_pop/组 1 拷贝.png and /dev/null differ
diff --git a/assets/resources/ui/girls_list_pop/组 1 拷贝.png.meta b/assets/resources/ui/girls_list_pop/组 1 拷贝.png.meta
deleted file mode 100644
index 859121ac..00000000
--- a/assets/resources/ui/girls_list_pop/组 1 拷贝.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ecf14bb8-0b13-4686-ae74-f2aca51016c9",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ecf14bb8-0b13-4686-ae74-f2aca51016c9@6c48a",
-      "displayName": "组 1 拷贝",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ecf14bb8-0b13-4686-ae74-f2aca51016c9",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "ecf14bb8-0b13-4686-ae74-f2aca51016c9@f9941",
-      "displayName": "组 1 拷贝",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 72,
-        "height": 61,
-        "rawWidth": 72,
-        "rawHeight": 61,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -36,
-            -30.5,
-            0,
-            36,
-            -30.5,
-            0,
-            -36,
-            30.5,
-            0,
-            36,
-            30.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            61,
-            72,
-            61,
-            0,
-            0,
-            72,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -36,
-            -30.5,
-            0
-          ],
-          "maxPos": [
-            36,
-            30.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ecf14bb8-0b13-4686-ae74-f2aca51016c9@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ecf14bb8-0b13-4686-ae74-f2aca51016c9@6c48a"
-  }
-}
diff --git a/assets/resources/ui/girls_list_pop/组 1.png b/assets/resources/ui/girls_list_pop/组 1.png
deleted file mode 100644
index 43138115..00000000
Binary files a/assets/resources/ui/girls_list_pop/组 1.png and /dev/null differ
diff --git a/assets/resources/ui/girls_list_pop/组 1.png.meta b/assets/resources/ui/girls_list_pop/组 1.png.meta
deleted file mode 100644
index 4ea62034..00000000
--- a/assets/resources/ui/girls_list_pop/组 1.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ace0b29f-cbd3-4fe6-8412-023e6f0fc45a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ace0b29f-cbd3-4fe6-8412-023e6f0fc45a@6c48a",
-      "displayName": "组 1",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ace0b29f-cbd3-4fe6-8412-023e6f0fc45a",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "ace0b29f-cbd3-4fe6-8412-023e6f0fc45a@f9941",
-      "displayName": "组 1",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 72,
-        "height": 61,
-        "rawWidth": 72,
-        "rawHeight": 61,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -36,
-            -30.5,
-            0,
-            36,
-            -30.5,
-            0,
-            -36,
-            30.5,
-            0,
-            36,
-            30.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            61,
-            72,
-            61,
-            0,
-            0,
-            72,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -36,
-            -30.5,
-            0
-          ],
-          "maxPos": [
-            36,
-            30.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ace0b29f-cbd3-4fe6-8412-023e6f0fc45a@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ace0b29f-cbd3-4fe6-8412-023e6f0fc45a@6c48a"
-  }
-}
diff --git a/assets/resources/ui/login/login_atlas.pac b/assets/resources/ui/login/login_atlas.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/login/login_atlas.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/login/login_atlas.pac.meta b/assets/resources/ui/login/login_atlas.pac.meta
new file mode 100644
index 00000000..e47c0f00
--- /dev/null
+++ b/assets/resources/ui/login/login_atlas.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "ddc504c4-9c3f-489d-9d3e-e331c8bb098b",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/navigation/navi_atlas.pac b/assets/resources/ui/navigation/navi_atlas.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/navigation/navi_atlas.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/navigation/navi_atlas.pac.meta b/assets/resources/ui/navigation/navi_atlas.pac.meta
new file mode 100644
index 00000000..c592384c
--- /dev/null
+++ b/assets/resources/ui/navigation/navi_atlas.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "89fdf8c7-e675-48eb-ab6b-6fea11e37b8a",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/navigation/矩形 3.png b/assets/resources/ui/navigation/矩形 3.png
index c0d9a7d6..7418b139 100644
Binary files a/assets/resources/ui/navigation/矩形 3.png and b/assets/resources/ui/navigation/矩形 3.png differ
diff --git a/assets/resources/ui/navigation/矩形 3.png.meta b/assets/resources/ui/navigation/矩形 3.png.meta
index 1cd5d762..c408ebb0 100644
--- a/assets/resources/ui/navigation/矩形 3.png.meta	
+++ b/assets/resources/ui/navigation/矩形 3.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 1080,
-        "height": 237,
-        "rawWidth": 1080,
-        "rawHeight": 237,
+        "width": 700,
+        "height": 154,
+        "rawWidth": 700,
+        "rawHeight": 154,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -540,
-            -118.5,
+            -350,
+            -77,
             0,
-            540,
-            -118.5,
+            350,
+            -77,
             0,
-            -540,
-            118.5,
+            -350,
+            77,
             0,
-            540,
-            118.5,
+            350,
+            77,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            237,
-            1080,
-            237,
+            154,
+            700,
+            154,
             0,
             0,
-            1080,
+            700,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -540,
-            -118.5,
+            -350,
+            -77,
             0
           ],
           "maxPos": [
-            540,
-            118.5,
+            350,
+            77,
             0
           ]
         },
diff --git a/assets/resources/ui/personal/personal_atlas.pac b/assets/resources/ui/personal/personal_atlas.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/personal/personal_atlas.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/personal/personal_atlas.pac.meta b/assets/resources/ui/personal/personal_atlas.pac.meta
new file mode 100644
index 00000000..bf7ca189
--- /dev/null
+++ b/assets/resources/ui/personal/personal_atlas.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "b4dde772-22a4-495d-b0cb-3bb674ab0a3f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/personal/图层 48.png b/assets/resources/ui/personal/图层 48.png
deleted file mode 100644
index 0ca5c0be..00000000
Binary files a/assets/resources/ui/personal/图层 48.png and /dev/null differ
diff --git a/assets/resources/ui/personal/图层 48.png.meta b/assets/resources/ui/personal/图层 48.png.meta
deleted file mode 100644
index 36633b89..00000000
--- a/assets/resources/ui/personal/图层 48.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "fc6b1644-35ec-4462-aa66-8b576b95f7b1",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "fc6b1644-35ec-4462-aa66-8b576b95f7b1@6c48a",
-      "displayName": "图层 48",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "fc6b1644-35ec-4462-aa66-8b576b95f7b1",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "fc6b1644-35ec-4462-aa66-8b576b95f7b1@f9941",
-      "displayName": "图层 48",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 91,
-        "height": 74,
-        "rawWidth": 91,
-        "rawHeight": 74,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -45.5,
-            -37,
-            0,
-            45.5,
-            -37,
-            0,
-            -45.5,
-            37,
-            0,
-            45.5,
-            37,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            74,
-            91,
-            74,
-            0,
-            0,
-            91,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -45.5,
-            -37,
-            0
-          ],
-          "maxPos": [
-            45.5,
-            37,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "fc6b1644-35ec-4462-aa66-8b576b95f7b1@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "fc6b1644-35ec-4462-aa66-8b576b95f7b1@6c48a"
-  }
-}
diff --git a/assets/resources/ui/setting/setting_atlas.pac b/assets/resources/ui/setting/setting_atlas.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/setting/setting_atlas.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/setting/setting_atlas.pac.meta b/assets/resources/ui/setting/setting_atlas.pac.meta
new file mode 100644
index 00000000..22423068
--- /dev/null
+++ b/assets/resources/ui/setting/setting_atlas.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "213ed585-9d01-45c1-978f-49a1f785e118",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/shop/shop_atlas.pac b/assets/resources/ui/shop/shop_atlas.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/shop/shop_atlas.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/shop/shop_atlas.pac.meta b/assets/resources/ui/shop/shop_atlas.pac.meta
new file mode 100644
index 00000000..f926238a
--- /dev/null
+++ b/assets/resources/ui/shop/shop_atlas.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "6c1c7d3d-410e-4c5d-9759-d35c51c2cc3c",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/shop/组 19 拷贝.png b/assets/resources/ui/shop/组 19 拷贝.png
deleted file mode 100644
index 5418a149..00000000
Binary files a/assets/resources/ui/shop/组 19 拷贝.png and /dev/null differ
diff --git a/assets/resources/ui/shop/组 19 拷贝.png.meta b/assets/resources/ui/shop/组 19 拷贝.png.meta
deleted file mode 100644
index 309e6f1c..00000000
--- a/assets/resources/ui/shop/组 19 拷贝.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "4299c5a8-241d-466a-80b1-63bfaa58a8e9",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "4299c5a8-241d-466a-80b1-63bfaa58a8e9@6c48a",
-      "displayName": "组 19 拷贝",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4299c5a8-241d-466a-80b1-63bfaa58a8e9",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "4299c5a8-241d-466a-80b1-63bfaa58a8e9@f9941",
-      "displayName": "组 19 拷贝",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 1080,
-        "height": 150,
-        "rawWidth": 1080,
-        "rawHeight": 150,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -540,
-            -75,
-            0,
-            540,
-            -75,
-            0,
-            -540,
-            75,
-            0,
-            540,
-            75,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            150,
-            1080,
-            150,
-            0,
-            0,
-            1080,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -540,
-            -75,
-            0
-          ],
-          "maxPos": [
-            540,
-            75,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4299c5a8-241d-466a-80b1-63bfaa58a8e9@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4299c5a8-241d-466a-80b1-63bfaa58a8e9@6c48a"
-  }
-}
diff --git a/assets/resources/ui/theme/theme_atlas.pac b/assets/resources/ui/theme/theme_atlas.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/theme/theme_atlas.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/theme/theme_atlas.pac.meta b/assets/resources/ui/theme/theme_atlas.pac.meta
new file mode 100644
index 00000000..1d40b7ba
--- /dev/null
+++ b/assets/resources/ui/theme/theme_atlas.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "b739296a-143d-43c5-8f05-6eeb530ce2aa",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}
diff --git a/assets/resources/ui/theme/图层 61.png b/assets/resources/ui/theme/图层 61.png
deleted file mode 100644
index bedb4f35..00000000
Binary files a/assets/resources/ui/theme/图层 61.png and /dev/null differ
diff --git a/assets/resources/ui/theme/图层 61.png.meta b/assets/resources/ui/theme/图层 61.png.meta
deleted file mode 100644
index 971cc32c..00000000
--- a/assets/resources/ui/theme/图层 61.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "73d2e328-4c47-42e2-83e1-07967b503a51",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "73d2e328-4c47-42e2-83e1-07967b503a51@6c48a",
-      "displayName": "图层 61",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "73d2e328-4c47-42e2-83e1-07967b503a51",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "73d2e328-4c47-42e2-83e1-07967b503a51@f9941",
-      "displayName": "图层 61",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 1080,
-        "height": 2340,
-        "rawWidth": 1080,
-        "rawHeight": 2340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -540,
-            -1170,
-            0,
-            540,
-            -1170,
-            0,
-            -540,
-            1170,
-            0,
-            540,
-            1170,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            2340,
-            1080,
-            2340,
-            0,
-            0,
-            1080,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -540,
-            -1170,
-            0
-          ],
-          "maxPos": [
-            540,
-            1170,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "73d2e328-4c47-42e2-83e1-07967b503a51@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": false,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "73d2e328-4c47-42e2-83e1-07967b503a51@6c48a"
-  }
-}
diff --git a/assets/resources/ui/theme/顶部渐变.png b/assets/resources/ui/theme/顶部渐变.png
deleted file mode 100644
index 3de752e0..00000000
Binary files a/assets/resources/ui/theme/顶部渐变.png and /dev/null differ
diff --git a/assets/resources/ui/theme/顶部渐变.png.meta b/assets/resources/ui/theme/顶部渐变.png.meta
deleted file mode 100644
index 33427d5d..00000000
--- a/assets/resources/ui/theme/顶部渐变.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "e2df3ede-34b0-4b91-b434-0115060ac8b5",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "e2df3ede-34b0-4b91-b434-0115060ac8b5@6c48a",
-      "displayName": "顶部渐变",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "e2df3ede-34b0-4b91-b434-0115060ac8b5",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "e2df3ede-34b0-4b91-b434-0115060ac8b5@f9941",
-      "displayName": "顶部渐变",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 1080,
-        "height": 811,
-        "rawWidth": 1080,
-        "rawHeight": 811,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -540,
-            -405.5,
-            0,
-            540,
-            -405.5,
-            0,
-            -540,
-            405.5,
-            0,
-            540,
-            405.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            811,
-            1080,
-            811,
-            0,
-            0,
-            1080,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -540,
-            -405.5,
-            0
-          ],
-          "maxPos": [
-            540,
-            405.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "e2df3ede-34b0-4b91-b434-0115060ac8b5@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "e2df3ede-34b0-4b91-b434-0115060ac8b5@6c48a"
-  }
-}
diff --git a/assets/resources/ui/web3pop/erweima.png b/assets/resources/ui/web3pop/erweima.png
deleted file mode 100644
index f73b69ff..00000000
Binary files a/assets/resources/ui/web3pop/erweima.png and /dev/null differ
diff --git a/assets/resources/ui/web3pop/erweima.png.meta b/assets/resources/ui/web3pop/erweima.png.meta
deleted file mode 100644
index abb208e8..00000000
--- a/assets/resources/ui/web3pop/erweima.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a9cc1220-5e62-4d8d-9dd2-7c323d863993",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a9cc1220-5e62-4d8d-9dd2-7c323d863993@6c48a",
-      "displayName": "erweima",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a9cc1220-5e62-4d8d-9dd2-7c323d863993",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "a9cc1220-5e62-4d8d-9dd2-7c323d863993@f9941",
-      "displayName": "erweima",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 261,
-        "height": 261,
-        "rawWidth": 261,
-        "rawHeight": 261,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -130.5,
-            -130.5,
-            0,
-            130.5,
-            -130.5,
-            0,
-            -130.5,
-            130.5,
-            0,
-            130.5,
-            130.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            261,
-            261,
-            261,
-            0,
-            0,
-            261,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -130.5,
-            -130.5,
-            0
-          ],
-          "maxPos": [
-            130.5,
-            130.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a9cc1220-5e62-4d8d-9dd2-7c323d863993@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a9cc1220-5e62-4d8d-9dd2-7c323d863993@6c48a"
-  }
-}
diff --git a/assets/resources/ui/web3pop/web3pop_atlas.pac b/assets/resources/ui/web3pop/web3pop_atlas.pac
new file mode 100644
index 00000000..39b3c029
--- /dev/null
+++ b/assets/resources/ui/web3pop/web3pop_atlas.pac
@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}
diff --git a/assets/resources/ui/web3pop/web3pop_atlas.pac.meta b/assets/resources/ui/web3pop/web3pop_atlas.pac.meta
new file mode 100644
index 00000000..b13b2f96
--- /dev/null
+++ b/assets/resources/ui/web3pop/web3pop_atlas.pac.meta
@@ -0,0 +1,36 @@
+{
+  "ver": "1.0.8",
+  "importer": "auto-atlas",
+  "imported": true,
+  "uuid": "3157466c-d271-44d4-9c55-442510b633d5",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "maxWidth": 1024,
+    "maxHeight": 1024,
+    "padding": 2,
+    "allowRotation": true,
+    "forceSquared": false,
+    "powerOfTwo": false,
+    "algorithm": "MaxRects",
+    "format": "png",
+    "quality": 80,
+    "contourBleed": true,
+    "paddingBleed": true,
+    "filterUnused": true,
+    "removeTextureInBundle": true,
+    "removeImageInBundle": true,
+    "removeSpriteAtlasInBundle": true,
+    "compressSettings": {},
+    "textureSetting": {
+      "wrapModeS": "repeat",
+      "wrapModeT": "repeat",
+      "minfilter": "linear",
+      "magfilter": "linear",
+      "mipfilter": "none",
+      "anisotropy": 0
+    }
+  }
+}