From be1389df98fdb5f5894bc29092e57d2f99300080 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Wed, 17 Sep 2025 16:12:54 +0800 Subject: [PATCH] update --- .../Scripts/Main/Manager/PlayerDataManager.ts | 6 +- .../Scripts/chat18x/core/ApiConfigLoader.ts | 2 + assets/Scripts/chat18x/data/ChatModel.ts | 3 - .../chat18x/manager/NavigationManager.ts | 11 +- .../chat18x/ui/components/DialogBubble.ts | 2 +- .../chat18x/ui/components/ImagePopup.ts | 44 +- .../chat18x/ui/panels/NavigationPanel.ts | 11 +- .../Scripts/chat18x/ui/panels/SettingPanel.ts | 25 +- assets/bundles/Chat18x/ChatPanel.prefab | 10 +- assets/bundles/Chat18x/GirlDetailPanel.prefab | 38 +- assets/bundles/Chat18x/NavigationPanel.prefab | 430 +++++++++++++++++- assets/bundles/Chat18x/PersonalPanel.prefab | 6 +- assets/bundles/Chat18x/SettingPanel.prefab | 11 +- assets/bundles/Chat18x/ThemePanel.prefab | 198 ++++---- assets/bundles/DataTable/tbaicharacters.bin | Bin 82274 -> 83066 bytes xchat_cfg | 2 +- 16 files changed, 621 insertions(+), 178 deletions(-) diff --git a/assets/Scripts/Main/Manager/PlayerDataManager.ts b/assets/Scripts/Main/Manager/PlayerDataManager.ts index 34337550..828552ca 100644 --- a/assets/Scripts/Main/Manager/PlayerDataManager.ts +++ b/assets/Scripts/Main/Manager/PlayerDataManager.ts @@ -40,11 +40,11 @@ export default class PlayerDataManager { private InitPlayerData() { // this.isShakeOn = PlayerDataManager.getForKey(CommonConfig.StorageConfig.SETTING_SHAKEON, true) - // this.isMusicOn = PlayerDataManager.getForKey(CommonConfig.StorageConfig.SETTING_MUSIC, true) - // this.isSoundOn = PlayerDataManager.getForKey(CommonConfig.StorageConfig.SETTING_SOUND, true) + this.isMusicOn = PlayerDataManager.getForKey(CommonConfig.StorageConfig.SETTING_MUSIC, true) + this.isSoundOn = PlayerDataManager.getForKey(CommonConfig.StorageConfig.SETTING_SOUND, true) this.guideMainFinished = PlayerDataManager.getForKey(CommonConfig.StorageConfig.GUIDE_MAIN, false) this.guideTalkFinished = PlayerDataManager.getForKey(CommonConfig.StorageConfig.GUIDE_TALK, false) - console.log("InitPlayerData", `guideMain=${this.guideMainFinished}, guideTalk=${this.guideTalkFinished}`) + console.log("InitPlayerData", `music=${this.isMusicOn}, sound=${this.isSoundOn}, guideMain=${this.guideMainFinished}, guideTalk=${this.guideTalkFinished}`) } diff --git a/assets/Scripts/chat18x/core/ApiConfigLoader.ts b/assets/Scripts/chat18x/core/ApiConfigLoader.ts index e22ff472..cfbf6e58 100644 --- a/assets/Scripts/chat18x/core/ApiConfigLoader.ts +++ b/assets/Scripts/chat18x/core/ApiConfigLoader.ts @@ -59,6 +59,8 @@ export class ApiConfig { DataId.Global ).getTimeout(), // 30秒 }; + + //console.warn(this.config.apiKey); } /** diff --git a/assets/Scripts/chat18x/data/ChatModel.ts b/assets/Scripts/chat18x/data/ChatModel.ts index 816113e9..c314f6fa 100644 --- a/assets/Scripts/chat18x/data/ChatModel.ts +++ b/assets/Scripts/chat18x/data/ChatModel.ts @@ -229,9 +229,6 @@ export class ChatModel { roleData.dialogs.push(dialog); this.updateLastActiveTime(targetRoleId); - console.log( - `ChatModel: Dialog added for role ${targetRoleId} (isPlayer: ${isPlayer}, content length: ${content.length})` - ); } /** diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts index 0565f074..ef18a8da 100644 --- a/assets/Scripts/chat18x/manager/NavigationManager.ts +++ b/assets/Scripts/chat18x/manager/NavigationManager.ts @@ -121,7 +121,7 @@ export class NavigationManager { public switchToPanel(panelType: PanelType, force: boolean = false): void { if (this.currentActivePanelType === panelType && !force) { if (panelType === PanelType.THEME) { - this.girlListPanel.hide(); + this.girlListPanel?.hide(); } return; @@ -157,9 +157,12 @@ export class NavigationManager { if (this.subPanelDic.has(this.currentActivePanel)) { //如果有子页面，关闭掉 let subs = this.subPanelDic.get(this.currentActivePanel); - subs.forEach((n) => { - n.getComponent(li_BaseView).close(); - }); + if (subs) { + subs.forEach((n) => { + n.getComponent(li_BaseView)?.close(); + }); + } + this.subPanelDic.delete(this.currentActivePanel); } // 更新NavigationPanel按钮状态 diff --git a/assets/Scripts/chat18x/ui/components/DialogBubble.ts b/assets/Scripts/chat18x/ui/components/DialogBubble.ts index d4e8248b..c1888fbf 100644 --- a/assets/Scripts/chat18x/ui/components/DialogBubble.ts +++ b/assets/Scripts/chat18x/ui/components/DialogBubble.ts @@ -55,7 +55,7 @@ export class DialogBubble extends Component { this.content.overflow = Overflow.NONE; // 如果是加载状态，使用固定的"..." - if (isLoading && str === "...") { + if (isLoading) { this.content.string = "..."; // 设置固定尺寸用于加载显示 const contentWidth = 60; diff --git a/assets/Scripts/chat18x/ui/components/ImagePopup.ts b/assets/Scripts/chat18x/ui/components/ImagePopup.ts index f8bda7a1..5d7d97ec 100644 --- a/assets/Scripts/chat18x/ui/components/ImagePopup.ts +++ b/assets/Scripts/chat18x/ui/components/ImagePopup.ts @@ -7,6 +7,7 @@ import { tween, UITransform, path, + view, } from "cc"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import Utils from "db://assets/Scripts/Main/Common/Utils"; @@ -23,8 +24,10 @@ export class ImagePopup extends Component { @property(Sprite) image: Sprite; + private isAnimating: boolean = false; + start() { - this.node.setPosition(new Vec3(-1500, 493, 0)); + this.node.setPosition(this.getOffscreenPosition()); GButton.BandClick(this.image.node, this.openImage, this); this.node.active = false; } @@ -36,6 +39,26 @@ export class ImagePopup extends Component { categoryId: string; girlId: number; resId: number; + + /** + * 获取屏幕外位置（完全在左侧屏幕外） + */ + private getOffscreenPosition(): Vec3 { + const visibleSize = view.getVisibleSize(); + const x = -visibleSize.width; // 完全在屏幕左侧外 + const y = visibleSize.height * 0.33; // 屏幕高度的1/3处 + return new Vec3(x, y, 0); + } + + /** + * 获取屏幕内位置（左侧边缘内侧） + */ + private getOnscreenPosition(): Vec3 { + const visibleSize = view.getVisibleSize(); + const x = -visibleSize.width/2 + 100; // 从左边缘向内100像素 + const y = visibleSize.height * 0.33; // 屏幕高度的1/3处 + return new Vec3(x, y, 0); + } //url: string; refresh(categoryId: string, girlId: number, resId: number, clear = false) { this.node.active = true; @@ -96,16 +119,25 @@ export class ImagePopup extends Component { // } popUp() { + if (this.isAnimating) return; + + this.isAnimating = true; + tween(this.node) - .to(0.5, { position: new Vec3(-559.374, 493, 0) }, { easing: "backOut" }) + .to(0.5, { position: this.getOnscreenPosition() }, { easing: "backOut" }) + .call(() => { + this.scheduleOnce(() => { + this.popDown(); + }, 3); + }) .start(); - this.scheduleOnce(() => { - this.popDown(); - }, 5); } popDown() { tween(this.node) - .to(0.5, { position: new Vec3(-1500, 493, 0) }, { easing: "backIn" }) + .to(0.5, { position: this.getOffscreenPosition() }, { easing: "backIn" }) + .call(() => { + this.isAnimating = false; + }) .start(); } } diff --git a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts index 3ca0f99c..fb26cafa 100644 --- a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts @@ -4,6 +4,7 @@ import Utils from "db://assets/Scripts/Main/Common/Utils"; import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import { NavigationManager, PanelType } from "../../manager/NavigationManager"; import { NavigationBtn } from "../items/NavigationBtn"; +import { ChatHistoryManager } from "../../manager/ChatHistoryManager"; const { ccclass, property } = _decorator; @@ -65,6 +66,14 @@ export class NavigationPanel extends li_BaseView { () => NavigationManager.Instance.switchToPanel(PanelType.PERSONAL), this ); + + GButton.BandClick( + this._nodeTab.CleanHistoryBtn, + () => { + ChatHistoryManager.Instance.clearAllHistory(); + }, + this + ); } /** @@ -73,8 +82,6 @@ export class NavigationPanel extends li_BaseView { */ public updateButtonStates(activePanel: PanelType) { this.currentActivePanel = activePanel; - this._nodeTab.CurrentPanel.getComponent(Label).string = - this.currentActivePanel; this.refreshButtonVisuals(); } diff --git a/assets/Scripts/chat18x/ui/panels/SettingPanel.ts b/assets/Scripts/chat18x/ui/panels/SettingPanel.ts index 3630a4c8..2cecf55a 100644 --- a/assets/Scripts/chat18x/ui/panels/SettingPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/SettingPanel.ts @@ -56,6 +56,7 @@ export class SettingPanel extends li_BaseView { onEnable() { this.currentSelectedLang = LanguageUtils.CurrentLanguage; this.updateSelection(); + this.updateAudioButtonStates(); this.playEnterAnimation(); } @@ -89,12 +90,7 @@ export class SettingPanel extends li_BaseView { this.sound_on = this._nodeTab.SoundBtn.getChildByName("On"); this.sound_off = this._nodeTab.SoundBtn.getChildByName("Off"); - let currentState = PlayerDataManager.I.IsSoundOn; - this.sound_on.active = currentState; - this.sound_off.active = !currentState; - currentState = PlayerDataManager.I.IsMusicOn; - this.music_on.active = currentState; - this.music_off.active = !currentState; + this.updateAudioButtonStates(); } private initLanguageButton( @@ -143,6 +139,17 @@ export class SettingPanel extends li_BaseView { language, }); } + + private updateAudioButtonStates() { + const soundState = PlayerDataManager.I.IsSoundOn; + this.sound_on.active = soundState; + this.sound_off.active = !soundState; + + const musicState = PlayerDataManager.I.IsMusicOn; + this.music_on.active = musicState; + this.music_off.active = !musicState; + } + registerListener() { GButton.BandClick(this._nodeTab.MusicBtn, this.switchMusic, this); GButton.BandClick(this._nodeTab.SoundBtn, this.switchSound, this); @@ -171,16 +178,14 @@ export class SettingPanel extends li_BaseView { } switchSound() { const currentState = PlayerDataManager.I.IsSoundOn; - this.sound_on.active = currentState; - this.sound_off.active = !currentState; PlayerDataManager.I.SetSoundOn(!currentState); + this.updateAudioButtonStates(); } switchMusic() { const currentState = PlayerDataManager.I.IsMusicOn; - this.music_on.active = currentState; - this.music_off.active = !currentState; PlayerDataManager.I.SetMusicOn(!currentState); + this.updateAudioButtonStates(); } isShow: boolean = false; diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index eff333e2..e411dfa4 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -1344,7 +1344,7 @@ "_originalWidth": 100, "_originalHeight": 0, "_alignMode": 2, - "_lockFlags": 1, + "_lockFlags": 0, "_id": "" }, { @@ -3782,12 +3782,12 @@ "__prefab": { "__id__": 168 }, - "_alignFlags": 1, + "_alignFlags": 5, "_target": null, "_left": 0, "_right": 0, "_top": 252.98000000000002, - "_bottom": 0, + "_bottom": 539.02, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3797,7 +3797,7 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 0, - "_originalHeight": 0, + "_originalHeight": 1548, "_alignMode": 2, "_lockFlags": 0, "_id": "" @@ -5551,7 +5551,7 @@ "_originalWidth": 100, "_originalHeight": 0, "_alignMode": 2, - "_lockFlags": 4, + "_lockFlags": 0, "_id": "" }, { diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index d40d4d61..c6d8666f 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -501,7 +501,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 26.800000000000068, "z": 0 }, "_lrot": { @@ -630,7 +630,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 1170, + "y": 955.4000000000001, "z": 0 }, "_lrot": { @@ -687,7 +687,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -551.4, + "y": -453.9, "z": 0 }, "_lrot": { @@ -741,7 +741,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -408.6, + "y": -506.1, "z": 0 }, "_lrot": { @@ -791,7 +791,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 93.90000000000009, "z": 0 }, "_lrot": { @@ -832,7 +832,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920 + "height": 2107.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -861,7 +861,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 0, + "_top": -187.8, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -986,7 +986,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1102.8 + "height": 907.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1139,7 +1139,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1329.3, + "y": -1134.3, "z": 0 }, "_lrot": { @@ -3481,7 +3481,7 @@ "_target": null, "_left": 25.5, "_right": 25.5, - "_top": 1104.8, + "_top": 909.8, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3548,7 +3548,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1722.3, + "y": -1527.3, "z": 0 }, "_lrot": { @@ -4039,7 +4039,7 @@ "_target": null, "_left": 25.5, "_right": 25.5, - "_top": 1555.8, + "_top": 1360.8, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -4106,7 +4106,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1953.45, + "y": -1758.45, "z": 0 }, "_lrot": { @@ -5798,7 +5798,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -2018.1000000000001, + "y": -1823.1000000000001, "z": 0 }, "_lrot": { @@ -5954,7 +5954,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2018.1 + "height": 1823.1 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6069,7 +6069,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 1910.8000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6214,7 +6214,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 1910.8000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6319,8 +6319,8 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 0, - "_bottom": 0, + "_top": 187.8, + "_bottom": 241.4, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, diff --git a/assets/bundles/Chat18x/NavigationPanel.prefab b/assets/bundles/Chat18x/NavigationPanel.prefab index 2907bc4d..f5f4db8a 100644 --- a/assets/bundles/Chat18x/NavigationPanel.prefab +++ b/assets/bundles/Chat18x/NavigationPanel.prefab @@ -26,22 +26,25 @@ }, { "__id__": 138 + }, + { + "__id__": 144 } ], "_active": true, "_components": [ { - "__id__": 144 + "__id__": 160 }, { - "__id__": 146 + "__id__": 162 }, { - "__id__": 148 + "__id__": 164 } ], "_prefab": { - "__id__": 150 + "__id__": 166 }, "_lpos": { "__type__": "cc.Vec3", @@ -3074,7 +3077,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 139 @@ -3224,6 +3227,417 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "CleanHistoryBtn", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 145 + } + ], + "_active": true, + "_components": [ + { + "__id__": 151 + }, + { + "__id__": 153 + }, + { + "__id__": 155 + }, + { + "__id__": 157 + } + ], + "_prefab": { + "__id__": 159 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -383.188, + "y": -881.8820000000001, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 144 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 146 + }, + { + "__id__": 148 + } + ], + "_prefab": { + "__id__": 150 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 145 + }, + "_enabled": true, + "__prefab": { + "__id__": 147 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 142.7, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "19DFshjx5PE6kiIJfk6YTx" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 145 + }, + "_enabled": true, + "__prefab": { + "__id__": 149 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_string": "清理聊天记录", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 1, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3floyjG+dMfITmvnHCOGCG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c44hpH5IFKNIA/y2nz27+D", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 144 + }, + "_enabled": true, + "__prefab": { + "__id__": 152 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 80 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "16jWUYCn5BbIyVjWR52PPF" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 144 + }, + "_enabled": true, + "__prefab": { + "__id__": 154 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7dgqP7wQFLgLf0pWQjKZSM" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 144 + }, + "_enabled": true, + "__prefab": { + "__id__": 156 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 2, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_pressedSprite": { + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_disabledSprite": { + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 144 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c3rN1vOUVGRYZTi10C6Pht" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 144 + }, + "_enabled": true, + "__prefab": { + "__id__": 158 + }, + "_alignFlags": 12, + "_target": null, + "_left": 6.812000000000012, + "_right": 0, + "_top": 0, + "_bottom": 248.11799999999994, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "81FDpSXghCzKh+baSza+vu" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9dTsYT52xJ860GC6QogR4u", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -3234,7 +3648,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 161 }, "_contentSize": { "__type__": "cc.Size", @@ -3262,7 +3676,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 163 }, "_alignFlags": 45, "_target": null, @@ -3298,7 +3712,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 165 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/Chat18x/PersonalPanel.prefab b/assets/bundles/Chat18x/PersonalPanel.prefab index 86fc3663..768210a7 100644 --- a/assets/bundles/Chat18x/PersonalPanel.prefab +++ b/assets/bundles/Chat18x/PersonalPanel.prefab @@ -554,7 +554,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "037ad634-397e-4d22-bd90-063654461da8@f9941", + "__uuid__": "777fc276-1999-4eba-a9a4-9bcfb84cbd72@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -2961,7 +2961,7 @@ }, "clickEvents": [], "_interactable": true, - "_transition": 0, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -2995,7 +2995,7 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": null, "_id": "" }, diff --git a/assets/bundles/Chat18x/SettingPanel.prefab b/assets/bundles/Chat18x/SettingPanel.prefab index deba2efc..60ab73ce 100644 --- a/assets/bundles/Chat18x/SettingPanel.prefab +++ b/assets/bundles/Chat18x/SettingPanel.prefab @@ -261,6 +261,8 @@ "__id__": 0 }, "fileId": "c9vrQdTkJOhbCKY8SH8Zch", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -4209,7 +4211,7 @@ "__id__": 140 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 164 @@ -5185,6 +5187,8 @@ "__id__": 0 }, "fileId": "c7elOiU6lL742K74e1NJ3v", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5691,6 +5695,8 @@ "__id__": 0 }, "fileId": "ad+JOqXVVBgJzQOCZa3yWE", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6201,6 +6207,7 @@ "__id__": 0 }, "fileId": "38Fm50GEVAG5PwFkR1o9QJ", - "instance": null + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index 71ce7249..a83fceec 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -24,18 +24,18 @@ ], "_active": true, "_components": [ + { + "__id__": 322 + }, { "__id__": 324 }, { "__id__": 326 - }, - { - "__id__": 328 } ], "_prefab": { - "__id__": 330 + "__id__": 328 }, "_lpos": { "__type__": "cc.Vec3", @@ -84,18 +84,18 @@ ], "_active": true, "_components": [ + { + "__id__": 315 + }, { "__id__": 317 }, { "__id__": 319 - }, - { - "__id__": 321 } ], "_prefab": { - "__id__": 323 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -2586,18 +2586,18 @@ ], "_active": true, "_components": [ + { + "__id__": 308 + }, { "__id__": 310 }, { "__id__": 312 - }, - { - "__id__": 314 } ], "_prefab": { - "__id__": 316 + "__id__": 314 }, "_lpos": { "__type__": "cc.Vec3", @@ -4376,6 +4376,9 @@ ], "_active": true, "_components": [ + { + "__id__": 299 + }, { "__id__": 301 }, @@ -4384,18 +4387,15 @@ }, { "__id__": 305 - }, - { - "__id__": 307 } ], "_prefab": { - "__id__": 309 + "__id__": 307 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 116.30000000000007, "z": 0 }, "_lrot": { @@ -4436,6 +4436,9 @@ ], "_active": true, "_components": [ + { + "__id__": 290 + }, { "__id__": 292 }, @@ -4444,13 +4447,10 @@ }, { "__id__": 296 - }, - { - "__id__": 298 } ], "_prefab": { - "__id__": 300 + "__id__": 298 }, "_lpos": { "__type__": "cc.Vec3", @@ -4494,28 +4494,28 @@ "__id__": 189 }, { - "__id__": 277 + "__id__": 275 } ], "_active": true, "_components": [ + { + "__id__": 283 + }, { "__id__": 285 }, { "__id__": 287 - }, - { - "__id__": 289 } ], "_prefab": { - "__id__": 291 + "__id__": 289 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 935.95, + "y": 819.6500000000001, "z": 0 }, "_lrot": { @@ -4560,14 +4560,14 @@ "_active": true, "_components": [ { - "__id__": 272 + "__id__": 270 }, { - "__id__": 274 + "__id__": 272 } ], "_prefab": { - "__id__": 276 + "__id__": 274 }, "_lpos": { "__type__": "cc.Vec3", @@ -4792,11 +4792,14 @@ "__id__": 245 }, { - "__id__": 253 + "__id__": 251 } ], "_active": true, "_components": [ + { + "__id__": 261 + }, { "__id__": 263 }, @@ -4805,13 +4808,10 @@ }, { "__id__": 267 - }, - { - "__id__": 269 } ], "_prefab": { - "__id__": 271 + "__id__": 269 }, "_lpos": { "__type__": "cc.Vec3", @@ -5847,13 +5847,10 @@ }, { "__id__": 248 - }, - { - "__id__": 250 } ], "_prefab": { - "__id__": 252 + "__id__": 250 }, "_lpos": { "__type__": "cc.Vec3", @@ -5983,27 +5980,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "c4IVMiKXBOkJ4Ze8cgqytW" }, - { - "__type__": "d7e4fOii5xNLqH2PF6de4pP", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 245 - }, - "_enabled": true, - "__prefab": { - "__id__": 251 - }, - "languageKey": "girl_10001_name", - "defaultText": "", - "autoUpdate": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "80PK9HBNhAkryr+WxVsTXp" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -6028,6 +6004,9 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 252 + }, { "__id__": 254 }, @@ -6036,13 +6015,10 @@ }, { "__id__": 258 - }, - { - "__id__": 260 } ], "_prefab": { - "__id__": 262 + "__id__": 260 }, "_lpos": { "__type__": "cc.Vec3", @@ -6079,11 +6055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -6107,11 +6083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6152,11 +6128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 257 }, "_alignFlags": 34, "_target": null, @@ -6188,11 +6164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 259 }, "clickEvents": [], "_interactable": true, @@ -6261,7 +6237,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 262 }, "_contentSize": { "__type__": "cc.Size", @@ -6289,7 +6265,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 264 }, "_alignFlags": 45, "_target": null, @@ -6325,7 +6301,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 266 }, "_type": 3, "_inverted": false, @@ -6347,7 +6323,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 268 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6405,7 +6381,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 271 }, "_contentSize": { "__type__": "cc.Size", @@ -6433,7 +6409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 273 }, "_alignFlags": 41, "_target": null, @@ -6483,18 +6459,18 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 276 + }, { "__id__": 278 }, { "__id__": 280 - }, - { - "__id__": 282 } ], "_prefab": { - "__id__": 284 + "__id__": 282 }, "_lpos": { "__type__": "cc.Vec3", @@ -6531,11 +6507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 275 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 277 }, "_contentSize": { "__type__": "cc.Size", @@ -6559,11 +6535,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 275 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 279 }, "_resizeMode": 1, "_layoutType": 3, @@ -6597,11 +6573,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 275 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 281 }, "_alignFlags": 40, "_target": null, @@ -6650,7 +6626,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", @@ -6678,7 +6654,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 286 }, "_resizeMode": 1, "_layoutType": 2, @@ -6716,7 +6692,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 288 }, "_alignFlags": 1, "_target": null, @@ -6765,12 +6741,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 291 }, "_contentSize": { "__type__": "cc.Size", "width": 1060, - "height": 1871.9 + "height": 1639.3000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6793,7 +6769,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 293 }, "_type": 0, "_inverted": false, @@ -6815,7 +6791,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 295 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6861,7 +6837,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 297 }, "_alignFlags": 45, "_target": null, @@ -6910,12 +6886,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 300 }, "_contentSize": { "__type__": "cc.Size", "width": 1060, - "height": 1871.9 + "height": 1639.3000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6938,7 +6914,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 304 + "__id__": 302 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6983,7 +6959,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 304 }, "bounceDuration": 0.23, "brake": 0.75, @@ -7014,14 +6990,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 306 }, "_alignFlags": 45, "_target": null, "_left": 10, "_right": 10, "_top": 0, - "_bottom": 0, + "_bottom": 232.6, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -7063,7 +7039,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 309 }, "_contentSize": { "__type__": "cc.Size", @@ -7091,7 +7067,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 313 + "__id__": 311 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7136,7 +7112,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 313 }, "_alignFlags": 45, "_target": null, @@ -7185,7 +7161,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 316 }, "_contentSize": { "__type__": "cc.Size", @@ -7213,7 +7189,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 318 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7258,7 +7234,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 320 }, "_alignFlags": 45, "_target": null, @@ -7307,7 +7283,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -7335,7 +7311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 325 }, "_alignFlags": 45, "_target": null, @@ -7371,7 +7347,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 327 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/DataTable/tbaicharacters.bin b/assets/bundles/DataTable/tbaicharacters.bin index cabc25ad5d9d0751fc82cbb3b37196f8189d3fde..cb4322afc2e90110df853c03ec2930c58b355443 100644 GIT binary patch delta 14848 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 delta 12577 zcma)?Yph(?S%z_%8>g*vabm}@+w7jYId46s7U-ms45771S*9}`~Xo=B>01b;Ca8b zXHF8QqCY6{oW0ln)^~Zo_x;xT@0YLn?n~EP`_5Nydg;&K{mMNz?YjM|(WAT89&uY` zl{P*)-?h8`wp%~FzZ+dOz3Man(z%UyUH;FjzPGFU^npE>|Lf`pu6pIOZ{M}&@?+PP zyDtCH^;cipePj3EUA^}1cSqgdKYsA?w{Ey<*A4pDqir%yi*e+ls{7^>_g=o^rWbd0 zfAZA6Yo2V&#&=)8`5(G3oxAz+SN8nmRZm~V^G}tTk80mEy!7v1zqIz4+nT%R@Uizs zbMLA;DzoIs$>>y6m$OM)H)-q|pG2-|qPVSGQ&!QaD)Z=remi=|XOr}3cWUpkMO@Z- zIV-cYaYZ!BTv`pHa}yus<(97_KN^))lli*N=F!kM+uj$^BppvS>oQJ#GmpkD%X~GD z%9$@Ptd3lfL~W7yYFw54|6oALLvfR`gi`rLPPM^UEGB5S@+IL_4 z;yE8zzKPgjQ>Ag#R4!o!9%m~_!j5>m@%aq@x+%^pOxW3Wnq?7BTjH?4q}(pLcRYXKL`>Z3=uDBM#9c|U?k~!`^@v*;U^J|}tJ$5O8`w%r^*%L#Qx-8PgLX$&&(I6E9gZdkU|Mj35~ zROew;OFdXS2WAk?fH)^XptV!%mEvvMWUd5I+Dy7XJaFTp4=MRVV#^P#XSo$6o>%g; z|7|Cq(igP1LS|GO_<4&W-WCg&! zf$nh1u`wfiTqQ!_eFkksY*}F*QwG}zIDa^?5u#hol%gP$6y95xc zJmgk%hBCmrK$8-0+2ZPXKBP_7xiCxs+Dz2MqtoC|IykZ}8_rOCG~Wfi4u@)0Md@U; zeufJ7vn5(7Q%RT&mt1IxtC>JYv`$12H)I!pw-d^o2Hr!q;guY+%nExO;GD|2JczsR zOzLP%Z}7G>{@s!@@Oz(aWHaEq)qSNquy}@MBec@`=4g=8ip|9Y;tafFQkGLK98cJO zKx3r}-vRKl0A;p1t%qcTNeD326(if8FUod2(T4j(lO+Zvq~C(%%~KL;+5UI7+WYiF z=@wls6jv-?9zLs0s-u)uuISP^4BJ*6#RZzw@<;kH5hQiw^ThiZsKV#1cNAsqAB!qE zQ-5_yo{E)_30cYxhE+?cztPjyimfG4H9(2VH7C8W7E*fab8LjSNig>13i3D<6Y)>; zHd}!bl|gCoe_}d=2u?)y%L-pyDAiAZEEoc4;)@v42jT;uJkUM)*#q5UAHU^3BY8@* z#LqxEgGHhRWCW{umM-iqU)UAEkyhPzruQypWnGiFp0c@ja2{unXQ~|aH$LOyxnh<0 zp}u~W(D9cQJom|D*)js)){ccG%3?&mX}@}xkecn0eDWqO>vGd=2OUI{|am)ndmQ4hR7}vt&C>x=(%X*jp&w}Gn$Qp7j^@DH?-S_S(@IVt_fEXxXwHe zs%$JyBq|iUR-PvT8Oh&7*vbp)-QsmrXYG?g^sp7s*e_r|YzlY*w-S>l^gVU~ycp`U zTR2x=q&tvleQgGT)}E-+xf9!q zj-BY9ICS9p+}F9U(ighfp^dB2DZcylLw7D<)Bq=WBF?wsY}CQTd`5|li$P?IiG5EC zfgpZ2e#)L(6KsUMa%Pyi1I%)n|76P?BLczH%R-+?xviQafhlXPq-VUpu0Kxjxz za=@Bown+y{7CL2&bnwZ4mRPzaxEDkyNEfp5#Kw=WcfYxD$AT=9{`8LDjl8PuiEfNb zG2qks7p%USV3n&}?kPqItDvb&U|VI?plIOAmOQ+cl}bkSHyZJdq=DhZ4qy$ugrQ!sO=M&5;x8Omv3a3xeS^AZHK>yelv;6g45z{mxzQS;J$dtjbaMH+P+U<@;~n zb?ZWYEoyOnDsj~2h=sl)#8zF*M5Aw%>b}M#XBkW;g70t9LSPdy6%djYQ%%>~TWoWM zQABCU)lKyBT0BLrXAj~{N{TVWW=uA~eP9krM6Lks<}H;R@!tmZ<)a~rBH*#qzUs63 z^mDf?{kNPINMhjKZ%`eUGBVtxN9Z_#g#{tLO7%BtgWw<=+>lgpl@1pn zMyvheI0L${=n_Ox+HAS!oLi-2$qfAO2QXnaV-!;XiCdHtwIJU@JtA} zMmsjG)Y?7C&s7FthYiWDV4GZIJ5py0%>V=)l)6D0i|ve%`c0YdjKoo3p%R)2$cdW3 zEMpz$#|hwW>MKM!t&0uD9upGS#xM*P8ioP#`fM@}gMhfahF%yq-Jf;q3r$F|+rE=I z1OleuaDrTxnrAFKtvyh9;rp`|SwPp*L*x>pM`5=%x?Gy6zp-(ibWp6gcZhjy87qcO zf%MZxLT>7tLGRG)b9F}wn>Dsf3B4{SaqYMTRv^*LM|(U|WCKUUH;RnSMk)y#IhO57 zyQ%WjyE0R1wmHVdbu&OQX^difv!B^q)eJ=d892sM>OAyH7J_}{q2*A;LSmMurfC77 zUO%?5HPmQ(iPZhnp=-K7_^TTiee$7qv}1dW>7GYDzy`n;ei7O28;+*o%C9$-Mj<37 z?1RfIYDydL3tTYBmVqKAhZ~W2$px)u+HhNwRlY`{A>?+tMQ?zHdnqCbU8qrN0PWBd z=)tmGWj4aQgc|J4QU;rb+qq~2^rQQy>FtX%{jfnv1*bAKS4G4Cma0$C>6nUn$P0GS zE0%ql{$g!RWoVli;#?lF`F`&<^y*49nlI!yiJagvU(PZRZ+jvhi7R#{Waf2Z+j8y@ zx;w*A-~j2RQK|hooGeJO4x+PafQ*1pC-_Px;cry1<`{yUCE_TrL;bIV4`Pm)Ur0GE7F0QIcj1opdPE*#^r!8=r$ytr5#FVLh zo*<1;QwT)G&r}#zF}h(9C}bj=O|xjAN6Gdj_8KYJed73Tbl|m;H<02o0jLy-1_eQO zlXXFnKzzyipvT)GM_8IXYIp;=eildI8fOelBN=ONOS!1kY);lEJ<*cXs}PwgpRlA~ zgtI9F7xfI5T}s5D5VZ_jl1i5nbD4@#N|R~;Bx%osS8sXg=_>@@rL||o?w#a*|kIcC!q$z_oM(l>&! z)H6D_o0fB?bZd+npMK4GU}7#2ceOronx>FAJ8L5>ByiAw)Zv&>Xn$^47Fy*QwaEnC zthuZu*zEcY8mjKyy?E*1?shulHMB0r17+U*<)!`mPX!RgG58(rK~`$CFc@_2eE#NHe>PnZmGb>(=L8X7k3-rCCj9NR>`5=z4&B^NGKf-22dp zjbrQP3-NuVnWkIhzs|@s5O-=?oA`Vak?V5S(4pf+>2U?ZT3SJ23@d4In;X{6JnPc? z556CMfTL|nNT(ErOnaR;St%=AZ99$T?ON6IN z4$UaT6oiuy}X_#A>20XtCgwi6Z(VZM`f}eCT?a3l4X->orbUih9W}eC9D>c2EMNaM3AXW zloaNKZpFSO22v~Z8c{%A;IlwSiAjj0qhHG8sYkSU|XDQ28+ZOhI;NgexI#?{2ArxeqwysHm zB$d3zQ=^Qm-Bhf=AO{#0-QyqGyO3f1%ytkx&d$WOXZpNs(J-F&3OAR);z&_*HgPb? zNFBszw>orbthz=ZM?vhzOvcD;{(}@f2Q=rwkNViy*bb8^ovBpk?T&yxH4+chS9oTK z>HO7f3BIsea2l*xG5L#b%%O?l>8u@%miAIXep+{b`ir+MR%A+wh$D?wC;bG;X3VTD zVlPc<%!^3c)z=>LOmLd(=l^I_GAM=A&CyS(!$1LEGRn5;R|u4VOflo9fuN* zOyU^E1bK%JY!KIeL~m=G!sveg3xl5xieCH9Mn|pv>SL^hxG|$3FH_25#`IqtSo(9N zT;x%mmT4dhoyjcbCe^kb$A{hTb%(kqKK8bRqbUyhdiC&{m}{vT<4s6yqM|5mCQg%b z#ui1>8=Zd1ASeMgSsZN8X#`rQi}o8CS9kyTu?VTgYx7NtN1$pxHtj@kp=LAeCne1T zqT@k3^-@CML(K>!`wC(N$eC$?6!X4(%`U7cZ5+m-Djr}kh_57ZA6eR|!5S9KctO_V zv>?8F@ks@RQ>IMAi5}{eZ{%vA{(HOM{o?L-uC7)TB{Tm?beIl8vex+4S4XoKw=^AQvr@lPC?f9v)Y@~=arGo9k7IYZ|r1<8SKYaHx{l(T}0fT)s;EEYL zvSGWRPek#o9T@bafJcM-b=W=A(S6K8(2{?{MrNkNv>$y&&&rwll+NA<>)l6>?_0px zJh?G!ho}nSG{8##LR)Zy$*28T!U~;avxD#DF^BWxIa;A5oiwlw-W5@3l-yLYj@zPg zsK&4y13m_?kO0Be#<>=7Ze)4oAdxh49VLW_?;J2#WpIm%t72$_d{_@&z4fK9zX``X z?YNw9CCAgvByl`WyQQSn{A!A^M7Vp`z5K`xy6J%6(y&VODd+_zkv-uf1%#z`i$Et> zgXjUa25JgbSwakh6$58m>V8Th52FSp8&^@J;Ze0{IKa*XMN|L4%rtnFA3O8&aK`=!OAQqOEpm#tpNcOzu5NbRvhUM=|x2 z{^g@<(7$v2EiT)I#@ww$AL-ArlI~YMI80yQsuW-9_czkHEA^l&A9fGyN&*=G%5HJ= zG;((EZR9|z>8^GIi9E26Lis`Ws6-*3HpkkA;E#6XGjv0yH+EI;|L2dZDKynDwOexX z@XPzfCvQBlaoqUil1hH&%sZ|V!r{^G#oxY#dpAlXx_i$7SIqCh&0{AvkDq|j!(wd! z7cLnP63Y;~G8l&RiQk6nD>UtFQ-VuuaY;+Vaf4MFDl^k@gz7;_#=N`x<1_mo;VkiW zQ&aonQgwv9>;))Q4^d5`!(<$F4EeIlQ%5x5?KU30`%W#(UBs!|OaM6mUMH)JGWsx+ z6>6nW$=ep7wyvfz;4mPfZNUD^g(SOM2S`#G{(`J&4<0a0l7 zTu4*pxsly)Eb0H0&87@aJgk;Bu?R!Db!=crfugHg?hWy$^?v@(ul=pSx=b8(*k7Ks z(p=sznlUJ_;9v~BU9DnWmxM5^;5cKIS2-gD2yPgJ+wHL1xGL3Ccnc27mj2;KJNJTC z7yw?r@WK)O217HTX>E}n+d0EIB1=fD;f z%H$vg$J@5{;RZEdY}(0JirJC;uekCnV0x)AnFPY`3#TD zc9M<#Ew6}jwUdmd6~OLA&cl4qqHhV~>h~MiFsjxKCoQX!4x8soQlg?}jH##u9lZrH zVz|9bPsSqSVT$NC9tq=h<8o}5Ij*3QMr5>7Xul57-!?*7mb9pt>w#CYM>2!4UP2=z z;#>twO^`^1MRbk+qNI^Yp_9#?-@qi*vcM=1RIFPQ>3%+o&vn;stfL_yU5(BL<(ys8 z+|*RXso~4`I8U3BYAG0ODB^6P;TVYs8j-M#X|R0SM$AmLxI+ham<9-6?iGNRG&RoZ zRITdUGE%*kkI^l_6oeudc<$5%8s)bJJ`^yfK%MP|qj2&@Tg+fKN-k+51VmKv{E>NcsPgbKMY zBnTJD?1s;kG?g5vT0?&#wL?>ZJ4lHv)NZi8Xx6)ihP+mXi!ia+m9!3_!Y@e(TnQ;+N#kiof=7k6dnzx1O}rYz!Qu z3E%?HRinZZ_&LzoAJz2p`*6Y&+D-QxzjXV-9S#-FCa85JCu7QH@Pk?GvR(d=Y*zGQ u6Im%)s49}k3^=TUTT)tzZDjKLb+q<<{Q&WY