From d823fa9083cefd868dc75f91398867ef0791271c Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Sun, 21 Sep 2025 14:28:17 +0800 Subject: [PATCH] update --- assets/Scripts/Sub/SubManager.ts | 98 ++- assets/Scripts/Sub/UI/PreloadUI.ts | 17 +- .../chat18x/manager/NavigationManager.ts | 175 ++++- .../ui/components/ChatContentsLayout.ts | 18 +- assets/Scripts/chat18x/ui/panels/ChatPanel.ts | 14 +- .../chat18x/ui/panels/GirlDetailPanel.ts | 18 +- .../chat18x/ui/panels/GirlListPanel.ts | 42 +- .../chat18x/ui/panels/NavigationPanel.ts | 8 +- .../chat18x/ui/panels/PastGirlListPanel.ts | 27 +- .../chat18x/ui/panels/PurchasePanel.ts | 3 +- .../Scripts/chat18x/ui/panels/SettingPanel.ts | 25 +- .../chat18x/uiitems/PastGirlListItem.ts | 7 +- .../chat18x/utils/UITransitionHelper.ts | 18 +- assets/bundles/Chat18x/ChatPanel.prefab | 668 ++++++++---------- .../bundles/Chat18x/PastGirlListPanel.prefab | 100 ++- assets/resources/chat_waiting.anim | 98 +-- 16 files changed, 635 insertions(+), 701 deletions(-) diff --git a/assets/Scripts/Sub/SubManager.ts b/assets/Scripts/Sub/SubManager.ts index b2671122..447370ce 100644 --- a/assets/Scripts/Sub/SubManager.ts +++ b/assets/Scripts/Sub/SubManager.ts @@ -7,68 +7,54 @@ import { ConfirmDialog } from "./Item/ConfirmDialog"; import { CommAdDialog } from "./Item/CommAdDialog"; import Utils from "../Main/Common/Utils"; import { InnerMsgCode } from "../Main/Config/InnerMsgCode"; +import { TipsPanel } from "../chat18x/ui/panels/TipsPanel"; const { ccclass, property } = _decorator; //项目管理器 -@ccclass('SubManager') +@ccclass("SubManager") export default class SubManager { - - private static _I: SubManager = null; - public static get I(): SubManager { - if (!SubManager._I) { - SubManager._I = new SubManager(); - SubManager._I.init(); - } - return SubManager._I; + private static _I: SubManager = null; + public static get I(): SubManager { + if (!SubManager._I) { + SubManager._I = new SubManager(); + SubManager._I.init(); } + return SubManager._I; + } - private init(){ - + private init() {} + + //飘字提示---------------------------------------------------------------------------- + public static ShowPrompt(text: string) { + TipsPanel.show(text); + } + + //显示确定框---------------------------------------------------------------------------- + /**通用确认框 { content: string, strYes?: string, strNo?: string, yesCallback?: Function, noCallback?: Function, closeCallback?: Function } */ + public static ShowConfirm(param: any) { + if (!GameRootUI.I) { + console.warn("GameRootUI还未初始化", param); + return; } - - - //飘字提示---------------------------------------------------------------------------- - public static ShowPrompt(text: string) { - if (!GameRootUI.I) { - console.warn("GameRootUI还未初始化", text); - Utils.sendInnerMsg(InnerMsgCode.UI_ShowPrompt, {text: text}); - return - } - ResManager.I.loadSubpackagePrefab("item/promptItem", (n_node: Node)=>{ - GameRootUI.I.AddUIToLayer(n_node, CommonConfig.UILayerGroup.Layer_tips) - let pItem = n_node.getComponent(promptItem) - pItem.setLabel(text) - }) + ResManager.I.loadSubpackagePrefab("item/ConfirmDialog", (n_node: Node) => { + GameRootUI.I.AddUIToLayer(n_node, CommonConfig.UILayerGroup.Layer_tips); + let pItem = n_node.getComponent(ConfirmDialog); + pItem.setParam(param); + }); + } + + //显示通用广告框---------------------------------------------------------------------------- + /**通用广告框 { content: string, strAd?: string, strLeft?: string, adCallback?: Function, leftCallback?: Function, closeCallback?: Function } */ + public static ShowCommonAdDialog(param: any) { + if (!GameRootUI.I) { + console.warn("GameRootUI还未初始化", param); + return; } - - - //显示确定框---------------------------------------------------------------------------- - /**通用确认框 { content: string, strYes?: string, strNo?: string, yesCallback?: Function, noCallback?: Function, closeCallback?: Function } */ - public static ShowConfirm(param:any) { - if (!GameRootUI.I) { - console.warn("GameRootUI还未初始化", param); - return - } - ResManager.I.loadSubpackagePrefab("item/ConfirmDialog", (n_node: Node)=>{ - GameRootUI.I.AddUIToLayer(n_node, CommonConfig.UILayerGroup.Layer_tips) - let pItem = n_node.getComponent(ConfirmDialog) - pItem.setParam(param) - }) - } - - - //显示通用广告框---------------------------------------------------------------------------- - /**通用广告框 { content: string, strAd?: string, strLeft?: string, adCallback?: Function, leftCallback?: Function, closeCallback?: Function } */ - public static ShowCommonAdDialog(param:any) { - if (!GameRootUI.I) { - console.warn("GameRootUI还未初始化", param); - return - } - ResManager.I.loadSubpackagePrefab("item/CommAdDialog", (n_node: Node)=>{ - GameRootUI.I.AddUIToLayer(n_node, CommonConfig.UILayerGroup.Layer_tips) - let pItem = n_node.getComponent(CommAdDialog) - pItem.setParam(param) - }) - } -} \ No newline at end of file + ResManager.I.loadSubpackagePrefab("item/CommAdDialog", (n_node: Node) => { + GameRootUI.I.AddUIToLayer(n_node, CommonConfig.UILayerGroup.Layer_tips); + let pItem = n_node.getComponent(CommAdDialog); + pItem.setParam(param); + }); + } +} diff --git a/assets/Scripts/Sub/UI/PreloadUI.ts b/assets/Scripts/Sub/UI/PreloadUI.ts index b9d32b1b..c0252306 100644 --- a/assets/Scripts/Sub/UI/PreloadUI.ts +++ b/assets/Scripts/Sub/UI/PreloadUI.ts @@ -106,11 +106,7 @@ export class PreloadUI extends Component { } protected onDestroy(): void { - Utils.removeInnerEL( - InnerMsgCode.UI_ShowPrompt, - this, - this.resiveShowPrompt - ); + } update(deltaTime: number) { @@ -127,17 +123,6 @@ export class PreloadUI extends Component { } } - /**收到飘字消息 */ - resiveShowPrompt(data: any) { - let msg = data.text; - let self = this; - ResManager.I.loadSubpackagePrefab("item/promptItem", (n_node: Node) => { - self.node.addChild(n_node); - let pItem = n_node.getComponent(promptItem); - pItem.setLabel(msg); - }); - } - //预加载文件 preloadFiles() { let preloadTab = [ diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts index 77f879b9..75bdddd6 100644 --- a/assets/Scripts/chat18x/manager/NavigationManager.ts +++ b/assets/Scripts/chat18x/manager/NavigationManager.ts @@ -127,14 +127,20 @@ export class NavigationManager { * 统一的面板切换方法 * @param panelType 目标面板类型 */ - public switchToPanel(panelType: PanelType, force: boolean = false): Node { + public switchToPanel( + panelType: PanelType, + force: boolean = false, + callback: Function = null + ): Node { if (!panelType) { console.error("[NavigationManager] switchToPanel: panelType is invalid"); return null; } if (this.currentActivePanelType === panelType && !force) { - console.log(`[NavigationManager] Already on ${panelType}, skipping switch`); + console.log( + `[NavigationManager] Already on ${panelType}, skipping switch` + ); return this.currentActivePanel; } @@ -161,10 +167,9 @@ export class NavigationManager { const showDirection = isMovingRight ? "right" : "left"; // 隐藏当前面板（包括子页面） - if (!this.currentActivePanel || !this.currentActivePanel.isValid) { - return; + if (this.currentActivePanel && this.currentActivePanel.isValid) { + this.hidePanelWithAnimation(this.currentActivePanel, hideDirection); } - this.hidePanelWithAnimation(this.currentActivePanel, hideDirection); // 加载并显示目标面板 this.loadOrGetPanel(panelType, (panel: Node) => { @@ -179,13 +184,15 @@ export class NavigationManager { this.showPanelWithAnimation(panel, showDirection, () => { this.currentActivePanel = panel; this.navigationPanel.hideLoading?.(); + if (callback instanceof Function) callback(panel); }); }); } private subPanelDic: Map = new Map(); private subPanelMapping: Map = new Map(); - private subPanelAnimationConfigs: Map = new Map(); + private subPanelAnimationConfigs: Map = + new Map(); // 弹窗管理相关属性 private popupPanels: Set = new Set(); // 管理所有打开的弹窗 @@ -193,6 +200,75 @@ export class NavigationManager { // 动画锁，防止动画中重复操作 private isAnimating: boolean = false; + /** + * 带动画的子面板清理方法 + * @param basePanel 主面板节点 + * @param callback 所有动画完成后的回调 + */ + private clearSubPanelsWithAnimation( + basePanel: Node, + callback?: Function + ): void { + if (!basePanel || !basePanel.isValid) { + callback && callback(); + return; + } + + const subPanels = this.subPanelDic.get(basePanel); + if (!subPanels || subPanels.length === 0) { + callback && callback(); + return; + } + + let completedCount = 0; + const totalCount = subPanels.length; + + // 完成动画的回调 + const onAnimationComplete = () => { + completedCount++; + if (completedCount >= totalCount) { + // 清理subPanelDic + this.subPanelDic.delete(basePanel); + callback && callback(); + } + }; + + // 同时播放所有子面板的关闭动画 + for (let i = subPanels.length - 1; i >= 0; i--) { + const subPanel = subPanels[i]; + if (subPanel && subPanel.isValid) { + // 获取动画配置 + let config = this.subPanelAnimationConfigs.get(subPanel); + if (!config) { + config = { + openAnimation: PageTransitionType.SCALE, + closeAnimation: PageTransitionType.SCALE, + duration: 0.2, + }; + } + + // 播放关闭动画 + this.playSubPanelCloseAnimation(subPanel, config, () => { + // 清理映射 + this.subPanelMapping.delete(subPanel); + this.subPanelAnimationConfigs.delete(subPanel); + + // 销毁节点 + const baseView = subPanel.getComponent(li_BaseView); + if (baseView) { + baseView.close(); + } else { + subPanel.destroy(); + } + + onAnimationComplete(); + }); + } else { + onAnimationComplete(); + } + } + } + /** * 统一的subPanel清理方法 * @param basePanel 主面板节点 @@ -252,13 +328,15 @@ export class NavigationManager { const defaultConfig: SubPanelAnimationConfig = { openAnimation: PageTransitionType.SCALE, closeAnimation: PageTransitionType.SCALE, - duration: 0.3 + duration: 0.3, }; const config = animationConfig || defaultConfig; const callback = (n: Node) => { if (!n || !n.isValid) { - console.error("[NavigationManager] openSubPanel: created panel is invalid"); + console.error( + "[NavigationManager] openSubPanel: created panel is invalid" + ); return; } @@ -273,10 +351,11 @@ export class NavigationManager { if (basePanelType) { this.subPanelMapping.set(n, basePanelType); } else { - console.warn(`[NavigationManager] 无法确定basePanel类型: ${basePanel.name}`); + console.warn( + `[NavigationManager] 无法确定basePanel类型: ${basePanel.name}` + ); } - // 存储动画配置 this.subPanelAnimationConfigs.set(n, config); @@ -299,12 +378,16 @@ export class NavigationManager { force: boolean = false ): Node { if (!panelType) { - console.error("[NavigationManager] switchToPanelWithTransition: panelType is invalid"); + console.error( + "[NavigationManager] switchToPanelWithTransition: panelType is invalid" + ); return null; } if (this.currentActivePanelType === panelType && !force) { - console.log(`[NavigationManager] Already on ${panelType}, skipping switch`); + console.log( + `[NavigationManager] Already on ${panelType}, skipping switch` + ); return this.currentActivePanel; } @@ -322,8 +405,12 @@ export class NavigationManager { this.navigationPanel.showLoading?.(); // 获取动画方向 - const hideDirection = this.getDirectionFromTransitionType(transitionConfig.outgoingTransition); - const showDirection = this.getDirectionFromTransitionType(transitionConfig.incomingTransition); + const hideDirection = this.getDirectionFromTransitionType( + transitionConfig.outgoingTransition + ); + const showDirection = this.getDirectionFromTransitionType( + transitionConfig.incomingTransition + ); // 隐藏当前面板（包括子页面） if (this.currentActivePanel && this.currentActivePanel.isValid) { @@ -350,7 +437,9 @@ export class NavigationManager { /** * 将过渡类型转换为方向字符串 */ - private getDirectionFromTransitionType(transitionType: PageTransitionType): "left" | "right" | "up" | "down" { + private getDirectionFromTransitionType( + transitionType: PageTransitionType + ): "left" | "right" | "up" | "down" { switch (transitionType) { case PageTransitionType.SLIDE_LEFT: return "left"; @@ -368,7 +457,10 @@ export class NavigationManager { /** * 执行子面板打开动画 */ - private playSubPanelOpenAnimation(panel: Node, config: SubPanelAnimationConfig): void { + private playSubPanelOpenAnimation( + panel: Node, + config: SubPanelAnimationConfig + ): void { if (!panel || !panel.isValid) { return; } @@ -447,7 +539,11 @@ export class NavigationManager { * @param data 传递的数据 * @param callback 可选的回调函数 */ - public openPopupPanel(panelName: string, data: any = null, callback?: Function): void { + public openPopupPanel( + panelName: string, + data: any = null, + callback?: Function + ): void { if (!panelName) { console.error("[NavigationManager] openPopupPanel: panelName is empty"); return; @@ -455,13 +551,17 @@ export class NavigationManager { const popupCallback = (panel: Node) => { if (!panel || !panel.isValid) { - console.error("[NavigationManager] openPopupPanel: created panel is invalid"); + console.error( + "[NavigationManager] openPopupPanel: created panel is invalid" + ); return; } // 将弹窗添加到管理集合中 this.popupPanels.add(panel); - console.log(`[NavigationManager] Popup panel opened: ${panelName}, total popups: ${this.popupPanels.size}`); + console.log( + `[NavigationManager] Popup panel opened: ${panelName}, total popups: ${this.popupPanels.size}` + ); if (callback) { callback(panel); @@ -484,7 +584,9 @@ export class NavigationManager { // 从弹窗管理集合中移除 if (this.popupPanels.has(panel)) { this.popupPanels.delete(panel); - console.log(`[NavigationManager] Popup panel closed: ${panel.name}, total popups: ${this.popupPanels.size}`); + console.log( + `[NavigationManager] Popup panel closed: ${panel.name}, total popups: ${this.popupPanels.size}` + ); } // 关闭面板 @@ -508,7 +610,9 @@ export class NavigationManager { return; } - console.log(`[NavigationManager] Closing all popups, count: ${this.popupPanels.size}`); + console.log( + `[NavigationManager] Closing all popups, count: ${this.popupPanels.size}` + ); // 复制Set以避免在迭代过程中修改 const popupPanelsToClose = Array.from(this.popupPanels); @@ -522,9 +626,14 @@ export class NavigationManager { // 确保清空集合 this.popupPanels.clear(); } - public closeSubPanel(panel: Node | li_BaseView, animationConfig?: SubPanelAnimationConfig) { + public closeSubPanel( + panel: Node | li_BaseView, + animationConfig?: SubPanelAnimationConfig + ) { if (!panel) { - console.warn("[NavigationManager] closeSubPanel: panel is null or undefined"); + console.warn( + "[NavigationManager] closeSubPanel: panel is null or undefined" + ); return; } @@ -549,7 +658,7 @@ export class NavigationManager { config = { openAnimation: PageTransitionType.SCALE, closeAnimation: PageTransitionType.SCALE, - duration: 0.3 + duration: 0.3, }; } @@ -590,7 +699,9 @@ export class NavigationManager { this.subPanelDic.delete(baseNode); } } else { - console.warn(`[NavigationManager] ${panelNode.name} 不在子页面列表中`); + console.warn( + `[NavigationManager] ${panelNode.name} 不在子页面列表中` + ); } } @@ -636,7 +747,9 @@ export class NavigationManager { case "PersonalPanel": return PanelType.PERSONAL; default: - console.warn(`[NavigationManager] Unknown panel type for node: ${node.name}`); + console.warn( + `[NavigationManager] Unknown panel type for node: ${node.name}` + ); return null; } } @@ -713,18 +826,22 @@ export class NavigationManager { direction: "left" | "right" | "up" | "down", callback?: Function ) { - if (!panel || !panel.isValid || !panel.active) { + if (!panel || !panel.isValid) { callback && callback(); return; } + // 同时开始子面板的关闭动画 + this.clearSubPanelsWithAnimation(panel); + + if (!panel.active) panel.active = true; + const animationCallback = () => { panel.active = false; - // 使用统一的subPanel清理方法 - this.clearSubPanels(panel, true); callback && callback(); }; + // 主面板动画 switch (direction) { case "left": UITransitionHelper.slideOutToLeft(panel, 0.3, animationCallback); diff --git a/assets/Scripts/chat18x/ui/components/ChatContentsLayout.ts b/assets/Scripts/chat18x/ui/components/ChatContentsLayout.ts index 39a555c8..f7e4f0c2 100644 --- a/assets/Scripts/chat18x/ui/components/ChatContentsLayout.ts +++ b/assets/Scripts/chat18x/ui/components/ChatContentsLayout.ts @@ -92,18 +92,6 @@ export class ChatContentsLayout extends Component { playerBubble.node.active = true; playerBubble.updateBubbleContent(dialog.content, true); this.bubbles.push(playerBubble); - - // 创建等待回复气泡（插入到首位，显示在玩家消息上面） - // this.waitingBubble = this.createOrGetBubble(false); - // this.waitingBubble.node.active = true; - // this.waitingBubble.updateBubbleContent("...", false, undefined, true); - // this.waitingBubble.node.setSiblingIndex(0); - // this.bubbles.push(this.waitingBubble); - this.node.position = Vec3.ZERO; - // 滚动到底部（等待下一帧Layout更新完成） - this.scheduleOnce(() => { - this.scrollView.scrollToBottom(); - }, 0); } /** * 更新AI回复的对话 @@ -120,6 +108,12 @@ export class ChatContentsLayout extends Component { // 逐个添加AI对话，带延时 this.addAIDialogsWithDelay(dialogs, 0); + + this.node.position = Vec3.ZERO; + // 滚动到底部（等待下一帧Layout更新完成） + this.scheduleOnce(() => { + this.scrollView.scrollToBottom(); + }, 0); } /** diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts index 125782ca..3fc8d329 100644 --- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts @@ -84,6 +84,13 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { targetSize; videoAreaPos; + + base: Node; + + openUIDataCT(data: any) { + this.base = data.base; + } + onLoadCT() { Utils.parseNode(this.node, this._nodeTab); @@ -395,8 +402,12 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { protected onEnable(): void { if (!this.manager) this.manager = DialogManager.getInstance(); + this.base.active = false; this.refresh(); } + protected onDisable(): void { + this.base.active = true; + } isWaiting: boolean = false; public async OnClickSend() { @@ -501,8 +512,7 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { } returnBtn() { - // Navigate back to GirlDetailPanel with current girlId using smooth transition - NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL); + NavigationManager.Instance.closeSubPanel(this); } onClickRecord() { NavigationManager.Instance.openPopupPanel("RecordPanel", this.id); diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index d874ff06..db685707 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -311,17 +311,15 @@ export class GirlDetailPanel extends li_BaseView { OnClickChatBtn() { // 使用带过渡动画的导航方法 - NavigationManager.Instance.switchToPanel(PanelType.PAST_GIRL_LIST); - - // 延迟打开 ChatPanel，确保 PastGirlListPanel 已经完全加载 - this.scheduleOnce(() => { - // 获取当前活动的 PastGirlListPanel 节点 - const baseNode = NavigationManager.Instance.getCurrentActivePanelNode(); - if (baseNode) { - const chatData = { girlId: this.id }; - NavigationManager.Instance.openSubPanel("ChatPanel", baseNode, chatData); + NavigationManager.Instance.switchToPanel( + PanelType.PAST_GIRL_LIST, + false, + (base) => { + const chatData = { girlId: this.id ,base:base}; + NavigationManager.Instance.openSubPanel("ChatPanel", base, chatData); } - }, 0.5); // 延迟 0.5 秒，确保动画完成 + ); + } returnBtn() { diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts index b305dd37..1c69549b 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts @@ -1,4 +1,4 @@ -import { _decorator, Component, Node, instantiate } from "cc"; +import { _decorator, Component, Node, instantiate, tween, Vec3 } 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"; @@ -8,6 +8,7 @@ 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; @@ -99,7 +100,8 @@ export class GirlListPanel extends li_BaseView { girlData.setGirlList(category.toString(), res.data); // 根据数据，刷新界面 const allId = girlData.getGirlIds(category.toString()); - for (let id of allId) { + for (let i = 0; i < allId.length; i++) { + let id = allId[i]; let item = this.getItemFromPool(); item.refreshData(category, id, this.node); item.node.active = true; @@ -113,6 +115,28 @@ export class GirlListPanel extends li_BaseView { } } + private addSlideInAnimation(itemNode: Node, index: number) { + // 保存节点的目标位置 + const targetPosition = itemNode.getPosition(); + + // 设置初始位置为屏幕右侧外（偏移300像素） + const startPosition = new Vec3( + targetPosition.x + 300, + targetPosition.y, + targetPosition.z + ); + itemNode.setPosition(startPosition); + + // 添加递进延时，每个item延迟0.05秒 + const delay = index * 0.05; + + // 执行滑入动画 + tween(itemNode) + .delay(delay) + .to(0.4, { position: targetPosition }, { easing: "cubicOut" }) + .start(); + } + hide() { this.node.active = false; } @@ -121,8 +145,7 @@ export class GirlListPanel extends li_BaseView { GButton.BandClick(this._nodeTab.ReturnBtn, this.Return, this); } Return() { - // 直接关闭，不需要动画 - this.node.active = false; + NavigationManager.Instance.closeSubPanel(this); } onDestroy() { @@ -141,16 +164,5 @@ export class GirlListPanel extends li_BaseView { } } this.cache = []; - - // 清理 content 中所有的 GirlListItem 节点 - for (let i = this.content.children.length - 1; i >= 0; i--) { - let child = this.content.children[i]; - if (child !== this.itemInst.node) { - let item = child.getComponent(GirlListItem); - if (item) { - child.destroy(); - } - } - } } } diff --git a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts index 8ad50a81..f56a8bba 100644 --- a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts @@ -36,7 +36,7 @@ export class NavigationPanel extends li_BaseView { NavigationManager.Instance.registerNavigationPanel(this); this.registerListener(); - this.updateButtonStates(PanelType.PAST_GIRL_LIST); + this.updateButtonStates(PanelType.THEME); // 初次打开时通过NavigationManager切换到主题面板 this.initializeFirstPanel(); @@ -101,13 +101,15 @@ export class NavigationPanel extends li_BaseView { this.girlDetailBtn.setFocus( this.currentActivePanel === PanelType.GIRL_DETAIL ); - this.pastGirlListBtn.setFocus(this.currentActivePanel === PanelType.PAST_GIRL_LIST); + this.pastGirlListBtn.setFocus( + this.currentActivePanel === PanelType.PAST_GIRL_LIST + ); this.settingBtn.setFocus(this.currentActivePanel === PanelType.PERSONAL); } private initializeFirstPanel() { // 初次打开时通过NavigationManager切换到历史女孩列表面板 - NavigationManager.Instance.switchToPanel(PanelType.PAST_GIRL_LIST, true); + NavigationManager.Instance.switchToPanel(PanelType.THEME, true); } public showPanel() { diff --git a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts index a873c298..a62268be 100644 --- a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts @@ -5,6 +5,7 @@ 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"; const { ccclass, property } = _decorator; @@ -68,13 +69,9 @@ export class PastGirlListPanel extends li_BaseView { // TODO: 实现获取已解锁女孩列表的逻辑 // 这个方法需要遍历所有分类，找出 isRelease === true 的女孩 private getUnlockedGirls(): number[] { - // TODO: 实现获取已解锁女孩列表逻辑 - // 需要实现的逻辑： - // 1. 遍历 GirlData 中的所有分类 - // 2. 对每个分类中的每个女孩检查 getIsRelease 状态 - // 3. 返回所有已解锁女孩的 {category, id} 列表 - console.log("TODO: 实现获取已解锁女孩列表逻辑"); - return [10001, 10002]; + const GirlData = DataManager.I.getDataById(DataId.Girl); + const allids = GirlData.getAllReleaseGirlIds(); + return allids; } refresh() { @@ -90,10 +87,22 @@ export class PastGirlListPanel extends li_BaseView { // 获取已解锁女孩列表 const ids = this.getUnlockedGirls(); - // 根据数据，刷新界面 + // 创建带时间戳的数组用于排序 + const girlsWithTime: {id: number, lastTime: number}[] = []; + + // 收集每个女孩的最后聊天时间 for (let id of ids) { + const lastTime = ChatHistoryManager.Instance.getLastChatTime(id) || 0; + girlsWithTime.push({id, lastTime}); + } + + // 按最后聊天时间降序排序（最近的在前） + girlsWithTime.sort((a, b) => b.lastTime - a.lastTime); + + // 根据排序后的数据刷新界面 + for (let girlData of girlsWithTime) { let item = this.getItemFromPool(); - item.refreshData(id, this.node); + item.refreshData(girlData.id, this.node); item.node.active = true; this.cache.push(item); diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index d46322d2..30e25f5c 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -120,8 +120,7 @@ export class PurchasePanel extends li_BaseView { GButton.BandClick( this._nodeTab.ReturnBtn, () => { - this.onClose(); - // NavigationPanel 始终显示，不需要显示 DefaultView + NavigationManager.Instance.closeSubPanel(this); }, this ); diff --git a/assets/Scripts/chat18x/ui/panels/SettingPanel.ts b/assets/Scripts/chat18x/ui/panels/SettingPanel.ts index 61468787..352b16d2 100644 --- a/assets/Scripts/chat18x/ui/panels/SettingPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/SettingPanel.ts @@ -17,6 +17,7 @@ import LanguageUtils, { } from "../../../Main/Common/LanguageUtils"; import AudioManager from "../../../Main/Manager/AudioManager"; import PlayerDataManager from "../../../Main/Manager/PlayerDataManager"; +import { NavigationManager } from "../../manager/NavigationManager"; const { ccclass, property } = _decorator; interface LanguageButton { @@ -58,8 +59,6 @@ export class SettingPanel extends li_BaseView { this.currentSelectedLang = LanguageUtils.CurrentLanguage; this.updateSelection(); this.updateAudioButtonStates(); - - this.playEnterAnimation(); } private music_on: Node; @@ -163,7 +162,7 @@ export class SettingPanel extends li_BaseView { // GButton.BandClick(this._nodeTab.Language1, this.switchToEn, this); // GButton.BandClick(this._nodeTab.Language2, this.swithcToHi, this); - GButton.BandClick(this._nodeTab.closeBtn, this.close, this); + GButton.BandClick(this._nodeTab.closeBtn, this.onClickClose, this); this.languageButtons.forEach((langBtn) => { if (langBtn.button) { @@ -273,23 +272,7 @@ export class SettingPanel extends li_BaseView { .start(); } - private playEnterAnimation() { - if (this.panelBg) { - this.panelBg.scale = new Vec3(0.8, 0.8, 1); - tween(this.panelBg) - .to(0.3, { scale: new Vec3(1, 1, 1) }, { easing: "backOut" }) - .start(); - } - } - - private playExitAnimation(callback: () => void) { - if (this.panelBg) { - tween(this.panelBg) - .to(0.2, { scale: new Vec3(0.8, 0.8, 1) }, { easing: "backIn" }) - .call(callback) - .start(); - } else { - callback(); - } + onClickClose() { + NavigationManager.Instance.closeSubPanel(this); } } diff --git a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts index 5785d8e6..3bf794e6 100644 --- a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts @@ -64,7 +64,7 @@ export class PastGirlListItem extends Component { ); } - refreshData(girlId: number, baseNode: Node) { + refreshData(girlId: number, baseNode: Node):number { if (!this.stars) { this.stars = this.starParent.getComponentsInChildren(Sprite); } @@ -118,7 +118,7 @@ export class PastGirlListItem extends Component { } // 显示最近聊天时间 - this.updateLastChatTime(); + return this.updateLastChatTime(); } private getLastChatTime(id: number): number | null { @@ -126,9 +126,10 @@ export class PastGirlListItem extends Component { } // 更新最近聊天时间显示 - private updateLastChatTime() { + private updateLastChatTime():number { const lastTime = this.getLastChatTime(this.id); this.lastChatTime.string = Utils.formatChatTime(lastTime); + return lastTime; } reset() { diff --git a/assets/Scripts/chat18x/utils/UITransitionHelper.ts b/assets/Scripts/chat18x/utils/UITransitionHelper.ts index bf83eaed..24343f52 100644 --- a/assets/Scripts/chat18x/utils/UITransitionHelper.ts +++ b/assets/Scripts/chat18x/utils/UITransitionHelper.ts @@ -449,14 +449,7 @@ export class UITransitionHelper { // 执行缩放进入动画 tween(node) - .parallel( - tween().to( - duration, - { scale: new Vec3(1, 1, 1) }, - { easing: "backOut" } - ), - tween().to(duration * 0.8, { opacity: 255 }, { easing: "sineOut" }) - ) + .to(duration, { scale: new Vec3(1, 1, 1) }, { easing: "backOut" }) .call(() => { if (callback) { callback(); @@ -484,14 +477,7 @@ export class UITransitionHelper { // 执行缩放退出动画 tween(node) - .parallel( - tween().to( - duration, - { scale: new Vec3(0, 0, 1) }, - { easing: "backIn" } - ), - tween().to(duration * 0.6, { opacity: 0 }, { easing: "sineOut" }) - ) + .to(duration, { scale: new Vec3(0, 0, 1) }, { easing: "backIn" }) .call(() => { if (callback) { callback(); diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index 6e53cdce..f6cc4f0e 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -22,7 +22,7 @@ "__id__": 2 }, { - "__id__": 303 + "__id__": 299 }, { "__id__": 74 @@ -31,23 +31,23 @@ "__id__": 114 }, { - "__id__": 389 + "__id__": 385 } ], "_active": true, "_components": [ + { + "__id__": 415 + }, + { + "__id__": 417 + }, { "__id__": 419 - }, - { - "__id__": 421 - }, - { - "__id__": 423 } ], "_prefab": { - "__id__": 425 + "__id__": 421 }, "_lpos": { "__type__": "cc.Vec3", @@ -108,18 +108,18 @@ ], "_active": true, "_components": [ + { + "__id__": 292 + }, + { + "__id__": 294 + }, { "__id__": 296 - }, - { - "__id__": 298 - }, - { - "__id__": 300 } ], "_prefab": { - "__id__": 302 + "__id__": 298 }, "_lpos": { "__type__": "cc.Vec3", @@ -4164,18 +4164,18 @@ ], "_active": true, "_components": [ + { + "__id__": 285 + }, + { + "__id__": 287 + }, { "__id__": 289 - }, - { - "__id__": 291 - }, - { - "__id__": 293 } ], "_prefab": { - "__id__": 295 + "__id__": 291 }, "_lpos": { "__type__": "cc.Vec3", @@ -4233,18 +4233,18 @@ ], "_active": true, "_components": [ + { + "__id__": 278 + }, + { + "__id__": 280 + }, { "__id__": 282 - }, - { - "__id__": 284 - }, - { - "__id__": 286 } ], "_prefab": { - "__id__": 288 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -5574,25 +5574,31 @@ }, { "__id__": 251 + }, + { + "__id__": 257 + }, + { + "__id__": 263 } ], "_active": true, "_components": [ + { + "__id__": 269 + }, + { + "__id__": 271 + }, { "__id__": 273 }, { "__id__": 275 - }, - { - "__id__": 277 - }, - { - "__id__": 279 } ], "_prefab": { - "__id__": 281 + "__id__": 277 }, "_lpos": { "__type__": "cc.Vec3", @@ -5761,85 +5767,28 @@ }, { "__type__": "cc.Node", - "_name": "Node", + "_name": "dot", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 244 }, - "_children": [ - { - "__id__": 252 - }, - { - "__id__": 258 - }, - { - "__id__": 264 - } - ], - "_active": true, - "_components": [ - { - "__id__": 270 - } - ], - "_prefab": { - "__id__": 272 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 39.230999999999995, - "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.Node", - "_name": "dot", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 251 - }, "_children": [], "_active": true, "_components": [ { - "__id__": 253 + "__id__": 252 }, { - "__id__": 255 + "__id__": 254 } ], "_prefab": { - "__id__": 257 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", - "x": -262.563, + "x": -250, "y": 0, "z": 0 }, @@ -5872,11 +5821,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -5900,11 +5849,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5958,24 +5907,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 251 + "__id__": 244 }, "_children": [], "_active": true, "_components": [ { - "__id__": 259 + "__id__": 258 }, { - "__id__": 261 + "__id__": 260 } ], "_prefab": { - "__id__": 263 + "__id__": 262 }, "_lpos": { "__type__": "cc.Vec3", - "x": -231.11, + "x": -220, "y": 0, "z": 0 }, @@ -6008,11 +5957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 258 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", @@ -6036,11 +5985,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 258 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 261 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6094,24 +6043,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 251 + "__id__": 244 }, "_children": [], "_active": true, "_components": [ { - "__id__": 265 + "__id__": 264 }, { - "__id__": 267 + "__id__": 266 } ], "_prefab": { - "__id__": 269 + "__id__": 268 }, "_lpos": { "__type__": "cc.Vec3", - "x": -197.761, + "x": -190, "y": 0, "z": 0 }, @@ -6144,11 +6093,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 265 }, "_contentSize": { "__type__": "cc.Size", @@ -6172,11 +6121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 267 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6224,47 +6173,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 251 - }, - "_enabled": true, - "__prefab": { - "__id__": 271 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 622, - "height": 125 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c08Kf/5tBKSZanHtPBfPoN" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "62v7vq63lHA58MuVNEke4K", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.UITransform", "_name": "", @@ -6275,7 +6183,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -6303,7 +6211,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 276 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6348,7 +6256,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 278 + "__id__": 274 }, "_alignFlags": 42, "_target": null, @@ -6384,7 +6292,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 276 }, "playOnLoad": true, "_clips": [ @@ -6426,7 +6334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 279 }, "_contentSize": { "__type__": "cc.Size", @@ -6454,7 +6362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 281 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6499,7 +6407,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 283 }, "_alignFlags": 40, "_target": null, @@ -6548,7 +6456,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 286 }, "_contentSize": { "__type__": "cc.Size", @@ -6576,7 +6484,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 292 + "__id__": 288 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6621,7 +6529,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 290 }, "_alignFlags": 44, "_target": null, @@ -6670,7 +6578,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 293 }, "_contentSize": { "__type__": "cc.Size", @@ -6698,7 +6606,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 299 + "__id__": 295 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6740,7 +6648,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 297 }, "_alignFlags": 45, "_target": null, @@ -6789,35 +6697,35 @@ }, "_children": [ { - "__id__": 304 + "__id__": 300 }, { - "__id__": 312 + "__id__": 308 }, { - "__id__": 320 + "__id__": 316 }, { - "__id__": 349 + "__id__": 345 } ], "_active": true, "_components": [ + { + "__id__": 376 + }, + { + "__id__": 378 + }, { "__id__": 380 }, { "__id__": 382 - }, - { - "__id__": 384 - }, - { - "__id__": 386 } ], "_prefab": { - "__id__": 388 + "__id__": 384 }, "_lpos": { "__type__": "cc.Vec3", @@ -6854,23 +6762,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 303 + "__id__": 299 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 301 + }, + { + "__id__": 303 + }, { "__id__": 305 - }, - { - "__id__": 307 - }, - { - "__id__": 309 } ], "_prefab": { - "__id__": 311 + "__id__": 307 }, "_lpos": { "__type__": "cc.Vec3", @@ -6907,11 +6815,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 304 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -6935,11 +6843,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 304 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 304 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6980,11 +6888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 304 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 306 }, "_alignFlags": 45, "_target": null, @@ -7029,23 +6937,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 303 + "__id__": 299 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 309 + }, + { + "__id__": 311 + }, { "__id__": 313 - }, - { - "__id__": 315 - }, - { - "__id__": 317 } ], "_prefab": { - "__id__": 319 + "__id__": 315 }, "_lpos": { "__type__": "cc.Vec3", @@ -7082,11 +6990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 310 }, "_contentSize": { "__type__": "cc.Size", @@ -7110,11 +7018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 312 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7178,11 +7086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 314 }, "languageKey": "chatpanel.paytotalk.desc", "defaultText": "", @@ -7212,36 +7120,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 303 + "__id__": 299 }, "_children": [ { - "__id__": 321 + "__id__": 317 }, { - "__id__": 327 + "__id__": 323 }, { - "__id__": 333 + "__id__": 329 } ], "_active": true, "_components": [ + { + "__id__": 335 + }, + { + "__id__": 337 + }, { "__id__": 339 }, { - "__id__": 341 - }, - { - "__id__": 343 - }, - { - "__id__": 346 + "__id__": 342 } ], "_prefab": { - "__id__": 348 + "__id__": 344 }, "_lpos": { "__type__": "cc.Vec3", @@ -7278,20 +7186,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 320 + "__id__": 316 }, "_children": [], "_active": true, "_components": [ { - "__id__": 322 + "__id__": 318 }, { - "__id__": 324 + "__id__": 320 } ], "_prefab": { - "__id__": 326 + "__id__": 322 }, "_lpos": { "__type__": "cc.Vec3", @@ -7328,11 +7236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 317 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 319 }, "_contentSize": { "__type__": "cc.Size", @@ -7356,11 +7264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 317 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 321 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7440,20 +7348,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 320 + "__id__": 316 }, "_children": [], "_active": true, "_components": [ { - "__id__": 328 + "__id__": 324 }, { - "__id__": 330 + "__id__": 326 } ], "_prefab": { - "__id__": 332 + "__id__": 328 }, "_lpos": { "__type__": "cc.Vec3", @@ -7490,11 +7398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 323 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 325 }, "_contentSize": { "__type__": "cc.Size", @@ -7518,11 +7426,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 323 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 327 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7576,20 +7484,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 320 + "__id__": 316 }, "_children": [], "_active": true, "_components": [ { - "__id__": 334 + "__id__": 330 }, { - "__id__": 336 + "__id__": 332 } ], "_prefab": { - "__id__": 338 + "__id__": 334 }, "_lpos": { "__type__": "cc.Vec3", @@ -7626,11 +7534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 331 }, "_contentSize": { "__type__": "cc.Size", @@ -7654,11 +7562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 337 + "__id__": 333 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7738,11 +7646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 336 }, "_contentSize": { "__type__": "cc.Size", @@ -7766,11 +7674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 338 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7811,15 +7719,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 340 }, "clickEvents": [ { - "__id__": 345 + "__id__": 341 } ], "_interactable": true, @@ -7859,7 +7767,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 320 + "__id__": 316 }, "_id": "" }, @@ -7870,7 +7778,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 303 + "__id__": 299 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -7883,11 +7791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 343 }, "_alignFlags": 16, "_target": null, @@ -7932,36 +7840,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 303 + "__id__": 299 }, "_children": [ { - "__id__": 350 + "__id__": 346 }, { - "__id__": 356 + "__id__": 352 }, { - "__id__": 362 + "__id__": 358 } ], "_active": true, "_components": [ + { + "__id__": 366 + }, + { + "__id__": 368 + }, { "__id__": 370 }, { - "__id__": 372 - }, - { - "__id__": 374 - }, - { - "__id__": 377 + "__id__": 373 } ], "_prefab": { - "__id__": 379 + "__id__": 375 }, "_lpos": { "__type__": "cc.Vec3", @@ -7998,20 +7906,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 351 + "__id__": 347 }, { - "__id__": 353 + "__id__": 349 } ], "_prefab": { - "__id__": 355 + "__id__": 351 }, "_lpos": { "__type__": "cc.Vec3", @@ -8048,11 +7956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 348 }, "_contentSize": { "__type__": "cc.Size", @@ -8076,11 +7984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 350 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8160,20 +8068,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 357 + "__id__": 353 }, { - "__id__": 359 + "__id__": 355 } ], "_prefab": { - "__id__": 361 + "__id__": 357 }, "_lpos": { "__type__": "cc.Vec3", @@ -8210,11 +8118,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 354 }, "_contentSize": { "__type__": "cc.Size", @@ -8238,11 +8146,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 356 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8296,23 +8204,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 359 + }, + { + "__id__": 361 + }, { "__id__": 363 - }, - { - "__id__": 365 - }, - { - "__id__": 367 } ], "_prefab": { - "__id__": 369 + "__id__": 365 }, "_lpos": { "__type__": "cc.Vec3", @@ -8349,11 +8257,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 358 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 360 }, "_contentSize": { "__type__": "cc.Size", @@ -8377,11 +8285,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 358 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 362 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8448,11 +8356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 358 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 364 }, "languageKey": "chatpanel.buyvip", "defaultText": "", @@ -8482,11 +8390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 367 }, "_contentSize": { "__type__": "cc.Size", @@ -8510,11 +8418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 369 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8555,15 +8463,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 371 }, "clickEvents": [ { - "__id__": 376 + "__id__": 372 } ], "_interactable": true, @@ -8603,7 +8511,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 349 + "__id__": 345 }, "_id": "" }, @@ -8614,7 +8522,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 303 + "__id__": 299 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -8627,11 +8535,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 374 }, "_alignFlags": 16, "_target": null, @@ -8676,11 +8584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 377 }, "_contentSize": { "__type__": "cc.Size", @@ -8704,11 +8612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 379 }, "_alignFlags": 40, "_target": null, @@ -8740,23 +8648,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 381 }, "timeLabel": { - "__id__": 324 + "__id__": 320 }, "timeBtnLabel": { - "__id__": 336 + "__id__": 332 }, "vipLabel": { - "__id__": 353 + "__id__": 349 }, "vipBtnLabel": { - "__id__": 365 + "__id__": 361 }, "_id": "" }, @@ -8770,11 +8678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 383 }, "_opacity": 255, "_id": "" @@ -8806,20 +8714,20 @@ }, "_children": [ { - "__id__": 390 + "__id__": 386 } ], "_active": true, "_components": [ { - "__id__": 414 + "__id__": 410 }, { - "__id__": 416 + "__id__": 412 } ], "_prefab": { - "__id__": 418 + "__id__": 414 }, "_lpos": { "__type__": "cc.Vec3", @@ -8856,24 +8764,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 385 }, "_children": [ { - "__id__": 391 + "__id__": 387 } ], "_active": true, "_components": [ { - "__id__": 409 + "__id__": 405 }, { - "__id__": 411 + "__id__": 407 } ], "_prefab": { - "__id__": 413 + "__id__": 409 }, "_lpos": { "__type__": "cc.Vec3", @@ -8910,27 +8818,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 390 + "__id__": 386 }, "_children": [ { - "__id__": 392 + "__id__": 388 } ], "_active": true, "_components": [ + { + "__id__": 398 + }, + { + "__id__": 400 + }, { "__id__": 402 - }, - { - "__id__": 404 - }, - { - "__id__": 406 } ], "_prefab": { - "__id__": 408 + "__id__": 404 }, "_lpos": { "__type__": "cc.Vec3", @@ -8967,26 +8875,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 391 + "__id__": 387 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 389 + }, + { + "__id__": 391 + }, { "__id__": 393 }, { "__id__": 395 - }, - { - "__id__": 397 - }, - { - "__id__": 399 } ], "_prefab": { - "__id__": 401 + "__id__": 397 }, "_lpos": { "__type__": "cc.Vec3", @@ -9023,11 +8931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 392 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 390 }, "_contentSize": { "__type__": "cc.Size", @@ -9051,11 +8959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 392 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 392 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9093,11 +9001,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 392 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 394 }, "_alignFlags": 12, "_target": null, @@ -9129,11 +9037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 392 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 396 }, "clickEvents": [], "_interactable": true, @@ -9198,11 +9106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 391 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 399 }, "_contentSize": { "__type__": "cc.Size", @@ -9226,11 +9134,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 391 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 401 }, "_type": 3, "_inverted": false, @@ -9248,11 +9156,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 391 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 403 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9306,11 +9214,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 410 + "__id__": 406 }, "_contentSize": { "__type__": "cc.Size", @@ -9334,11 +9242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 412 + "__id__": 408 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9392,11 +9300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 385 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 411 }, "_contentSize": { "__type__": "cc.Size", @@ -9420,14 +9328,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 385 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 413 }, "image": { - "__id__": 395 + "__id__": 391 }, "_id": "" }, @@ -9458,7 +9366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 420 + "__id__": 416 }, "_contentSize": { "__type__": "cc.Size", @@ -9486,7 +9394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 418 }, "_alignFlags": 45, "_target": null, @@ -9522,11 +9430,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 420 }, "m_rootNode": null, "payToTalkPanel": { - "__id__": 384 + "__id__": 380 }, "editBox": { "__id__": 215 @@ -9541,7 +9449,7 @@ "__id__": 71 }, "popUpImage": { - "__id__": 416 + "__id__": 412 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/PastGirlListPanel.prefab b/assets/bundles/Chat18x/PastGirlListPanel.prefab index 6ff9dcb1..d9992b55 100644 --- a/assets/bundles/Chat18x/PastGirlListPanel.prefab +++ b/assets/bundles/Chat18x/PastGirlListPanel.prefab @@ -25,20 +25,20 @@ "_active": true, "_components": [ { - "__id__": 258 + "__id__": 257 }, { - "__id__": 260 + "__id__": 259 }, { - "__id__": 262 + "__id__": 261 }, { - "__id__": 264 + "__id__": 263 } ], "_prefab": { - "__id__": 266 + "__id__": 265 }, "_lpos": { "__type__": "cc.Vec3", @@ -88,17 +88,17 @@ "_active": true, "_components": [ { - "__id__": 251 + "__id__": 250 }, { - "__id__": 253 + "__id__": 252 }, { - "__id__": 255 + "__id__": 254 } ], "_prefab": { - "__id__": 257 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", @@ -4952,23 +4952,23 @@ "__id__": 219 }, { - "__id__": 234 + "__id__": 233 } ], "_active": true, "_components": [ { - "__id__": 244 + "__id__": 243 }, { - "__id__": 246 + "__id__": 245 }, { - "__id__": 248 + "__id__": 247 } ], "_prefab": { - "__id__": 250 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -5012,7 +5012,7 @@ "__id__": 220 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 226 @@ -5021,11 +5021,11 @@ "__id__": 228 }, { - "__id__": 231 + "__id__": 230 } ], "_prefab": { - "__id__": 233 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -5188,8 +5188,6 @@ "__id__": 0 }, "fileId": "9aCRghG1lBCa+25qEAugAS", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5232,11 +5230,7 @@ "__prefab": { "__id__": 229 }, - "clickEvents": [ - { - "__id__": 230 - } - ], + "clickEvents": [], "_interactable": true, "_transition": 1, "_normalColor": { @@ -5282,16 +5276,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "4baNYSNShFU444oyMjbAaV" }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, - "component": "", - "_componentId": "ecf27717xFOIo8F0ultYqJq", - "handler": "Return", - "customEventData": "" - }, { "__type__": "cc.Widget", "_name": "", @@ -5302,7 +5286,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 231 }, "_alignFlags": 10, "_target": null, @@ -5353,20 +5337,20 @@ "_active": true, "_components": [ { - "__id__": 235 + "__id__": 234 }, { - "__id__": 237 + "__id__": 236 }, { - "__id__": 239 + "__id__": 238 }, { - "__id__": 241 + "__id__": 240 } ], "_prefab": { - "__id__": 243 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -5403,11 +5387,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", @@ -5431,11 +5415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 237 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5502,11 +5486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 239 }, "_alignFlags": 18, "_target": null, @@ -5538,11 +5522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 241 }, "languageKey": "girllistpanel.title", "defaultText": "", @@ -5576,7 +5560,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", @@ -5604,7 +5588,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 246 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5649,7 +5633,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 248 }, "_alignFlags": 41, "_target": null, @@ -5698,7 +5682,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", @@ -5726,7 +5710,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5771,7 +5755,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 255 }, "_alignFlags": 45, "_target": null, @@ -5820,7 +5804,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 258 }, "_contentSize": { "__type__": "cc.Size", @@ -5848,7 +5832,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 260 }, "_alignFlags": 45, "_target": null, @@ -5884,7 +5868,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 262 }, "_id": "" }, @@ -5902,7 +5886,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 264 }, "m_rootNode": null, "_id": "" diff --git a/assets/resources/chat_waiting.anim b/assets/resources/chat_waiting.anim index e23bc31e..a50934b7 100644 --- a/assets/resources/chat_waiting.anim +++ b/assets/resources/chat_waiting.anim @@ -88,43 +88,37 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -262.56298828125, + "value": -250, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -262.56298828125, + "value": -250, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -262.56298828125, + "value": -250, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -154,9 +148,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -168,9 +160,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -182,9 +172,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -213,9 +201,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -227,9 +213,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -304,43 +288,37 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -232.46299743652344, + "value": -220, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -232.56300354003906, + "value": -220, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -232.56300354003906, + "value": -220, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -370,9 +348,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -384,9 +360,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -398,9 +372,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -488,43 +460,37 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -202.56300354003906, + "value": -190, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -202.56300354003906, + "value": -190, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": -202.56300354003906, + "value": -190, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -554,9 +520,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -568,9 +532,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -582,9 +544,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1,