update

assets/Scripts/chat18x/ui/panels/GirlListPanel.ts

@@ -3,13 +3,10 @@ import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView";
 import Utils from "db://assets/Scripts/Main/Common/Utils";
 import { GButton } from "db://assets/Scripts/Main/Common/GButton";
 import { GirlListItem } from "../../uiitems/GirlListItem";
-import { ConfigManager } from "../../manager/ConfigManager";
 import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
 import { DataManager, DataId } from "../../data/DataManager";
 import { GirlData } from "../../data/GirlData";
 import proto from "db://assets/Scripts/proto/proto.pb.js";
-import GameRootUI from "../../../Main/Common/GameRootUI";
-import { UITransitionHelper } from "../../utils/UITransitionHelper";
 import { NavigationManager, PanelType } from "../../manager/NavigationManager";
 
 const { ccclass, property } = _decorator;
@@ -28,7 +25,6 @@ export class GirlListPanel extends li_BaseView {
   private maxPoolSize: number = 20;
 
   category: number;
-  private parentPanelName: string = null;
 
   onLoadCT() {
     Utils.parseNode(this.node, this._nodeTab);

assets/Scripts/chat18x/ui/panels/ThemePanel.ts

@@ -319,11 +319,18 @@ export class ThemePanel extends li_BaseView {
       NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL);
     } else {
       //未解锁
-      ViewManager.I.openBundlesPopupView("GirlListPopupPanel", {
+
+      NavigationManager.Instance.openSubPanel("GirlListPopupPanel", this.node, {
         base: this,
         category: girlData.getGrilCategoryById(this.recId),
         id: this.recId,
       });
+
+      // ViewManager.I.openBundlesPopupView("GirlListPopupPanel", {
+      //   base: this,
+      //   category: girlData.getGrilCategoryById(this.recId),
+      //   id: this.recId,
+      // });
     }
   }