From cd5b0670a0e8fe938fd9fe5f0806386897e75fc4 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Thu, 25 Sep 2025 18:11:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat18x/ui/components/DialogBubble.ts | 1 - .../chat18x/ui/components/ImagePopup.ts | 24 ++++++------------- assets/Scripts/chat18x/ui/panels/ChatPanel.ts | 7 +----- .../chat18x/ui/panels/GirlDetailPanel.ts | 1 - .../chat18x/ui/panels/GirlListPanel.ts | 1 - .../chat18x/ui/panels/GirlListPopupPanel.ts | 3 --- .../chat18x/ui/panels/NavigationPanel.ts | 2 +- .../chat18x/ui/panels/PastGirlListPanel.ts | 1 - .../chat18x/ui/panels/PayToTalkSubpanel.ts | 1 - .../chat18x/ui/panels/PurchasePanel.ts | 4 ++-- .../Scripts/chat18x/ui/panels/SettingPanel.ts | 2 -- .../Scripts/chat18x/ui/panels/ThemePanel.ts | 4 ---- .../chat18x/uiitems/DetailImageItem.ts | 3 --- .../Scripts/chat18x/uiitems/GirlListItem.ts | 2 -- .../chat18x/uiitems/PastGirlListItem.ts | 3 --- .../chat18x/uiitems/PurchasePanelItem.ts | 1 - assets/Scripts/chat18x/uiitems/ThemeItem.ts | 1 - 17 files changed, 11 insertions(+), 50 deletions(-) diff --git a/assets/Scripts/chat18x/ui/components/DialogBubble.ts b/assets/Scripts/chat18x/ui/components/DialogBubble.ts index 3f19dc81..bf78c3cb 100644 --- a/assets/Scripts/chat18x/ui/components/DialogBubble.ts +++ b/assets/Scripts/chat18x/ui/components/DialogBubble.ts @@ -15,7 +15,6 @@ import { DataId, DataManager } from "../../data/DataManager"; import { NavigationManager } from "../../manager/NavigationManager"; import ResManager from "../../../Main/Manager/ResManager"; import { EnvData } from "../../data/EnvData"; -import Utils from "../../../Main/Common/Utils"; const { ccclass, property } = _decorator; @ccclass("DialogBubble") diff --git a/assets/Scripts/chat18x/ui/components/ImagePopup.ts b/assets/Scripts/chat18x/ui/components/ImagePopup.ts index b1cdddb9..2f39a8ac 100644 --- a/assets/Scripts/chat18x/ui/components/ImagePopup.ts +++ b/assets/Scripts/chat18x/ui/components/ImagePopup.ts @@ -6,12 +6,10 @@ import { Vec3, tween, UITransform, - path, view, } from "cc"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import Utils from "db://assets/Scripts/Main/Common/Utils"; -import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import { DataId, DataManager } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; import { EnvData } from "../../data/EnvData"; @@ -56,7 +54,7 @@ export class ImagePopup extends Component { */ private getOnscreenPosition(): Vec3 { const visibleSize = view.getVisibleSize(); - const x = -visibleSize.width/2 + 100; // 从左边缘向内100像素 + const x = -visibleSize.width / 2 + 100; // 从左边缘向内100像素 const y = visibleSize.height * 0.33; // 屏幕高度的1/3处 return new Vec3(x, y, 0); } @@ -73,20 +71,12 @@ export class ImagePopup extends Component { const envData = DataManager.I.getDataById(DataId.Env); let oldPath = url + (clear ? "" : "_thumbnail_blur"); let suffix = clear ? ".png" : ".jpg"; - let newPath = envData.cdn + "/" + "Girls/" + oldPath + suffix; - ResManager.I.changeRemoteSpriteFrame( - this.image, - newPath, - () => { - let sizeTran = this.image.node.parent.getComponent(UITransform); - Utils.adjustBgPixelRatioToSize( - sizeTran.contentSize, - this.image.node, - 2 - ); - this.popUp(); - } - ); + let newPath = envData.cdn + "/" + "Girls/" + oldPath + suffix; + ResManager.I.changeRemoteSpriteFrame(this.image, newPath, () => { + let sizeTran = this.image.node.parent.getComponent(UITransform); + Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.image.node, 2); + this.popUp(); + }); } refreshSelf() { diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts index cb3bd5a6..d3a8d2a8 100644 --- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts @@ -18,19 +18,14 @@ import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView"; import Utils from "db://assets/Scripts/Main/Common/Utils"; import { InnerMsgCode } from "db://assets/Scripts/Main/Config/InnerMsgCode"; import { ChatContentsLayout } from "../components/ChatContentsLayout"; -import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; -import GameRootUI from "db://assets/Scripts/Main/Common/GameRootUI"; import { ImagePopup } from "../components/ImagePopup"; - -import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import LanguageUtils from "../../../Main/Common/LanguageUtils"; -import { UITransitionHelper } from "../../utils/UITransitionHelper"; import { PriceType, VideoEmotion, purchase } from "../../../schema/schema"; import { PayToTalkSubpanel } from "./PayToTalkSubpanel"; import { DataId, DataManager } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; import { SceneBgVideoLayer } from "../../../Sub/UI/SceneBgVideoLayer"; -import { NavigationManager, PanelType } from "../../manager/NavigationManager"; +import { NavigationManager } from "../../manager/NavigationManager"; import { GirlService } from "../../network/services/GirlService"; import proto from "db://assets/Scripts/proto/proto.pb.js"; import { TipsPanel } from "./TipsPanel"; diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index bc631166..42f60123 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -20,7 +20,6 @@ import { PanelType, } from "../../manager/NavigationManager"; import { DetailImageItemPool } from "../../manager/DetailImageItemPool"; -import { ConfigManager } from "../../manager/ConfigManager"; import LanguageUtils from "../../../Main/Common/LanguageUtils"; import Utils from "../../../Main/Common/Utils"; import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts index 006641f4..92eb22ea 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts @@ -8,7 +8,6 @@ import { DataManager, DataId } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; import proto from "db://assets/Scripts/proto/proto.pb.js"; import { NavigationManager, PanelType } from "../../manager/NavigationManager"; -import { UITransitionHelper } from "../../utils/UITransitionHelper"; const { ccclass, property } = _decorator; diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts index dbc6f50b..896a1df8 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts @@ -13,8 +13,6 @@ import { import li_BaseView from "../../../Main/Common/li_BaseView"; import Utils from "../../../Main/Common/Utils"; import { GButton } from "../../../Main/Common/GButton"; -import { PopupGirlDetailPanel } from "./PopupGirlDetailPanel"; -import { GirlListItem } from "../../uiitems/GirlListItem"; import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService"; import { DataManager, DataId } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; @@ -22,7 +20,6 @@ import { WalletData } from "../../data/WalletData"; import { EnvData } from "../../data/EnvData"; import proto from "db://assets/Scripts/proto/proto.pb.js"; import LanguageUtils from "../../../Main/Common/LanguageUtils"; -import { ViewManager } from "../../../Main/Manager/ViewManager"; import { TipsPanel } from "./TipsPanel"; import ResManager from "../../../Main/Manager/ResManager"; import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; diff --git a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts index 3e5cd69e..28cb5036 100644 --- a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts @@ -1,4 +1,4 @@ -import { _decorator, Component, Label, Node } from "cc"; +import { _decorator, Node } from "cc"; 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"; diff --git a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts index 6476721f..94c965ca 100644 --- a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts @@ -5,7 +5,6 @@ import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import { PastGirlListItem } from "../../uiitems/PastGirlListItem"; import { DataManager, DataId } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; -import { ChatHistoryManager } from "../../manager/ChatHistoryManager"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService"; import proto from "db://assets/Scripts/proto/proto.pb.js"; diff --git a/assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts b/assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts index 96a53f6f..218d304e 100644 --- a/assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PayToTalkSubpanel.ts @@ -7,7 +7,6 @@ import { tween, UIOpacity, } from "cc"; -import { ChatController } from "../../core/ChatController"; import { ShopService } from "db://assets/Scripts/chat18x/network/services/ShopService"; import { DataManager, DataId } from "../../data/DataManager"; import { WalletData } from "../../data/WalletData"; diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index 1980ac96..093a6efc 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -1,4 +1,4 @@ -import { _decorator, Component, Label, Node, ScrollView } from "cc"; +import { _decorator, Label, Node, ScrollView } from "cc"; import li_BaseView from "../../../Main/Common/li_BaseView"; import Utils from "../../../Main/Common/Utils"; import { GButton } from "../../../Main/Common/GButton"; @@ -12,7 +12,7 @@ import { GirlData } from "../../data/GirlData"; import { ShopService } from "db://assets/Scripts/chat18x/network/services/ShopService"; import { PaymentService } from "db://assets/Scripts/chat18x/payment/PaymentService"; import proto from "db://assets/Scripts/proto/proto.pb.js"; -import { NavigationManager, PanelType } from "../../manager/NavigationManager"; +import { NavigationManager } from "../../manager/NavigationManager"; import { Web3PopPanel } from "./Web3PopPanel"; import { TipsPanel } from "./TipsPanel"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; diff --git a/assets/Scripts/chat18x/ui/panels/SettingPanel.ts b/assets/Scripts/chat18x/ui/panels/SettingPanel.ts index 09290644..9fb68dbe 100644 --- a/assets/Scripts/chat18x/ui/panels/SettingPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/SettingPanel.ts @@ -15,10 +15,8 @@ import { GButton } from "../../../Main/Common/GButton"; import LanguageUtils, { LanguageType, } from "../../../Main/Common/LanguageUtils"; -import AudioManager from "../../../Main/Manager/AudioManager"; import PlayerDataManager from "../../../Main/Manager/PlayerDataManager"; import { NavigationManager } from "../../manager/NavigationManager"; -import { Config18x } from "../../../Main/Config/Config18x"; const { ccclass, property } = _decorator; interface LanguageButton { diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 9f9cb212..10e362e9 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -17,9 +17,7 @@ import { PageTransitionType, PanelType, } from "../../manager/NavigationManager"; -import { GirlListItem } from "../../uiitems/GirlListItem"; import LanguageUtils from "../../../Main/Common/LanguageUtils"; -import { ViewManager } from "../../../Main/Manager/ViewManager"; import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; import { ThemeService } from "db://assets/Scripts/chat18x/network/services/ThemeService"; import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService"; @@ -32,9 +30,7 @@ import { AccountData } from "../../data/AccountData"; import { ShopData } from "../../data/ShopData"; import { EnvData } from "../../data/EnvData"; import proto from "db://assets/Scripts/proto/proto.pb.js"; -import GameRootUI from "../../../Main/Common/GameRootUI"; import { MainController } from "../../core/MainController"; -import { GirlListPanel } from "./GirlListPanel"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; const { ccclass, property } = _decorator; diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index 0b94b87f..d49583e0 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -9,16 +9,13 @@ import { UITransform, View, } from "cc"; -import { Config18x } from "db://assets/Scripts/Main/Config/Config18x"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; -import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import { GirlDetailPanel } from "../ui/panels/GirlDetailPanel"; import proto from "db://assets/Scripts/proto/proto.pb.js"; import { DataManager, DataId } from "../data/DataManager"; import { GirlData } from "../data/GirlData"; import { EnvData } from "../data/EnvData"; -import { TipsPanel } from "../ui/panels/TipsPanel"; import { NavigationManager } from "../manager/NavigationManager"; const { ccclass, property } = _decorator; diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index 73a9f6ab..f07e118f 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -8,8 +8,6 @@ import { Sprite, UITransform, } from "cc"; -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, PanelType } from "../manager/NavigationManager"; diff --git a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts index 6dc95524..af998790 100644 --- a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts @@ -1,18 +1,15 @@ import { _decorator, Component, Label, Node, Sprite, UITransform } from "cc"; -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, PageTransitionType, - PanelType, } from "../manager/NavigationManager"; import LanguageUtils from "../../Main/Common/LanguageUtils"; 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"; import { ThemeData } from "../data/ThemeData"; const { ccclass, property } = _decorator; diff --git a/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts b/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts index 48f8f746..09b78e7c 100644 --- a/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts +++ b/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts @@ -1,6 +1,5 @@ import { _decorator, Component, Label, Node, Sprite } from "cc"; import { PurchasePanel } from "../ui/panels/PurchasePanel"; -import { PurchaseConfig } from "../../schema/schema"; import { DataManager, DataId } from "../data/DataManager"; import { ShopData } from "../data/ShopData"; import { GButton } from "db://assets/Scripts/Main/Common/GButton"; diff --git a/assets/Scripts/chat18x/uiitems/ThemeItem.ts b/assets/Scripts/chat18x/uiitems/ThemeItem.ts index 658d64c0..ee04c73f 100644 --- a/assets/Scripts/chat18x/uiitems/ThemeItem.ts +++ b/assets/Scripts/chat18x/uiitems/ThemeItem.ts @@ -10,7 +10,6 @@ import LanguageUtils from "../../Main/Common/LanguageUtils"; import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; import { DataManager, DataId } from "../data/DataManager"; import { ThemeData } from "../data/ThemeData"; -import { ViewManager } from "../../Main/Manager/ViewManager"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; const { ccclass, property } = _decorator; From 7f96c373a98cb788c2671cc75192138d8a439c83 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Fri, 26 Sep 2025 11:50:20 +0800 Subject: [PATCH 2/4] fix --- .../chat18x/ui/panels/PurchasePanel.ts | 9 +- .../Scripts/chat18x/ui/panels/Web3PopPanel.ts | 4 +- assets/bundles/Chat18x/SettingPanel.prefab | 636 ++++++++++-------- assets/bundles/DataTable/tbgirlsdetail.bin | Bin 27872 -> 28617 bytes assets/bundles/DataTable/tblanguage.bin | Bin 33253 -> 33555 bytes xchat_cfg | 2 +- 6 files changed, 377 insertions(+), 274 deletions(-) diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index 093a6efc..0af4bd82 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -87,6 +87,10 @@ export class PurchasePanel extends li_BaseView { this.createOrRefreshWeb3PayPanel ); + Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.onVipExpireChange(); + }); + for (let index = 0; index < this.items.length; index++) { const element = this.items[index]; element.init(this); @@ -333,9 +337,12 @@ export class PurchasePanel extends li_BaseView { Utils.removeInnerEL(InnerMsgCode.VipExpireChange, this, () => { this.onVipExpireChange(); }); - Utils.addInnerEL(InnerMsgCode.PayOrderCreateSucc, this, () => { + Utils.removeInnerEL(InnerMsgCode.PayOrderCreateSucc, this, () => { this.createOrRefreshWeb3PayPanel; }); + Utils.removeInnerEL(InnerMsgCode.LanguageChange, this, () => { + this.onVipExpireChange(); + }); super.onDestroy(); } } diff --git a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts index dd87f370..d043fa9a 100644 --- a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts @@ -234,9 +234,9 @@ export class Web3PopPanel extends li_BaseView { SDKManager.copyToClipboard(stringToCopy, (success: boolean) => { if (success) { - TipsPanel.show("地址已复制到剪贴板"); + TipsPanel.show(LanguageUtils.getText("web3panel.copyed")); } else { - TipsPanel.show("复制失败，请手动复制地址"); + TipsPanel.show(LanguageUtils.getText("web3panel.copyfail")); } }); } diff --git a/assets/bundles/Chat18x/SettingPanel.prefab b/assets/bundles/Chat18x/SettingPanel.prefab index be827449..42660697 100644 --- a/assets/bundles/Chat18x/SettingPanel.prefab +++ b/assets/bundles/Chat18x/SettingPanel.prefab @@ -28,14 +28,14 @@ "_active": true, "_components": [ { - "__id__": 290 + "__id__": 298 }, { - "__id__": 292 + "__id__": 300 } ], "_prefab": { - "__id__": 294 + "__id__": 302 }, "_lpos": { "__type__": "cc.Vec3", @@ -336,20 +336,20 @@ "__id__": 33 }, { - "__id__": 277 + "__id__": 285 } ], "_active": true, "_components": [ { - "__id__": 285 + "__id__": 293 }, { - "__id__": 287 + "__id__": 295 } ], "_prefab": { - "__id__": 289 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -851,17 +851,17 @@ "__id__": 100 }, { - "__id__": 158 + "__id__": 166 } ], "_active": true, "_components": [ { - "__id__": 274 + "__id__": 282 } ], "_prefab": { - "__id__": 276 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -2466,20 +2466,20 @@ "__id__": 101 }, { - "__id__": 145 + "__id__": 153 } ], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 161 }, { - "__id__": 155 + "__id__": 163 } ], "_prefab": { - "__id__": 157 + "__id__": 165 }, "_lpos": { "__type__": "cc.Vec3", @@ -2523,23 +2523,23 @@ "__id__": 102 }, { - "__id__": 120 + "__id__": 124 } ], "_active": true, "_components": [ { - "__id__": 138 + "__id__": 146 }, { - "__id__": 140 + "__id__": 148 }, { - "__id__": 142 + "__id__": 150 } ], "_prefab": { - "__id__": 144 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -2583,20 +2583,20 @@ "__id__": 103 }, { - "__id__": 109 + "__id__": 111 } ], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 119 }, { - "__id__": 117 + "__id__": 121 } ], "_prefab": { - "__id__": 119 + "__id__": 123 }, "_lpos": { "__type__": "cc.Vec3", @@ -2643,10 +2643,13 @@ }, { "__id__": 106 + }, + { + "__id__": 108 } ], "_prefab": { - "__id__": 108 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -2776,6 +2779,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "3ekRftXP9De7sZpXWG7gPB" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 103 + }, + "_enabled": true, + "__prefab": { + "__id__": 109 + }, + "languageKey": "settingpanel.on", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6bc98F6eNOi6PlcHfBoRcg" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2801,14 +2825,17 @@ "_active": true, "_components": [ { - "__id__": 110 + "__id__": 112 }, { - "__id__": 112 + "__id__": 114 + }, + { + "__id__": 116 } ], "_prefab": { - "__id__": 114 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", @@ -2845,11 +2872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 113 }, "_contentSize": { "__type__": "cc.Size", @@ -2873,11 +2900,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 115 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2938,6 +2965,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "11oIdWtWZLAKYzlFkrApqI" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 111 + }, + "_enabled": true, + "__prefab": { + "__id__": 117 + }, + "languageKey": "settingpanel.off", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c3egjxuPVHaYfcxS8FoNVB" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2961,7 +3009,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 120 }, "_contentSize": { "__type__": "cc.Size", @@ -2989,7 +3037,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 122 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3047,23 +3095,23 @@ }, "_children": [ { - "__id__": 121 + "__id__": 125 }, { - "__id__": 127 + "__id__": 133 } ], "_active": true, "_components": [ { - "__id__": 133 + "__id__": 141 }, { - "__id__": 135 + "__id__": 143 } ], "_prefab": { - "__id__": 137 + "__id__": 145 }, "_lpos": { "__type__": "cc.Vec3", @@ -3100,20 +3148,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 120 + "__id__": 124 }, "_children": [], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 126 }, { - "__id__": 124 + "__id__": 128 + }, + { + "__id__": 130 } ], "_prefab": { - "__id__": 126 + "__id__": 132 }, "_lpos": { "__type__": "cc.Vec3", @@ -3150,11 +3201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 127 }, "_contentSize": { "__type__": "cc.Size", @@ -3178,11 +3229,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 129 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3243,6 +3294,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "d3z3v/8YdMq5fpuUHZUGm3" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 125 + }, + "_enabled": true, + "__prefab": { + "__id__": 131 + }, + "languageKey": "settingpanel.on", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8b48hwaZ5G0JRUz7awDnP3" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -3262,20 +3334,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 120 + "__id__": 124 }, "_children": [], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 134 }, { - "__id__": 130 + "__id__": 136 + }, + { + "__id__": 138 } ], "_prefab": { - "__id__": 132 + "__id__": 140 }, "_lpos": { "__type__": "cc.Vec3", @@ -3312,11 +3387,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 135 }, "_contentSize": { "__type__": "cc.Size", @@ -3340,11 +3415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3405,6 +3480,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "4fimmCTN5Og4fpVdgGOyqo" }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 133 + }, + "_enabled": true, + "__prefab": { + "__id__": 139 + }, + "languageKey": "settingpanel.off", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e5qgDJCG9DiLtNhsyP5E1r" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -3424,11 +3520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 142 }, "_contentSize": { "__type__": "cc.Size", @@ -3452,11 +3548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 144 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3514,7 +3610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -3542,7 +3638,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3587,7 +3683,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 151 }, "clickEvents": [], "_interactable": true, @@ -3658,17 +3754,17 @@ "_active": true, "_components": [ { - "__id__": 146 + "__id__": 154 }, { - "__id__": 148 + "__id__": 156 }, { - "__id__": 150 + "__id__": 158 } ], "_prefab": { - "__id__": 152 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -3705,11 +3801,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", @@ -3733,11 +3829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 157 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3804,11 +3900,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 159 }, "languageKey": "settingpanel.sound", "defaultText": "", @@ -3842,7 +3938,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -3870,7 +3966,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 156 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3928,26 +4024,26 @@ }, "_children": [ { - "__id__": 159 - }, - { - "__id__": 199 + "__id__": 167 }, { "__id__": 207 + }, + { + "__id__": 215 } ], "_active": true, "_components": [ { - "__id__": 269 + "__id__": 277 }, { - "__id__": 271 + "__id__": 279 } ], "_prefab": { - "__id__": 273 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -3984,33 +4080,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 158 + "__id__": 166 }, "_children": [ { - "__id__": 160 + "__id__": 168 }, { - "__id__": 176 + "__id__": 184 }, { - "__id__": 182 - }, - { - "__id__": 188 - } - ], - "_active": true, - "_components": [ - { - "__id__": 194 + "__id__": 190 }, { "__id__": 196 } ], + "_active": true, + "_components": [ + { + "__id__": 202 + }, + { + "__id__": 204 + } + ], "_prefab": { - "__id__": 198 + "__id__": 206 }, "_lpos": { "__type__": "cc.Vec3", @@ -4047,24 +4143,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 159 + "__id__": 167 }, "_children": [ { - "__id__": 161 + "__id__": 169 }, { - "__id__": 167 + "__id__": 175 } ], "_active": true, "_components": [ { - "__id__": 173 + "__id__": 181 } ], "_prefab": { - "__id__": 175 + "__id__": 183 }, "_lpos": { "__type__": "cc.Vec3", @@ -4101,20 +4197,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 160 + "__id__": 168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 162 + "__id__": 170 }, { - "__id__": 164 + "__id__": 172 } ], "_prefab": { - "__id__": 166 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -4151,11 +4247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", @@ -4179,11 +4275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 173 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4237,20 +4333,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 160 + "__id__": 168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 168 + "__id__": 176 }, { - "__id__": 170 + "__id__": 178 } ], "_prefab": { - "__id__": 172 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -4287,11 +4383,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -4315,11 +4411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4373,11 +4469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 182 }, "_contentSize": { "__type__": "cc.Size", @@ -4414,20 +4510,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 159 + "__id__": 167 }, "_children": [], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 185 }, { - "__id__": 179 + "__id__": 187 } ], "_prefab": { - "__id__": 181 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", @@ -4464,11 +4560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 186 }, "_contentSize": { "__type__": "cc.Size", @@ -4492,11 +4588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 188 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4550,20 +4646,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 159 + "__id__": 167 }, "_children": [], "_active": false, "_components": [ { - "__id__": 183 + "__id__": 191 }, { - "__id__": 185 + "__id__": 193 } ], "_prefab": { - "__id__": 187 + "__id__": 195 }, "_lpos": { "__type__": "cc.Vec3", @@ -4600,11 +4696,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 192 }, "_contentSize": { "__type__": "cc.Size", @@ -4628,11 +4724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 194 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4686,20 +4782,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 159 + "__id__": 167 }, "_children": [], "_active": true, "_components": [ { - "__id__": 189 + "__id__": 197 }, { - "__id__": 191 + "__id__": 199 } ], "_prefab": { - "__id__": 193 + "__id__": 201 }, "_lpos": { "__type__": "cc.Vec3", @@ -4736,11 +4832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", @@ -4764,11 +4860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 200 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4845,11 +4941,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", @@ -4873,11 +4969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 205 }, "clickEvents": [], "_interactable": true, @@ -4942,23 +5038,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 158 + "__id__": 166 }, "_children": [], "_active": true, "_components": [ { - "__id__": 200 + "__id__": 208 }, { - "__id__": 202 + "__id__": 210 }, { - "__id__": 204 + "__id__": 212 } ], "_prefab": { - "__id__": 206 + "__id__": 214 }, "_lpos": { "__type__": "cc.Vec3", @@ -4995,11 +5091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", @@ -5023,11 +5119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 211 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5094,11 +5190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 213 }, "languageKey": "settingpanel.language", "defaultText": "", @@ -5128,39 +5224,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 158 + "__id__": 166 }, "_children": [ { - "__id__": 208 + "__id__": 216 }, { - "__id__": 222 + "__id__": 230 }, { - "__id__": 228 + "__id__": 236 }, { - "__id__": 242 + "__id__": 250 }, { - "__id__": 248 + "__id__": 256 } ], "_active": true, "_components": [ { - "__id__": 262 + "__id__": 270 }, { - "__id__": 264 + "__id__": 272 }, { - "__id__": 266 + "__id__": 274 } ], "_prefab": { - "__id__": 268 + "__id__": 276 }, "_lpos": { "__type__": "cc.Vec3", @@ -5197,27 +5293,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 215 }, "_children": [ { - "__id__": 209 + "__id__": 217 } ], "_active": true, "_components": [ { - "__id__": 215 + "__id__": 223 }, { - "__id__": 217 + "__id__": 225 }, { - "__id__": 219 + "__id__": 227 } ], "_prefab": { - "__id__": 221 + "__id__": 229 }, "_lpos": { "__type__": "cc.Vec3", @@ -5254,20 +5350,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 208 + "__id__": 216 }, "_children": [], "_active": true, "_components": [ { - "__id__": 210 + "__id__": 218 }, { - "__id__": 212 + "__id__": 220 } ], "_prefab": { - "__id__": 214 + "__id__": 222 }, "_lpos": { "__type__": "cc.Vec3", @@ -5304,11 +5400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 217 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 219 }, "_contentSize": { "__type__": "cc.Size", @@ -5332,11 +5428,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 217 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 221 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5413,11 +5509,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 224 }, "_contentSize": { "__type__": "cc.Size", @@ -5441,11 +5537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 216 }, "_enabled": false, "__prefab": { - "__id__": 218 + "__id__": 226 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5486,11 +5582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 228 }, "clickEvents": [], "_interactable": true, @@ -5542,7 +5638,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 208 + "__id__": 216 }, "_id": "" }, @@ -5569,20 +5665,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 215 }, "_children": [], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 231 }, { - "__id__": 225 + "__id__": 233 } ], "_prefab": { - "__id__": 227 + "__id__": 235 }, "_lpos": { "__type__": "cc.Vec3", @@ -5619,11 +5715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 230 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 232 }, "_contentSize": { "__type__": "cc.Size", @@ -5647,11 +5743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 230 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 234 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5705,27 +5801,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 215 }, "_children": [ { - "__id__": 229 + "__id__": 237 } ], "_active": true, "_components": [ { - "__id__": 235 + "__id__": 243 }, { - "__id__": 237 + "__id__": 245 }, { - "__id__": 239 + "__id__": 247 } ], "_prefab": { - "__id__": 241 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -5762,20 +5858,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 228 + "__id__": 236 }, "_children": [], "_active": true, "_components": [ { - "__id__": 230 + "__id__": 238 }, { - "__id__": 232 + "__id__": 240 } ], "_prefab": { - "__id__": 234 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -5812,11 +5908,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -5840,11 +5936,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 241 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5921,11 +6017,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", @@ -5949,11 +6045,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 236 }, "_enabled": false, "__prefab": { - "__id__": 238 + "__id__": 246 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5994,11 +6090,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 248 }, "clickEvents": [], "_interactable": true, @@ -6050,7 +6146,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 228 + "__id__": 236 }, "_id": "" }, @@ -6077,20 +6173,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 215 }, "_children": [], "_active": true, "_components": [ { - "__id__": 243 + "__id__": 251 }, { - "__id__": 245 + "__id__": 253 } ], "_prefab": { - "__id__": 247 + "__id__": 255 }, "_lpos": { "__type__": "cc.Vec3", @@ -6127,11 +6223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 252 }, "_contentSize": { "__type__": "cc.Size", @@ -6155,11 +6251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 254 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6213,27 +6309,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 215 }, "_children": [ { - "__id__": 249 + "__id__": 257 } ], "_active": true, "_components": [ { - "__id__": 255 + "__id__": 263 }, { - "__id__": 257 + "__id__": 265 }, { - "__id__": 259 + "__id__": 267 } ], "_prefab": { - "__id__": 261 + "__id__": 269 }, "_lpos": { "__type__": "cc.Vec3", @@ -6270,20 +6366,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 256 }, "_children": [], "_active": true, "_components": [ { - "__id__": 250 + "__id__": 258 }, { - "__id__": 252 + "__id__": 260 } ], "_prefab": { - "__id__": 254 + "__id__": 262 }, "_lpos": { "__type__": "cc.Vec3", @@ -6320,11 +6416,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", @@ -6348,11 +6444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 261 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6429,11 +6525,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 264 }, "_contentSize": { "__type__": "cc.Size", @@ -6457,11 +6553,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 256 }, "_enabled": false, "__prefab": { - "__id__": 258 + "__id__": 266 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6502,11 +6598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 268 }, "clickEvents": [], "_interactable": true, @@ -6558,7 +6654,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 248 + "__id__": 256 }, "_id": "" }, @@ -6585,11 +6681,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 271 }, "_contentSize": { "__type__": "cc.Size", @@ -6613,11 +6709,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 273 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6658,11 +6754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 275 }, "_resizeMode": 1, "_layoutType": 2, @@ -6709,11 +6805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 278 }, "_contentSize": { "__type__": "cc.Size", @@ -6737,11 +6833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 166 }, "_enabled": false, "__prefab": { - "__id__": 272 + "__id__": 280 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6799,7 +6895,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 283 }, "_contentSize": { "__type__": "cc.Size", @@ -6842,17 +6938,17 @@ "_active": true, "_components": [ { - "__id__": 278 + "__id__": 286 }, { - "__id__": 280 + "__id__": 288 }, { - "__id__": 282 + "__id__": 290 } ], "_prefab": { - "__id__": 284 + "__id__": 292 }, "_lpos": { "__type__": "cc.Vec3", @@ -6889,11 +6985,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 287 }, "_contentSize": { "__type__": "cc.Size", @@ -6917,11 +7013,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 289 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6962,11 +7058,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 291 }, "clickEvents": [], "_interactable": true, @@ -7035,7 +7131,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 294 }, "_contentSize": { "__type__": "cc.Size", @@ -7063,7 +7159,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 296 }, "_alignFlags": 18, "_target": null, @@ -7112,7 +7208,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 299 }, "_contentSize": { "__type__": "cc.Size", @@ -7140,7 +7236,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 301 }, "m_rootNode": null, "titleLabel": { diff --git a/assets/bundles/DataTable/tbgirlsdetail.bin b/assets/bundles/DataTable/tbgirlsdetail.bin index 003143c2997a226079d82d6325e24ff1e46fbdb8..de002a3de9294df86f538d44ae0db9ca4eebcbb6 100644 GIT binary patch literal 28617 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 diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 7ad612c8fd79d2b7aeec3e483841c9db1468abd4..9fd5d6480cc37b59289dca77c1d4abf563009b3a 100644 GIT binary patch delta 289 zcmaFb%rv=;iK$`pMkZ#-$!Em4>yz^fDpOPV98*$?Qj3cffZWW~6#l1kHawl%@O1m8 zr%QUDc5Ksouw>PPB}*PG*{ASe$uoYchP^i(iUAvZCvG%+U!D69gp^68R| zFSaawzo+NL`t8p;yPtNgfQo}%R)*$`sSlQHc(7!}gQe|2$E*WV50*3mSz8}0+5ce4 q>IX|UP1a`>69-CkfK~N^oV&E~!ID;>l)~m$65WxEESnpPQuqO^-JKBt delta 36 scmbQ-#`LtAiK$`ZMkZ#-&2~}+kv#mVMMe2V@yYoqsqvfF7pL$80PuGWLI3~& diff --git a/xchat_cfg b/xchat_cfg index e296702a..b076d217 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit e296702a5e8ac801dd5a648803c899918c6a3ba5 +Subproject commit b076d217c1a652369c01463b3c36553f1f4a7689 From 24921bb094cb82b4a2e789f0934e8d6858ecf679 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Fri, 26 Sep 2025 11:57:33 +0800 Subject: [PATCH 3/4] update --- .../chat18x/uiitems/DetailImageItem.ts | 4 ++-- assets/bundles/DataTable/tbgirlsdetail.bin | Bin 28617 -> 27872 bytes xchat_cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index d49583e0..fa086bd9 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -175,7 +175,7 @@ export class DetailImageItem extends Component { } if (type === proto.cs.EnmResType.ERT_Image) { // 图片 - price = girlData.getGrilPhotoOriginalPrice( + price = girlData.getGrilPhotoPrice( this.category.toString(), this.girlId, this.resId @@ -188,7 +188,7 @@ export class DetailImageItem extends Component { this.isImage = true; } else if (type === proto.cs.EnmResType.ERT_Video) { // 视频 - price = girlData.getGrilVideoOriginalPrice( + price = girlData.getGrilVideoPrice( this.category.toString(), this.girlId, this.resId diff --git a/assets/bundles/DataTable/tbgirlsdetail.bin b/assets/bundles/DataTable/tbgirlsdetail.bin index de002a3de9294df86f538d44ae0db9ca4eebcbb6..003143c2997a226079d82d6325e24ff1e46fbdb8 100644 GIT binary patch literal 27872 zcmZ{scYI`3;l(FIShlcB+s%?JyGze50g`!>3JE0i8Z>GY1r~n^5~NvvK?7vLLQ8fA)?ULNGu(u=T}LNoBzoPVt^MZ7yy1w!8qXO z6|4p9D~ZI4p0f_{Vg>5~FHx`o@KOaE0sBiLT}98?1h^4LmK8Oj2J|uWb(ZK^qnVPnFwmd(k=FXI)rr{@dO5NEi6? zk_U#rAbGsx@*D60FG@je$>kFeOiMvs)CgXZg8J=@;AJUjC^dptq@WRkO}pmn5STiw zOm3;Z!sRw7s6(&;x4QaD1#zdVuTl^+Vpiv>C-n{(Y$M>Q8!3Rr*4dH zZ_DBxORH{jHS{RGx;eVsRya%pdUcDdp-1V}t@x{Qensf)YyxUY5 zQDsG|Uz6NaxcYU;<0U-)4asW_e^YW>;OZGEs5cF-o|S?I)9~tlNkO9({96i|%n(pL zSHW?vs7W;(19r=g0dX@1?3UcpiLlryF6`MC z>C(3(rA^;<6Q*}w`ZVmC>QNds65Yx6$)j}YJ8nAlD6QJ$dhF3AOsAb0lf$^zMMNgT z>98{^1wn*!Rp(n$fC-g?x23>NsGaXff$d}GyHa2$)Xw*$z)q+ij!1!-P?zV+RBOt# zEV-qB#Kp6=piH$aQ~!4qL{9oQDTtW#e^)`Ir2lRO5t9CUT3vFyYN|Q#TO9iD%W6@m&tzDGd zvT>2QpS50WadS*;H!hX}8{3Ubq`<~@kmIB+Dku_3a7hWT4rNB03WKSuu3$KyAq`)q`M)o!fucAhA;RP%A(TW&b zSC(&Gy=mR9$t{z=boHn&Xk9&9H~A|C5va)t1(B!8Clo}SCZALgX_|aWL4;{?(sd_% zwP@YsW(Co@$zLmo)=mBf&@8^fAIsKF{#H_Y^gBsu((hd-y-%h~e~^?m{n0%{dB@VH zKe@(wltw-6mS!HMQ_r}@dbDvta?9rRCX4mnEQV0~Ei*xv^AnS9}h?QAZg(0#&_maz87&7Z~FS|5*lpehzDNXvb zq;%;o^1QU^uhCLF|9I!6Pk(b+_b81@x~zMYPW|0w-J^||f99J^jvBnIBNS%-nLk7d z%v1mTp_1FI&o@hfoqpz9q`*!;^M^@+oqpyImx2aUr}DAlOo$UbSQF`@G zbcLYw>Rq=4_Ku}j@42^<9&K2VOjR6jn%TI`0=aSP0yzSHg5&|-DyAwuRQxzvk zZl>Z?#mQ1&rs7mZyA+tIxIEwcCe!<}WU3Vbv2O&M3VPqf-nSwj#UXA}E8<~az=e;* zU1~)-ibLF_R)nKC#64=wDu`Ru`j&!7bL-m*BFwGtD2Ob#z6)r2AO0%red~LY!lSl` zq%f(iL{hla7IiK0&I_B`wv!Y-wUtT=quREY6i&4*kQ7$6?GVlVDCk`kylPt*6<)FT zZHv^g0liu*X|M?RRFmJPZ5r0JwP9#T+eanm3Lw??G0DveAk}u76qpr2s_k?sFe`vm z+Zj?|RsgBC4N_npKvQjJN`YAcq}o0%1?H7a#nu+bYD|mQBvU=O-KMCqnr&MQ0bK9F z-7XFh(4HL>L_T{KDu{UYEK(5Z>{+ZJ!r8L~rQovIyIN$kXGaAQ&7P$SBAGqQa;f${ zmM!ktDc3}w(xaUvrAfO;N|$z(ls4@quZlh`my|}Wkd#i9m6Vvd&i_WVYNe#~YIjB1 z;+}Fz=~acK^lFu)^lA@D>DB7oy1@HJ0liw2`whgW^lEMH;lro&YR}xmhfnF%Ub%IF zPwCa(xpjd@<24wydd^{A!R&?u^S`$pwR%1&xp{Av>N!^m?6B2yo)p-XLC^V8V27=q z3#7ojX-@TACiLuum^aO-o=;1G8MapChb_B9XGJoVK)&tB6e}3EVjQ*-WeOr? ziIoZ>WQpBTNHe~KKNcBFlq-mcB`Op|!V;?#M8FbzD2RL|Rx5~jCDs6P@evDOEr+ed zT1n~Ao^F8fj-^R^NlKUYmXtQ_BPo5_S5g|apQLnZ{}Q|R$N#>xsxDR!3=hLmw+&kiXC+friO<&+xVUqQ5Gyi!4wWqh4$ zaQI`u#^Azby8qo3yfbc1$OcuPe=iGM{HW1 z@0s06v^<%b#tpGOE7&#?<4&T~biIOz&~$@>NYHeni*@*85uoWN1(BcWLli`OrVmvR z>6va;5aF3_Q4ragJ`B+GEPS=>+4SKqvmT{Kt&-BDHc9Ey5t7oTBPFFzM@dSfj&>_> z@0#h))DX>kNzD)}3>^yzD z6xb$B-ysFINz->qfqB8UCSMf0OK4RxU3#>Od%-4`78rAr-> z(xwkcN}oO`DUJG&q;#rNQd;$4N$J%`6vc#;ED9+1rB|o9>WA-9K(9{E zy_Ao6lwO_Ts_#*HwZT>2qYaCI?>4RS_G+;rkqG!bk_U$0D>+}Rr%UgXymmYC`z5b4 z$3GysS(B$rACv;~@SHAvND9oubGmd?3e3av+Wf#`w`na;rmK)ZI|CQ&=ZSHfR=NrS zEDn)_D&(&?L=37BKl|_;{#c}-3h65j5rQg&uQ)^os*t_n5Ot|KO+mD!>U5;m3@qUb zLRqTLaFGr}4lGq0B&A1ZN=lPHE-795A4zFbm!$NmTT&WzR_+J*nD>q7)F)gGJxZ(2 z&iyv#A4{)#TuH;n26&H^uKJP5pxf89^$%wlD7;-ySN&LWJRaWw!NXF337CRMq@b2h zjp?dKrNB(U>8i)1z*e#9CsJS@kJD8@l>%GEs>h|kRB_LI746Tm=!Zj`I{mzBP7gPI+HpEMct_I)u>rfMBeNr71mr#mL4Aa1JGu~`ai7dw6}1?HV{y5l!e zz{N1W#c!p+JXY?NZ<5^^wlbOS>ver7*d!F=&aiafMG7J$eVCBHO0Nc^ z>jaH20G=}G_V!^hs-~lT&r5;rXx|G`U>;c0eJ@IZ?P%Y$6xfdTy(9(ZfpzbE1?^6- z70L7v?v-5~7HorwaVJ=M2)C*@gkwWjDTr_lUG3@+{#ayd=o$qPt)T%0k*uLX1re;F zYY{BdvhX>PtD)-@M68CccaaPq$qEi7B&A1Rk(4HVRZ_b2HA!jH*CnM--;k6>-5@EQ za(^cp^S&>wy2+Kyqx1@YCu*n3Fl7aYZgCHP9*r#le$^z@?W)SJIuSQhqoLQNz}9H! zbt$kl8hS$tY>kHAlmff#9GZ~=yX+jAl>)o$95R3J33KglD%*Zd^Q%mH$o#!$Q302o zFv|SBXHh}S?E6d)&70p#ik%~7_I>V?Z@b<9wLF=gKrC#b3pV@2xc@6Xaif9=^2ALF zBF7UqyIO`n7BQZ+Iy2y6Y`$lxi{Y7ZZqqJ(1Yph4<)pw)0A6diHJVj1q zOcUH5u6)oDDAVVOtQ6QjPrM}sw$Br9OM&h4#5+=8`#kZk6xcpbye9>=&rd|8z&=Jk zQ6dHAF>>FnT@36lu8L%OW+d0BpkNml1jyOUcN9d-W;Q8^l+AosL4<7PZUvFCnR{}j z@h%7vo4Hp(By8qB1re~B`xQjKW**4p+B+w^IP;*S^ync;Y0{{qbZJad+Vnk1>C^v7 zN~69nDV-XZlve#fQhN16MLF}%{76!I^lwLg=tq{l3 ztH+{Mg4Qoire_ziH~8GpM9C8HccAp_Vkt1YG}5z6q`;0JvpY(G9Y1E5N`W0eW|v8U z9Y1Dwk^(z^%$h&kE&4U>dSKT4;ciiZT@TFe%GtiCz^n&0?Ux^6?1rndWM&1TXlDDM zVE;_O4Of{JNMdmq03wLy{jGOo91uAy4r>7s!{V?G5GgDU>j57|M7ezT&e;I?h=PrP zk1E&%_?Sz+XF?6=Pb8&BKb4dwJuWF-`kAD(>F1Ktr(Z})qkbtVo%)rev}(dN-E)Ip zJ>i-jrWj!|E1q;s_b9!3$~E1i!GdI_tlV_OZ8O@sQeYUlQpl85NP$@?WXe`afqBW5 zDceH|Ow%)EtEIp^KxfL1lpaL4>FIDFu<8=1Bz+o#xGmj%i@{f{>i%Un_{Y5^y6^rt2965yY-% z6+{lZo>LGp?3!|&3!f7y?0Q~7gs|%c1(Ct77ZpSVyQUFtQ|0hEk-)B(T=K(^ZS8tl zQhM}?q%`TzlG3HWNJ^XjDk**Xo1`=H3FjYxr0!eluPF z%sn3a$JQ=QX1be9O1+It43wGHx(|^8wDm50!l6=tw%!dvvlQ62cDG1@ZEN>oQefNK zeYg~u1#G6fRSIldyW6C|Y%|Vun?GcRiQ$z#j56DdGu`G7nTspu$k*m4I8eG6R2C5Xl+%hk^*sz&{m4)(2j7-3^}; zQ6G3sK_q?Pbp;Xhfj1PykTCEj8f1oq@HsIg49vKCg&~K8fmuoE(Z3|6N&l9VF3m|w zo8~2@PydmWM*UY(I<-YoT9wNE6dZVN(5ti?Y{HbQlCAE2AjbXqyU2r#*)DkrNAx?22YX#JJ<}KECqJ38ElsV zJJ<}KA_aD^8GN4<*uiG-{Ze2Do52n<3=}oWygknhen2bC+w=ALk;3l5DobWY5h=Tx zFW6EOa1T~y6p1PhabrhQ3Zes}Y1i8D$D#tG83oaR(X4_f!01~FBLAarBmZVF2%i)2 zAALtbq<{2X*PQT?94SWMlN26}MI?nuVlXo^YC7QU-(nceW5U=+ zrNBNWjD1WB>{u{%niSZvVC-}$FmKK>V`oT#9Sg=bNP!&-#?F)i^X5G>_HijNZ{82c z_t^d8TbU``a9h=a{Wt+PaAl?zD2UrVwS$7V+fxf&;ldw_n?1EiLEP)9#R?*xQ%e*? zI;VC-c1@4N=R}XEmMVxIPc6e&;dY21d?b53wUg_FN9obdxTNC8(xhGFv24%8 z0^6sl^Q6G`Y3h6_uzi}kKniT1rY@8M^Dm!framPF?9-;Id|lkX-<6H5aG@{QI1_M} zRyIs3YqESCvE#HH`?LvjK3AlE^7VVI$yb1)BiZ zxY&k27In!+)=El`_LP(+?IkH)+S|Q{^3F?}_Hpl_JW8MTb#?J5joQymKOUu12e|1c zOar{m%|`l6j=cR)3i*Y#8Dm zR#vGaaSJOCR7WE0l?SOK5%$W1T_nTjWY{aKai|&nJxY&i(7)o8CdK3@)1^RC+7y?R zKGjM}qw3rfop;T2s@~PeqqM5Qt>QdNuNqy+!jymMmaV+TWYF8D!$9$wEn7Jt1-2-a zgHm9A_sCXWD+RVFmDfpuElTC}QecX5P`)U3E78hiw!O|Jx?pEWz^z2t_Id@8f%XOk z5rOtb1(AUErjkgd=|cFN2tfNG3gZ5^AF3d3e|xj*Lil5G_uE?(#LaI%%!Mv|B#Y91 zxGRcB=~1gZmL|2yW9iZn@>tq*q@?ueC`oD5(UQ`sVL4p9L_u^(3hw!`? z_uBlF?;VMF_8wOfSW_MV_1ve|ng@>TR>5zXF{6htz6PgW4Y>}}7* z*1KAkxc3xE>CyWnrAhCXlrD8hN}E0)DSi52?yZD>%{1ymxia~bPIcxMemxcAg(T+rAe;JcYn92xozfN?WL?7c?{P{bSX3HM3?ib%nIQecbN jd%qOeBKAHY1-6L24@!Y8V(&vzVBT3|dq<^!?=1cwJD{B^ literal 28617 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 Date: Fri, 26 Sep 2025 12:14:25 +0800 Subject: [PATCH 4/4] fix --- .../chat18x/uiitems/DetailImageItem.ts | 4 ++-- assets/bundles/DataTable/tbgirls.bin | Bin 2930 -> 2952 bytes assets/bundles/DataTable/tbgirlsdetail.bin | Bin 27872 -> 28617 bytes xchat_cfg | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index fa086bd9..d49583e0 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -175,7 +175,7 @@ export class DetailImageItem extends Component { } if (type === proto.cs.EnmResType.ERT_Image) { // 图片 - price = girlData.getGrilPhotoPrice( + price = girlData.getGrilPhotoOriginalPrice( this.category.toString(), this.girlId, this.resId @@ -188,7 +188,7 @@ export class DetailImageItem extends Component { this.isImage = true; } else if (type === proto.cs.EnmResType.ERT_Video) { // 视频 - price = girlData.getGrilVideoPrice( + price = girlData.getGrilVideoOriginalPrice( this.category.toString(), this.girlId, this.resId diff --git a/assets/bundles/DataTable/tbgirls.bin b/assets/bundles/DataTable/tbgirls.bin index d330cae2af297fa145fc385ad32dcb901a93f738..14966c892dd3d1b3adc7e10ac631e277de6777f7 100644 GIT binary patch delta 200 zcmew))*(JYooU&ci5dya2NGQ-b|ru~uR-KwAI1cxT_%&)F&+d_g-k#dp*@o?Gl3;d zn86w*PlM7wK(rIfL8$wz5Lrhyh#`yFz_Kjt5JS?~A(}KfApC9+ m4K(a6hz8o}&k1(PMj*9MX0k9BP_^ru$=A4mvOwB`+X?_@;!G+4 delta 188 zcmeAW|0Fg+oiTZ$W&%^g&xt(=K;}CjF*$${C@^*MCdPv-4O1B;Cr@M&p4`Rc&D3yv z@(m`C0xM>aj>&Vu)Fc)lXXWH%mV+QMbykpqPB8hJ6)fY&2BdCJ-pB@$5oQN#En^3( zw&DQu=7Ok|lQ_ZZk~tHA)-p;?e#j|2`4%V8+WC{!xq!+yPkzk>RIz!oAGZ|%G^0lu diff --git a/assets/bundles/DataTable/tbgirlsdetail.bin b/assets/bundles/DataTable/tbgirlsdetail.bin index 003143c2997a226079d82d6325e24ff1e46fbdb8..de002a3de9294df86f538d44ae0db9ca4eebcbb6 100644 GIT binary patch literal 28617 zcmZ{scU)xE-NuIzw-;S^Sz*^*JG+hwbBC&+V6UiXFxJ%DLXd|yCOV`og0o_8D7XREW0YajN$4T!bgkshd%GLwo}e2Q~&leARk!- zZ&HD$1#eM7tl%+xfVZijqTrcBpAf|uRaAzx;vK4}+C(efrHbl8t$2?rYM@xRAX^bn zRb+8uL)le+mc5*cc&p^PmtD=ET=lYR7?f*Xb}fTqSlM+9%JnYmW>BtnSr3EKkFx6- zlzNoiV9OKypi+;r8*M#;G%EEdi*pQ{e!?+~`YFe->Sr9oteZH7T|c+obKW@&`vu3a z?B?*MrajKlFzpswO$WoZTf+-Yv4hxyYin#Z9SqmjhF6etdvNWxu*Yz0mhg{M+C5$A zjfySFRlP0ym)iLAiP@w=gJ)Z@HC0 z$$QHh1|{t+YZ;WRx7@~{B)#Q!)JRQ_!OtQ=Z@Gg~$$872wt~T9F*>x|CFfOhr$b>= zFQxG5m;9yS)UP;(SHHG1t8;3&)o1JLVEEM^o^KlFU^sTSop>D#%huU;JGfRR-j=k= zWX$QOgeQb)vn4|XUPw)7EniVZOi!#WUsHvddRxAs3RBURZ>hpey)EBSg_(Mf4pD`k zdKYHfRiWB7FR`Jk-_L7BPP;15uCBWol+<*sV^A{Fbq|ALde^-SN?y9|vn>d|BZ*7b z{p?T)OVm{he}qu9;8(2)%B2_qk_kxUR@7|H!-t}gJIMo;Ta~y4u(|&;kgXM ztikXChAUG6_VcfG{>;&8IEDrv$hD% zi^Hzphi99lI~a!j!S=+#aO{tEGH@^~d(KV<4z8Y^*wA0Ba#Lw)gr!L3DswNUYSdps z1)jRe>R&GR-ua{e_~MLH8RYgglpt^1|?b}FEA*< z8hMdHiPgx6ZBy{=N)t!cQz}gyd5KbK;>gROYS9*aWi)Z*6^>!lpE-tAf3Zb%UL0oq zm1EfTH+xU!91X+%ZhP!tSoW%2)HxWQy=Hst;F@WP4eM8`XjVD%odiVPRjuEN3Ov0g zTOXkc)714lQ$>ZoDO$e^RaEL*p7py@MU_hb;%xe>{q#@1>W8g5C;in(|Kw{7$|aqA zok6*vlW#C6mveHILAjWdZ!##Ca`G((tEqQGfO$=hF|}-;dd|`OW5!`7@oav!|&i4nWd&` zRi>()@Jl|_EH$+o73fC_Q@c}v$^KLwRhU_7s-7y$EH$+URhU_7YEP=D)(x9#pb9ff zO*K+Qt?uB|UTO-;>zA3OruOC%Jxgtw?P-nb>5@dUIN>M1Ca0%0($i$|`wV&lKVUE> z@IwYG1b)O|rNEDE+k)??O6Vt)Rtx=<(i)+kQCcf>98^tH!ShN}lf@Gp!>P|XhF4#3 z47VmZhF?>*$j)1XV_$L%%l^YLJlnuAOiOYM*HRSAbID|Jnq#<@vGZ^6gUNHrWbs#a z2y!r7`#QXt8NeJ2*S-laVi>M{YuC}v(QxfM`%Kiq)zcEmk^@y`Yc^VD*VtutNccgN zdw8IkEIF78)FaVk$stsrr|x9Qp;V!#?qo?5Rp_a^I6EZNsv)5$k!+B_=tq&YIYUA% zhJ*%*OMWO9tUB)s8kN+sY8-%u*~ zZuk~djS9g}gi)d4JC4Py#t_G1S7QOk;#XtXmd81_7}mH6$KqIHA;)4_g}Qd5>ebrnp<0c{Qh{1KBpZ*T z0=;%fHXctEdhL*GJb^0o+9BC^B30k1WaCLxq1O({#*?W+KPM`&6_1vy ziZ4qf+vV!37DvlBuDA%q|8}|d`JrUCeL91Z*!CF=N?zM%GAL8sCWB(zo0ILQJZlLt2XBtW-Z_tc5T7m8Vp;=F)Ule zF+3|OkVy#rbw3zPTg)+B+md3`ySAYfG}jn%;!8 zD3Ody>h;JK%^B9B7}nxN3`*+aiy4&6#kWLL)%X*9U5Q-0m{Lhxyo6E-TzmMz;8Jj^WkTcKC3PhFjZk48OMJ7=~@fF&x{TV_3EW$M9^& z0<*;_>b!H9R$5?g3S11=Run8Z<6`h=jBN3h1uGej&J*6LLL1$v!qJ=x$1kJ;{S{U+ zei2oe4#zL13bQnccTq*9dT^MGucivKG>KnA75cG8GJYvl)Tjp^$@pbdp&x4`3iKjMYB;!|cNz6#D=8_8aoO5Y*$kCg+WXKtkIO-uM zXX8y2o4S%iJ2EIG8Y*Q_Dm1jhmOJ>m(x9Q0luChycA`}JGZdjz>NB)6rP7|ET_~0E z4DAZ4hMeGg#*i~qW{c}!cva3Z+=_AxzdVj%Sd3#hR>3hWtK=A-RoO*_^TA+Rwf`I< z>R`B56D~GmN)Thn8LG953I|803%^cv%-L;(0IIDW$)Rql&|f1YhkB?Yrkgx;Jyn=> z!_W;>VV*?{-AEN?-7plV3bpxT-B#HG>Wxzi6Ui~TIJ$s2dt;*5IF%f$Vo)MAR?VOU zYOKaaJ@~qkr?FZ}B~D|zQ7UN~+nrJg(^ws)lBKbFN+n8Tdw{9}2H!IZIJT#av4i1N z1IKWykz@F^7soJcZ;s*EJ{-fceeJ5=dFSwKKU+Wt!?gWv0UZq24hZ{meh_=*@}zHU zjY_4ny9x=@4I5ia6{cZhw^4}2ZrDk^WfSE{uc;Q2g9`!?ZDt*xVFj;3=XcIDg0hlH)q2d zsuKzczmIZH@%t%P-vFcvAE1JYP2@pms_;Q7sKl2Hsltb-K(F&tg%4AOzE@8bK0+1x zUOiPfKo$C4eR+1=(OcCPCQ=c}q@K5PwlPJqRV@{fMCON*iHPJeKa@m7B#q`?J@~p3 zh=_!dP{~6?vPh`JAtF&ER5}zno>Hk$egJIgK{`Y(C(QvKZwl{dRC(qMTkw;Z3 z{f%Ar=SWDHTnrIBMg<=BAfzIXQ-S(9QY!KU6;!BO(^TY1s?d{mD)JOnn2JW8rV4#4 zo{Bs}6{ez*XQ@J0bn9$I^$s?vX!9w4(Q-C0MX`e|)%*hnC3MZFGANO2ZnsqlzOISI9suH9UxaQL-mAo~dL8-*8`AkYBZOvy=E448wlRF&z6}j$v6xcpCd)@a#NWQRj2RwDWC69SqkluoVqruY9`j7gQ>pEpSMf zYGCt=RG?SZspb)?i0KM8ucr!A(&m?_LO=6PHNQ+1YGo}S8El#95 zJN%mDY?6v%lU%CvJO(8)o#!(sf$6+}L5WLer)^*Gq>`4-3n`VbbY4WMWTo?BN+l|t zUC5#8b@05Bl+M*Qr9p~*bzZ_Tth$tAm~|P)uH&&nq$Oy@66mS?`TD zqrqd*&E7c2@aiWV!>ylk48MNHF$}wjV>tG6j$zp^IEH8T7rRmCbHlV-Z224v*W?$w zW?~IubhCGjy}5L7bhhx1RA~MEW!crM1W>iB_hTwB?dtu6Done2Kcx!OuHMh6!mM9= z$Em`sUwbF0!mM9=)z5ClW&JhK#vfLHm6YmLKfBGVQ0rGQO#SROuOg~<$fkOy)Hgi& zP7~ETWVg$X1bRE%!bECVQliVAvkNPV?Qp5#n;DdB58uL|BzyQ)+t=XhO0b95P%60| zUQ4OOdiXXy$nj=#_#istHz9K*8Ta176eIEHDz_xboQ*>sww|RINjUREPoP9o zKUa1RjR}=x5?Uctf=OtlP{}2sRYD&}YH>^8oVQx&6O`5neUj2zp-sgNB*Y7!oVSnHlj{T8iSoR#p@a#_Q3)03MMk=4303GvZRw(=RH27~bkSB+q3_ny zMa!r{->vVMZJ*wSwJ?#clMAB@ma|F5!!E3Jom`guP~ucKY&#M>RMJ%UJf&h;-3ydT zmg-)lRH9TjLa8LFZatEux*2>|5~RA9D3u)5y=+q$JXTf!>AF`qhFO2+7?D+UvGI4u)%Q*!~2uS3WC|u3xEQ>Fl#Y#MC^R zuHT6&^gNobk5Gl4N7MB?Q-$8!nXcc3DolauccltFkEZL(s6v0|o31aX3jMQ_bbXX6 z^gNob_tZR^*D?Kfuu8K{_P2ATTVM6dnzI?l!*;H8>uU^3G+SS1P=eX|27?mI)=}HV z;7KKwt#48)p=^DNQpsfN+muQqTgQ-h)$-tZC6TS~*fsj$zh6IEG#S z`%uXEI$fOw|-!I96VZ9)9Ka^{d;lu=!&_CbX%>; zt+Sg80aNo}+iq0gg`Qd}udq86NQ?I>6h$3Xm=?FyQ-x`9+a6S5THLlLRp`}lx~+jK zOpDtZsY372PPeHao{N{k`v>t$@6b-SsUM!_m#D{T;>bQ~EXeyRdWUwpZC@^l$sa0M zw<0@Q=*?@36Y1`RU+bJ5IvzH!rMur}P-4{m0fQ2v?hhH1@OOV?I~_c!WWW1kN+tT; zpHM2v@BWlh87;a$L#xzi5j?Mq7Tx2vb3uyHqI-g4SoJx_FzXABVb>(bFl>rrIQAvS zu!?dLT^|t5O0@qS@C<dIg(5CBmR}yVMOmmD@vpXBxCvxA!jF%hrMX& z0ZCYXDA#x($)NONAZ7a;d|j!YV%gxP9E)dzv%<2a5?_XU z!Ox9V$KY%`P&gRxe2yI`9E^89*REL{jCVfI|MR@=xvORhKSnjf*~x}{>U)pDW2wU2 zdkh{&6=tLuJf14dNHKTA@4J!i*GytEj?^6oV&Gh5m*hJ$N!z=x+#i%68oU zb8P8Rx&FGwIa`rDY-UT3PGeB6{pfTC<;suFuuTlUu3Y%hnUubrIOdt zIf%3Bc<{W^@zJ@IO2pOQ-!J7=s8rO|Bh~Y^jxY?HCq?SmdO9BZkf;`zX~}!hCFOo%Y=#; z^aL)pX$~G56S^g(6+(;I3s(v(p@&upT~ZLbWsa&z@U+!JmllNXd^<0#5xNznwL+KK zBnMwvT9gSb=NMjX%`x2ChGW>Zt$h;aoEv^^XP<;Q7>;dkTjXF^wu7Cl91PEPvXfO1 zd-9+;6Y5mCa<+vbBdSH2(1lc?Ta*c1L>0P4nb5^lp`SEoLS0m$m$jMDYO2srns?4N zK<^7%n8=jw;Ab&s+m45QVVTk$8I)^UTFRhY(b5$R%JnQ=X(Jvysa(#|osbn3;vki) zSsJ0o%Ec_*nI0kd)IT)r@+ohm`;aZI?Ul8NhhMCgqR4AQ2N(dNk3NxkMRAAau z+Cvrkdzwt?^;BWnQ+fkcnD&(3NENz0yJXv=_fjoRWST1dnCI+-@vxUF(^SQv1fr>$ zL5V|C4TEA>Q*A*gUZ?sIJgH=%X*WtG3QfCHDoJRnv;7FZvIL>2o>Iv{(;ha1!DG>$ zraf(Y91N=(_|Y({ksl4a_Topwu)R5kWBYIn%l73Mp6$mmOxvGhxORZ8X3!RSUXy7$ z&{osIaP1&lO$WoZgKae(9GfA0jY_<;PYdZ))ofZz1yap@Kb4objVjE<)^s~nm})lN zK^3N&O?Og-ULIze?xG64Jj^upQiWa~?rQ5D)4Q-1B{Cgy?bSV2EN2&%2*mvkx$^m; zc;6w{U2j!z4wb-m98eJIISLhasN}WdKzgjiwc{X4C9NF?BX4j$zo59K*4r{6`_~JBMZ8^GoJpc-G=CA6*R7 zj`lZ0x)`o~KfJ5H0dz15-f>Jg#&C3|@OzP3IW+KX1rn$#+HoHhsK23=>A0T?)NlSW p9S=}}DQL%oRACC*@eoy*f_6Mi6{esak5GkvOp@sspbGVv3JE0i8Z>GY1r~n^5~NvvK?7vLLQ8fA)?ULNGu(u=T}LNoBzoPVt^MZ7yy1w!8qXO z6|4p9D~ZI4p0f_{Vg>5~FHx`o@KOaE0sBiLT}98?1h^4LmK8Oj2J|uWb(ZK^qnVPnFwmd(k=FXI)rr{@dO5NEi6? zk_U#rAbGsx@*D60FG@je$>kFeOiMvs)CgXZg8J=@;AJUjC^dptq@WRkO}pmn5STiw zOm3;Z!sRw7s6(&;x4QaD1#zdVuTl^+Vpiv>C-n{(Y$M>Q8!3Rr*4dH zZ_DBxORH{jHS{RGx;eVsRya%pdUcDdp-1V}t@x{Qensf)YyxUY5 zQDsG|Uz6NaxcYU;<0U-)4asW_e^YW>;OZGEs5cF-o|S?I)9~tlNkO9({96i|%n(pL zSHW?vs7W;(19r=g0dX@1?3UcpiLlryF6`MC z>C(3(rA^;<6Q*}w`ZVmC>QNds65Yx6$)j}YJ8nAlD6QJ$dhF3AOsAb0lf$^zMMNgT z>98{^1wn*!Rp(n$fC-g?x23>NsGaXff$d}GyHa2$)Xw*$z)q+ij!1!-P?zV+RBOt# zEV-qB#Kp6=piH$aQ~!4qL{9oQDTtW#e^)`Ir2lRO5t9CUT3vFyYN|Q#TO9iD%W6@m&tzDGd zvT>2QpS50WadS*;H!hX}8{3Ubq`<~@kmIB+Dku_3a7hWT4rNB03WKSuu3$KyAq`)q`M)o!fucAhA;RP%A(TW&b zSC(&Gy=mR9$t{z=boHn&Xk9&9H~A|C5va)t1(B!8Clo}SCZALgX_|aWL4;{?(sd_% zwP@YsW(Co@$zLmo)=mBf&@8^fAIsKF{#H_Y^gBsu((hd-y-%h~e~^?m{n0%{dB@VH zKe@(wltw-6mS!HMQ_r}@dbDvta?9rRCX4mnEQV0~Ei*xv^AnS9}h?QAZg(0#&_maz87&7Z~FS|5*lpehzDNXvb zq;%;o^1QU^uhCLF|9I!6Pk(b+_b81@x~zMYPW|0w-J^||f99J^jvBnIBNS%-nLk7d z%v1mTp_1FI&o@hfoqpz9q`*!;^M^@+oqpyImx2aUr}DAlOo$UbSQF`@G zbcLYw>Rq=4_Ku}j@42^<9&K2VOjR6jn%TI`0=aSP0yzSHg5&|-DyAwuRQxzvk zZl>Z?#mQ1&rs7mZyA+tIxIEwcCe!<}WU3Vbv2O&M3VPqf-nSwj#UXA}E8<~az=e;* zU1~)-ibLF_R)nKC#64=wDu`Ru`j&!7bL-m*BFwGtD2Ob#z6)r2AO0%red~LY!lSl` zq%f(iL{hla7IiK0&I_B`wv!Y-wUtT=quREY6i&4*kQ7$6?GVlVDCk`kylPt*6<)FT zZHv^g0liu*X|M?RRFmJPZ5r0JwP9#T+eanm3Lw??G0DveAk}u76qpr2s_k?sFe`vm z+Zj?|RsgBC4N_npKvQjJN`YAcq}o0%1?H7a#nu+bYD|mQBvU=O-KMCqnr&MQ0bK9F z-7XFh(4HL>L_T{KDu{UYEK(5Z>{+ZJ!r8L~rQovIyIN$kXGaAQ&7P$SBAGqQa;f${ zmM!ktDc3}w(xaUvrAfO;N|$z(ls4@quZlh`my|}Wkd#i9m6Vvd&i_WVYNe#~YIjB1 z;+}Fz=~acK^lFu)^lA@D>DB7oy1@HJ0liw2`whgW^lEMH;lro&YR}xmhfnF%Ub%IF zPwCa(xpjd@<24wydd^{A!R&?u^S`$pwR%1&xp{Av>N!^m?6B2yo)p-XLC^V8V27=q z3#7ojX-@TACiLuum^aO-o=;1G8MapChb_B9XGJoVK)&tB6e}3EVjQ*-WeOr? ziIoZ>WQpBTNHe~KKNcBFlq-mcB`Op|!V;?#M8FbzD2RL|Rx5~jCDs6P@evDOEr+ed zT1n~Ao^F8fj-^R^NlKUYmXtQ_BPo5_S5g|apQLnZ{}Q|R$N#>xsxDR!3=hLmw+&kiXC+friO<&+xVUqQ5Gyi!4wWqh4$ zaQI`u#^Azby8qo3yfbc1$OcuPe=iGM{HW1 z@0s06v^<%b#tpGOE7&#?<4&T~biIOz&~$@>NYHeni*@*85uoWN1(BcWLli`OrVmvR z>6va;5aF3_Q4ragJ`B+GEPS=>+4SKqvmT{Kt&-BDHc9Ey5t7oTBPFFzM@dSfj&>_> z@0#h))DX>kNzD)}3>^yzD z6xb$B-ysFINz->qfqB8UCSMf0OK4RxU3#>Od%-4`78rAr-> z(xwkcN}oO`DUJG&q;#rNQd;$4N$J%`6vc#;ED9+1rB|o9>WA-9K(9{E zy_Ao6lwO_Ts_#*HwZT>2qYaCI?>4RS_G+;rkqG!bk_U$0D>+}Rr%UgXymmYC`z5b4 z$3GysS(B$rACv;~@SHAvND9oubGmd?3e3av+Wf#`w`na;rmK)ZI|CQ&=ZSHfR=NrS zEDn)_D&(&?L=37BKl|_;{#c}-3h65j5rQg&uQ)^os*t_n5Ot|KO+mD!>U5;m3@qUb zLRqTLaFGr}4lGq0B&A1ZN=lPHE-795A4zFbm!$NmTT&WzR_+J*nD>q7)F)gGJxZ(2 z&iyv#A4{)#TuH;n26&H^uKJP5pxf89^$%wlD7;-ySN&LWJRaWw!NXF337CRMq@b2h zjp?dKrNB(U>8i)1z*e#9CsJS@kJD8@l>%GEs>h|kRB_LI746Tm=!Zj`I{mzBP7gPI+HpEMct_I)u>rfMBeNr71mr#mL4Aa1JGu~`ai7dw6}1?HV{y5l!e zz{N1W#c!p+JXY?NZ<5^^wlbOS>ver7*d!F=&aiafMG7J$eVCBHO0Nc^ z>jaH20G=}G_V!^hs-~lT&r5;rXx|G`U>;c0eJ@IZ?P%Y$6xfdTy(9(ZfpzbE1?^6- z70L7v?v-5~7HorwaVJ=M2)C*@gkwWjDTr_lUG3@+{#ayd=o$qPt)T%0k*uLX1re;F zYY{BdvhX>PtD)-@M68CccaaPq$qEi7B&A1Rk(4HVRZ_b2HA!jH*CnM--;k6>-5@EQ za(^cp^S&>wy2+Kyqx1@YCu*n3Fl7aYZgCHP9*r#le$^z@?W)SJIuSQhqoLQNz}9H! zbt$kl8hS$tY>kHAlmff#9GZ~=yX+jAl>)o$95R3J33KglD%*Zd^Q%mH$o#!$Q302o zFv|SBXHh}S?E6d)&70p#ik%~7_I>V?Z@b<9wLF=gKrC#b3pV@2xc@6Xaif9=^2ALF zBF7UqyIO`n7BQZ+Iy2y6Y`$lxi{Y7ZZqqJ(1Yph4<)pw)0A6diHJVj1q zOcUH5u6)oDDAVVOtQ6QjPrM}sw$Br9OM&h4#5+=8`#kZk6xcpbye9>=&rd|8z&=Jk zQ6dHAF>>FnT@36lu8L%OW+d0BpkNml1jyOUcN9d-W;Q8^l+AosL4<7PZUvFCnR{}j z@h%7vo4Hp(By8qB1re~B`xQjKW**4p+B+w^IP;*S^ync;Y0{{qbZJad+Vnk1>C^v7 zN~69nDV-XZlve#fQhN16MLF}%{76!I^lwLg=tq{l3 ztH+{Mg4Qoire_ziH~8GpM9C8HccAp_Vkt1YG}5z6q`;0JvpY(G9Y1E5N`W0eW|v8U z9Y1Dwk^(z^%$h&kE&4U>dSKT4;ciiZT@TFe%GtiCz^n&0?Ux^6?1rndWM&1TXlDDM zVE;_O4Of{JNMdmq03wLy{jGOo91uAy4r>7s!{V?G5GgDU>j57|M7ezT&e;I?h=PrP zk1E&%_?Sz+XF?6=Pb8&BKb4dwJuWF-`kAD(>F1Ktr(Z})qkbtVo%)rev}(dN-E)Ip zJ>i-jrWj!|E1q;s_b9!3$~E1i!GdI_tlV_OZ8O@sQeYUlQpl85NP$@?WXe`afqBW5 zDceH|Ow%)EtEIp^KxfL1lpaL4>FIDFu<8=1Bz+o#xGmj%i@{f{>i%Un_{Y5^y6^rt2965yY-% z6+{lZo>LGp?3!|&3!f7y?0Q~7gs|%c1(Ct77ZpSVyQUFtQ|0hEk-)B(T=K(^ZS8tl zQhM}?q%`TzlG3HWNJ^XjDk**Xo1`=H3FjYxr0!eluPF z%sn3a$JQ=QX1be9O1+It43wGHx(|^8wDm50!l6=tw%!dvvlQ62cDG1@ZEN>oQefNK zeYg~u1#G6fRSIldyW6C|Y%|Vun?GcRiQ$z#j56DdGu`G7nTspu$k*m4I8eG6R2C5Xl+%hk^*sz&{m4)(2j7-3^}; zQ6G3sK_q?Pbp;Xhfj1PykTCEj8f1oq@HsIg49vKCg&~K8fmuoE(Z3|6N&l9VF3m|w zo8~2@PydmWM*UY(I<-YoT9wNE6dZVN(5ti?Y{HbQlCAE2AjbXqyU2r#*)DkrNAx?22YX#JJ<}KECqJ38ElsV zJJ<}KA_aD^8GN4<*uiG-{Ze2Do52n<3=}oWygknhen2bC+w=ALk;3l5DobWY5h=Tx zFW6EOa1T~y6p1PhabrhQ3Zes}Y1i8D$D#tG83oaR(X4_f!01~FBLAarBmZVF2%i)2 zAALtbq<{2X*PQT?94SWMlN26}MI?nuVlXo^YC7QU-(nceW5U=+ zrNBNWjD1WB>{u{%niSZvVC-}$FmKK>V`oT#9Sg=bNP!&-#?F)i^X5G>_HijNZ{82c z_t^d8TbU``a9h=a{Wt+PaAl?zD2UrVwS$7V+fxf&;ldw_n?1EiLEP)9#R?*xQ%e*? zI;VC-c1@4N=R}XEmMVxIPc6e&;dY21d?b53wUg_FN9obdxTNC8(xhGFv24%8 z0^6sl^Q6G`Y3h6_uzi}kKniT1rY@8M^Dm!framPF?9-;Id|lkX-<6H5aG@{QI1_M} zRyIs3YqESCvE#HH`?LvjK3AlE^7VVI$yb1)BiZ zxY&k27In!+)=El`_LP(+?IkH)+S|Q{^3F?}_Hpl_JW8MTb#?J5joQymKOUu12e|1c zOar{m%|`l6j=cR)3i*Y#8Dm zR#vGaaSJOCR7WE0l?SOK5%$W1T_nTjWY{aKai|&nJxY&i(7)o8CdK3@)1^RC+7y?R zKGjM}qw3rfop;T2s@~PeqqM5Qt>QdNuNqy+!jymMmaV+TWYF8D!$9$wEn7Jt1-2-a zgHm9A_sCXWD+RVFmDfpuElTC}QecX5P`)U3E78hiw!O|Jx?pEWz^z2t_Id@8f%XOk z5rOtb1(AUErjkgd=|cFN2tfNG3gZ5^AF3d3e|xj*Lil5G_uE?(#LaI%%!Mv|B#Y91 zxGRcB=~1gZmL|2yW9iZn@>tq*q@?ueC`oD5(UQ`sVL4p9L_u^(3hw!`? z_uBlF?;VMF_8wOfSW_MV_1ve|ng@>TR>5zXF{6htz6PgW4Y>}}7* z*1KAkxc3xE>CyWnrAhCXlrD8hN}E0)DSi52?yZD>%{1ymxia~bPIcxMemxcAg(T+rAe;JcYn92xozfN?WL?7c?{P{bSX3HM3?ib%nIQecbN jd%qOeBKAHY1-6L24@!Y8V(&vzVBT3|dq<^!?=1cwJD{B^ diff --git a/xchat_cfg b/xchat_cfg index cfd63971..589b4921 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit cfd63971ee5c3150f8544360fbdd81094e4ea3a5 +Subproject commit 589b4921b732b16cd45fdb9030af045ae54fa48b