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 cabc25ad..cb4322af 100644 Binary files a/assets/bundles/DataTable/tbaicharacters.bin and b/assets/bundles/DataTable/tbaicharacters.bin differ diff --git a/xchat_cfg b/xchat_cfg index e0e87636..78ef7789 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit e0e87636bd86aa4c9fe5850ba2ef116e4d38e45c +Subproject commit 78ef7789308b417b6447d0a9502d38ff43a36f61