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..0af4bd82 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"; @@ -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/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/ui/panels/Web3PopPanel.ts b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts index 926eff18..be0de440 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.I.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/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; 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/tbgirls.bin b/assets/bundles/DataTable/tbgirls.bin index d330cae2..14966c89 100644 Binary files a/assets/bundles/DataTable/tbgirls.bin and b/assets/bundles/DataTable/tbgirls.bin differ diff --git a/assets/bundles/DataTable/tbgirlsdetail.bin b/assets/bundles/DataTable/tbgirlsdetail.bin index 003143c2..de002a3d 100644 Binary files a/assets/bundles/DataTable/tbgirlsdetail.bin and b/assets/bundles/DataTable/tbgirlsdetail.bin differ diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 7ad612c8..9fd5d648 100644 Binary files a/assets/bundles/DataTable/tblanguage.bin and b/assets/bundles/DataTable/tblanguage.bin differ diff --git a/xchat_cfg b/xchat_cfg index e296702a..589b4921 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit e296702a5e8ac801dd5a648803c899918c6a3ba5 +Subproject commit 589b4921b732b16cd45fdb9030af045ae54fa48b