Merge branch 'main' of 47.107.44.202:xionglijia/18xchat

assets/Scripts/chat18x/ui/components/SimpleToggle.ts

@@ -19,8 +19,8 @@ export class SimpleToggle extends Component {
   }
 
   init(isSelected: boolean, callBack: () => {}) {
-    this.selectedSprite.enabled = isSelected;
-    this.unSelectedSprite.enabled = !isSelected;
+    this.selectedSprite.node.active = isSelected;
+    this.unSelectedSprite.node.active = !isSelected;
     if (this.callback) {
       this.onDestroy();
     }
@@ -30,8 +30,8 @@ export class SimpleToggle extends Component {
   }
 
   refresh(isSelected: boolean) {
-    this.selectedSprite.enabled = isSelected;
-    this.unSelectedSprite.enabled = !isSelected;
+    this.selectedSprite.node.active = isSelected;
+    this.unSelectedSprite.node.active = !isSelected;
   }
 
   onClickThis() {

assets/Scripts/chat18x/ui/components/SimpleToggleGroup.ts

@@ -6,9 +6,6 @@ const { ccclass, property } = _decorator;
 export class SimpleToggleGroup extends Component {
   toggles: SimpleToggle[];
 
-  @property(Node)
-  slider: Node;
-
   protected onLoad(): void {
     this.toggles = this.getComponentsInChildren(SimpleToggle);
 
@@ -19,12 +16,6 @@ export class SimpleToggleGroup extends Component {
   }
 
   toggleSelected(selectedNode: Node) {
-    const pos = this.slider.getPosition();
-    const targetPos = new Vec3(selectedNode.getPosition().x, pos.y, pos.z);
-    tween(this.slider)
-      .to(0.3, { position: targetPos }, { easing: "sineInOut" })
-      .start();
-
     for (let i = 0; i < this.toggles.length; i++) {
       const element = this.toggles[i];
       if (element.node === selectedNode) {

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

@@ -402,7 +402,6 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
   protected onEnable(): void {
     if (!this.manager) this.manager = DialogManager.getInstance();
 
-    GameRootUI.I.hideDefaultView();
   }
 
   public async OnClickSend() {

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

@@ -7,7 +7,8 @@ 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 proto from "db://assets/Scripts/proto/proto.pb.js";
+import GameRootUI from "../../../Main/Common/GameRootUI";
 
 const { ccclass, property } = _decorator;
 
@@ -59,7 +60,7 @@ export class GirlListPanel extends li_BaseView {
         item.refreshData(category, id, this.node);
         newNode.active = true;
         this.cache.push(item);
-        this.content.addChild(newNode);      
+        this.content.addChild(newNode);
       }
     }
   }
@@ -69,5 +70,6 @@ export class GirlListPanel extends li_BaseView {
   }
   Return() {
     this.onClose();
+    GameRootUI.I.showDefaultView();
   }
 }