调整布局、新增导航栏，调整页面跳转逻辑

assets/Scripts/chat18x/uiitems/DetailImageItem.ts

@@ -48,11 +48,9 @@ export class DetailImageItem extends Component {
   resId: number;
   type: proto.cs.EnmResType;
 
-  test_resID: Node;
   onLoad() {
     GButton.BandClick(this.node, this.onClickThis, this);
     this.uitransform = this.node.getComponent(UITransform);
-    this.test_resID.active = false;
   }
   isVisible: boolean;
   onClickThis() {
@@ -146,10 +144,6 @@ export class DetailImageItem extends Component {
     //this.question.active = true; // 显示问号，表示加载中
 
     this.loading.active = true;
-    this.test_resID = this.node.getChildByName("resID");
-
-    this.test_resID.getComponent(Label).string =
-      this.girlId.toString() + this.resId;
 
     const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
     let imgPath = "";

assets/Scripts/chat18x/uiitems/GirlListItem.ts

@@ -12,7 +12,7 @@ import { Config18x } from "db://assets/Scripts/Main/Config/Config18x";
 import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
 import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
 import Utils from "db://assets/Scripts/Main/Common/Utils";
-import { NavigationManager } from "../manager/NavigationManager";
+import { NavigationManager, PanelType } from "../manager/NavigationManager";
 import { PriceType } from "../../schema/schema";
 import LanguageUtils from "../../Main/Common/LanguageUtils";
 import { InnerMsgCode } from "../../Main/Config/InnerMsgCode";
@@ -134,10 +134,7 @@ export class GirlListItem extends Component {
     // this.price.node.active = priceType == PriceType.pay;
     // this.freeNode.active = priceType == PriceType.free;
     //this.tryNode.active = priceType == PriceType.first_time_free;
-    let avatarPath = girlData.getGrilAvatar(
-      this.category.toString(),
-      this.id
-    );
+    let avatarPath = girlData.getGrilAvatar(this.category.toString(), this.id);
     this.loading.active = true;
 
     //listAvatarPath = listAvatarPath.replace("Avatar", "avatar"); //临时
@@ -182,8 +179,11 @@ export class GirlListItem extends Component {
     // 是否已经解锁
     const isRelease = girlData.getIsRelease(this.category.toString(), this.id);
     if (isRelease) {
-      NavigationManager.Instance.navigateToGirlDetail(this.id);
-      ViewManager.I.closeView(this.baseNode);
+      // 先设置选中的角色ID
+      NavigationManager.Instance.setSelectedGirlId(this.id);
+
+      // 通过switchToPanel切换到角色详情面板，保持动画和状态同步
+      NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL);
     } else {
       //未解锁
       ViewManager.I.openBundlesPopupView("GirlListPopupPanel", {

assets/Scripts/chat18x/uiitems/ThemeItem.ts

@@ -74,8 +74,8 @@ export class ThemeItem extends Component {
       return;
     }
 
-    // 使用预设的过渡动画配置
-    const transitionConfig = NavigationManager.getTransitionPresets().SLIDE_LEFT_TO_RIGHT;
-    NavigationManager.Instance.navigateToGirlList(this.category, transitionConfig, this.parentPanel);
+    console.log("[ThemeItem] Opening GirlListPanel for category:", this.category);
+    // 不使用过渡动画，直接打开
+    NavigationManager.Instance.navigateToGirlList(this.category);
   }
 }