diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 60ad4457..861e719c 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -3,7 +3,8 @@ "allow": [ "Bash(mkdir:*)", "Bash(cp:*)", - "Bash(rm:*)" + "Bash(rm:*)", + "Bash(sed:*)" ], "deny": [] } diff --git a/assets/Scripts/Main/Common/GameRootUI.ts b/assets/Scripts/Main/Common/GameRootUI.ts index f4e1dca2..ff30d64d 100644 --- a/assets/Scripts/Main/Common/GameRootUI.ts +++ b/assets/Scripts/Main/Common/GameRootUI.ts @@ -17,6 +17,7 @@ import { import { CommonConfig } from "../Config/CommonConfig"; import ResManager from "../Manager/ResManager"; import Utils from "./Utils"; +import { UITransitionHelper } from "../../chat18x/utils/UITransitionHelper"; const { ccclass, property, executeInEditMode, disallowMultiple } = _decorator; @@ -49,8 +50,67 @@ export default class GameRootUI extends Component { showDefaultView() { this.defaultView.active = true; } + + /** + * 带过渡动画显示默认视图 + * @param transitionType 过渡动画类型:'slide_left', 'slide_right', 'fade', 'none' + * @param duration 动画时长,默认0.3秒 + * @param callback 动画完成回调 + */ + showDefaultViewWithTransition( + transitionType: string = "none", + duration: number = 0.1, + callback?: Function + ) { + if (!this.defaultView) { + console.warn("GameRootUI: defaultView not found"); + callback && callback(); + return; + } + + // 确保节点是激活的 + this.defaultView.active = true; + + if (transitionType === "none") { + callback && callback(); + return; + } + + console.log( + `GameRootUI: Executing ${transitionType} animation on defaultView` + ); + + switch (transitionType) { + case "slide_left": + console.log( + "GameRootUI: About to call slideInFromLeft, node valid:", + this.defaultView.isValid + ); + UITransitionHelper.slideInFromLeft(this.defaultView, duration, () => { + console.log("GameRootUI: slideInFromLeft animation completed"); + callback && callback(); + }); + break; + case "slide_right": + UITransitionHelper.slideInFromRight( + this.defaultView, + duration, + callback + ); + break; + case "fade": + // 如果UITransitionHelper有fadeIn方法的话可以用,否则简单显示 + callback && callback(); + break; + default: + callback && callback(); + break; + } + } + hideDefaultView(): void { this.defaultView.active = false; + this.defaultView.position = Vec3.ZERO; } onLoad() { diff --git a/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts b/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts index b11061ef..55d6dead 100644 --- a/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts +++ b/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts @@ -91,12 +91,11 @@ export class SceneBgVideoLayer extends li_BaseView { loop: options?.loop ?? true, size: options?.size, position: options?.position, - scale: options?.scale, }; // 先停止当前视频 if (this.isPlaying) { - this.stop(); + this.pause(); } // 加载本地视频资源 @@ -106,21 +105,52 @@ export class SceneBgVideoLayer extends li_BaseView { "Girls", (res: VideoClip) => { this.videoPlayer.loop = config.loop; - + // 设置锚点为中心,确保位置对齐 const uiTransform = this.videoPlayer.node.getComponent(UITransform); if (uiTransform) { uiTransform.setAnchorPoint(0.5, 0.5); + console.log("SceneBgVideoLayer: 设置视频锚点为 (0.5, 0.5)"); } - - // 应用位置设置(使用世界坐标) + + // 应用位置设置(先尝试本地坐标,再尝试世界坐标) if (config.position) { const pos = config.position; + let targetWorldPos: Vec3; if (pos instanceof Vec3) { - this.videoPlayer.node.setWorldPosition(pos); + targetWorldPos = pos; } else { - this.videoPlayer.node.setWorldPosition(pos.x, pos.y, pos.z || 0); + targetWorldPos = new Vec3(pos.x, pos.y, pos.z || 0); } + + // 获取 videoPlayer 的父节点信息 + const parent = this.videoPlayer.node.parent; + if (parent) { + const parentWorldPos = parent.getWorldPosition(); + const parentWorldScale = parent.getWorldScale(); + console.log(`SceneBgVideoLayer: VideoPlayer 父节点世界位置: (${parentWorldPos.x}, ${parentWorldPos.y}, ${parentWorldPos.z})`); + console.log(`SceneBgVideoLayer: VideoPlayer 父节点世界缩放: (${parentWorldScale.x}, ${parentWorldScale.y}, ${parentWorldScale.z})`); + + // 尝试方法1:计算相对于父节点的本地位置 + const localPos = new Vec3(); + localPos.x = (targetWorldPos.x - parentWorldPos.x) / parentWorldScale.x; + localPos.y = (targetWorldPos.y - parentWorldPos.y) / parentWorldScale.y; + localPos.z = (targetWorldPos.z - parentWorldPos.z) / parentWorldScale.z; + + this.videoPlayer.node.setPosition(localPos); + console.log(`SceneBgVideoLayer: 设置本地位置: (${localPos.x.toFixed(2)}, ${localPos.y.toFixed(2)}, ${localPos.z.toFixed(2)})`); + } else { + // 如果没有父节点,直接使用世界坐标 + this.videoPlayer.node.setWorldPosition(targetWorldPos); + console.log(`SceneBgVideoLayer: 无父节点,使用世界坐标: (${targetWorldPos.x}, ${targetWorldPos.y}, ${targetWorldPos.z})`); + } + + // 验证位置是否设置正确 + const actualWorldPos = this.videoPlayer.node.getWorldPosition(); + const actualLocalPos = this.videoPlayer.node.getPosition(); + console.log(`SceneBgVideoLayer: 目标世界位置: (${targetWorldPos.x}, ${targetWorldPos.y}, ${targetWorldPos.z})`); + console.log(`SceneBgVideoLayer: 实际世界位置: (${actualWorldPos.x}, ${actualWorldPos.y}, ${actualWorldPos.z})`); + console.log(`SceneBgVideoLayer: 实际本地位置: (${actualLocalPos.x.toFixed(2)}, ${actualLocalPos.y.toFixed(2)}, ${actualLocalPos.z.toFixed(2)})`); } // 如果传入了目标尺寸,计算并应用缩放 @@ -128,48 +158,93 @@ export class SceneBgVideoLayer extends li_BaseView { // 获取视频的原始尺寸 const videoWidth = uiTransform.contentSize.width; const videoHeight = uiTransform.contentSize.height; - + if (videoWidth > 0 && videoHeight > 0) { - const targetWidth = config.size instanceof Size ? config.size.width : config.size.width; - const targetHeight = config.size instanceof Size ? config.size.height : config.size.height; - + const targetWidth = + config.size instanceof Size + ? config.size.width + : config.size.width; + const targetHeight = + config.size instanceof Size + ? config.size.height + : config.size.height; + // 计算缩放比例(填满整个区域) const scaleX = targetWidth / videoWidth; const scaleY = targetHeight / videoHeight; const scale = Math.max(scaleX, scaleY); - + this.videoPlayer.node.setScale(new Vec3(scale, scale, 1)); - console.log(`SceneBgVideoLayer: 视频原始尺寸: ${videoWidth}x${videoHeight}, 目标尺寸: ${targetWidth}x${targetHeight}, 缩放: ${scale}`); + console.log( + `SceneBgVideoLayer: 视频原始尺寸: ${videoWidth}x${videoHeight}, 目标尺寸: ${targetWidth}x${targetHeight}` + ); + console.log( + `SceneBgVideoLayer: 缩放比例 - X: ${scaleX.toFixed(3)}, Y: ${scaleY.toFixed(3)}, 最终: ${scale.toFixed(3)}` + ); } else { // 如果视频尺寸还未准备好,延迟重试 this.scheduleOnce(() => { if (config.size && uiTransform) { const videoWidth = uiTransform.contentSize.width; const videoHeight = uiTransform.contentSize.height; - + if (videoWidth > 0 && videoHeight > 0) { - const targetWidth = config.size instanceof Size ? config.size.width : config.size.width; - const targetHeight = config.size instanceof Size ? config.size.height : config.size.height; - + const targetWidth = + config.size instanceof Size + ? config.size.width + : config.size.width; + const targetHeight = + config.size instanceof Size + ? config.size.height + : config.size.height; + const scaleX = targetWidth / videoWidth; const scaleY = targetHeight / videoHeight; const scale = Math.max(scaleX, scaleY); - + this.videoPlayer.node.setScale(new Vec3(scale, scale, 1)); - console.log(`SceneBgVideoLayer: (延迟) 视频原始尺寸: ${videoWidth}x${videoHeight}, 目标尺寸: ${targetWidth}x${targetHeight}, 缩放: ${scale}`); + console.log( + `SceneBgVideoLayer: (延迟) 视频原始尺寸: ${videoWidth}x${videoHeight}, 目标尺寸: ${targetWidth}x${targetHeight}` + ); + console.log( + `SceneBgVideoLayer: (延迟) 缩放比例 - X: ${scaleX.toFixed(3)}, Y: ${scaleY.toFixed(3)}, 最终: ${scale.toFixed(3)}` + ); } } }, 0.1); } + } else { + // 没有指定尺寸,保持原始缩放 + this.videoPlayer.node.setScale(Vec3.ONE); + console.log("SceneBgVideoLayer: 未指定尺寸,保持默认缩放 (1, 1, 1)"); } // 如果显式传入了 scale 参数,覆盖自动计算的缩放 - else if (config.scale !== undefined) { - this.setVideoScale(config.scale); - } this.videoPlayer.play(); this.isPlaying = true; console.log(`SceneBgVideoLayer: 播放视频 ${path}, 配置:`, config); + + // 最终验证:确保视频节点的状态正确 + setTimeout(() => { + const finalWorldPos = this.videoPlayer.node.getWorldPosition(); + const finalLocalPos = this.videoPlayer.node.getPosition(); + const finalScale = this.videoPlayer.node.getScale(); + const finalTransform = this.videoPlayer.node.getComponent(UITransform); + if (finalTransform) { + console.log(`SceneBgVideoLayer: === 最终状态验证 ===`); + console.log(`SceneBgVideoLayer: 最终世界位置: (${finalWorldPos.x.toFixed(2)}, ${finalWorldPos.y.toFixed(2)}, ${finalWorldPos.z.toFixed(2)})`); + console.log(`SceneBgVideoLayer: 最终本地位置: (${finalLocalPos.x.toFixed(2)}, ${finalLocalPos.y.toFixed(2)}, ${finalLocalPos.z.toFixed(2)})`); + console.log(`SceneBgVideoLayer: 最终缩放: (${finalScale.x.toFixed(3)}, ${finalScale.y.toFixed(3)}, ${finalScale.z.toFixed(3)})`); + console.log(`SceneBgVideoLayer: 最终锚点: (${finalTransform.anchorX.toFixed(2)}, ${finalTransform.anchorY.toFixed(2)})`); + console.log(`SceneBgVideoLayer: 最终内容尺寸: ${finalTransform.contentSize.width.toFixed(0)}x${finalTransform.contentSize.height.toFixed(0)}`); + + // 计算实际渲染尺寸(内容尺寸 * 缩放) + const renderWidth = finalTransform.contentSize.width * finalScale.x; + const renderHeight = finalTransform.contentSize.height * finalScale.y; + console.log(`SceneBgVideoLayer: 计算的渲染尺寸: ${renderWidth.toFixed(0)}x${renderHeight.toFixed(0)}`); + console.log(`SceneBgVideoLayer: === 验证结束 ===`); + } + }, 200); } ); } diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts index 4f4b9911..7a4232c5 100644 --- a/assets/Scripts/chat18x/manager/NavigationManager.ts +++ b/assets/Scripts/chat18x/manager/NavigationManager.ts @@ -2,6 +2,25 @@ import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import { UITransitionHelper } from "../utils/UITransitionHelper"; import GameRootUI from "../../Main/Common/GameRootUI"; +/** + * 页面过渡动画类型枚举 + */ +export enum PageTransitionType { + NONE = "none", + SLIDE_LEFT = "slide_left", + SLIDE_RIGHT = "slide_right", +} + +/** + * 页面过渡动画配置接口 + */ +export interface PageTransitionConfig { + incomingTransition: PageTransitionType; + outgoingTransition: PageTransitionType; + duration?: number; + simultaneous?: boolean; +} + /** * 导航管理器 * @@ -28,6 +47,183 @@ export class NavigationManager { private constructor() {} + /** + * 通用页面导航方法,支持过渡动画 + * + * @param {string} targetPanel - 目标面板名称 + * @param {any} navigationData - 导航数据 + * @param {PageTransitionConfig} transitionConfig - 过渡动画配置 + * @param {any} currentPanel - 当前面板实例(可选) + * @param {Function} onComplete - 完成回调(可选) + * + * @example + * ```typescript + * NavigationManager.Instance.navigateWithTransition( + * "ChatPanel", + * { roleId: 10001 }, + * { incomingTransition: PageTransitionType.SLIDE_RIGHT, outgoingTransition: PageTransitionType.SLIDE_LEFT }, + * currentPanel + * ); + * ``` + */ + public navigateWithTransition( + targetPanel: string, + navigationData: any, + transitionConfig: PageTransitionConfig, + currentPanel?: any, + onComplete?: Function + ): void { + if (!targetPanel) { + console.warn("NavigationManager: Target panel name is required"); + return; + } + + console.log( + `Navigating to ${targetPanel} with transition:`, + transitionConfig + ); + //const correntPos = currentPanel.node.position; + const duration = transitionConfig.duration || 0.1; + const useTransition = + transitionConfig.incomingTransition !== PageTransitionType.NONE || + transitionConfig.outgoingTransition !== PageTransitionType.NONE; + + if (!useTransition) { + ViewManager.I.openBundlesView(targetPanel, navigationData, onComplete); + if ( + currentPanel && + currentPanel.onClose && + typeof currentPanel.onClose === "function" + ) { + currentPanel.onClose(); + //currentPanel.node.position = correntPos; + } + return; + } + + const extendedNavigationData = { + ...navigationData, + withTransition: true, + transitionType: transitionConfig.incomingTransition, + }; + + ViewManager.I.openBundlesView( + targetPanel, + extendedNavigationData, + (targetNode) => { + this._executeTransition( + targetNode, + currentPanel, + transitionConfig, + duration, + onComplete + ); + } + ); + } + + /** + * 执行页面过渡动画的私有方法 + * + * @private + * @param {any} targetNode - 目标节点 + * @param {any} currentPanel - 当前面板 + * @param {PageTransitionConfig} config - 动画配置 + * @param {number} duration - 动画时长 + * @param {Function} onComplete - 完成回调 + */ + private _executeTransition( + targetNode: any, + currentPanel: any, + config: PageTransitionConfig, + duration: number, + onComplete?: Function + ): void { + const executeIncomingAnimation = (callback?: Function) => { + if ( + config.incomingTransition === PageTransitionType.NONE || + !targetNode + ) { + callback && callback(); + return; + } + + switch (config.incomingTransition) { + case PageTransitionType.SLIDE_RIGHT: + UITransitionHelper.slideInFromRight(targetNode, duration, callback); + break; + case PageTransitionType.SLIDE_LEFT: + UITransitionHelper.slideInFromLeft(targetNode, duration, callback); + break; + + default: + callback && callback(); + break; + } + }; + + const executeOutgoingAnimation = (callback?: Function) => { + if ( + config.outgoingTransition === PageTransitionType.NONE || + !currentPanel || + !currentPanel.node || + !currentPanel.node.isValid + ) { + callback && callback(); + return; + } + + switch (config.outgoingTransition) { + case PageTransitionType.SLIDE_LEFT: + UITransitionHelper.slideOutToLeft( + currentPanel.node, + duration, + callback + ); + break; + case PageTransitionType.SLIDE_RIGHT: + UITransitionHelper.slideOutToRight( + currentPanel.node, + duration, + callback + ); + break; + + default: + callback && callback(); + break; + } + }; + + const closeCurrentPanel = () => { + if ( + currentPanel && + currentPanel.onClose && + typeof currentPanel.onClose === "function" + ) { + if (currentPanel.node.name !== "ThemePanel") currentPanel.onClose(); + } + onComplete && onComplete(); + }; + + if (config.simultaneous) { + let completedAnimations = 0; + const animationComplete = () => { + completedAnimations++; + if (completedAnimations >= 2) { + closeCurrentPanel(); + } + }; + + executeIncomingAnimation(animationComplete); + executeOutgoingAnimation(animationComplete); + } else { + executeOutgoingAnimation(() => { + executeIncomingAnimation(closeCurrentPanel); + }); + } + } + /** * 进入角色列表页面 * @@ -38,15 +234,56 @@ export class NavigationManager { * NavigationManager.Instance.navigateToGirlList(1); * ``` */ - public navigateToGirlList(themeId: number): void { + public navigateToGirlList(themeId: number): void; + /** + * 进入角色列表页面(带过渡动画) + * + * @param {number} themeId - 主题ID,用于筛选角色 + * @param {PageTransitionConfig} transitionConfig - 过渡动画配置 + * @param {any} currentPanel - 当前面板实例(可选) + * + * @example + * ```typescript + * NavigationManager.Instance.navigateToGirlList(1, + * { incomingTransition: PageTransitionType.SLIDE_RIGHT, outgoingTransition: PageTransitionType.FADE }, + * this + * ); + * ``` + */ + public navigateToGirlList( + themeId: number, + transitionConfig?: PageTransitionConfig, + currentPanel?: any + ): void; + public navigateToGirlList( + themeId: number, + transitionConfig?: PageTransitionConfig, + currentPanel?: any + ): void { if (themeId == null || themeId < 0) { console.warn("Invalid theme ID for girl list navigation:", themeId); return; } - GameRootUI.I.hideDefaultView(); console.log(`Navigating to girl list with theme ID: ${themeId}`); - ViewManager.I.openBundlesView("GirlListPanel", themeId); + + if (transitionConfig) { + const navigationData = { + category: themeId, + withTransition: true, + }; + this.navigateWithTransition( + "GirlListPanel", + navigationData, + transitionConfig, + currentPanel, + () => { + GameRootUI.I.hideDefaultView(); + } + ); + } else { + ViewManager.I.openBundlesView("GirlListPanel", themeId); + } } /** @@ -59,26 +296,62 @@ export class NavigationManager { * NavigationManager.Instance.navigateToChat(10001); * ``` */ - public navigateToChat(roleId: number): void { + public navigateToChat(roleId: number): void; + /** + * 进入聊天页面(带过渡动画) + * + * @param {number} roleId - 角色ID + * @param {PageTransitionConfig} transitionConfig - 过渡动画配置 + * @param {any} currentPanel - 当前面板实例(可选) + * + * @example + * ```typescript + * NavigationManager.Instance.navigateToChat(10001, + * { incomingTransition: PageTransitionType.FADE, outgoingTransition: PageTransitionType.SLIDE_LEFT }, + * this + * ); + * ``` + */ + public navigateToChat( + roleId: number, + transitionConfig?: PageTransitionConfig, + currentPanel?: any + ): void; + public navigateToChat( + roleId: number, + transitionConfig?: PageTransitionConfig, + currentPanel?: any + ): void { if (roleId == null || roleId <= 0) { console.warn("Invalid role ID for chat navigation:", roleId); return; } GameRootUI.I.hideDefaultView(); console.log(`Navigating to chat with role ID: ${roleId}`); - ViewManager.I.openBundlesView("ChatPanel", roleId); + + if (transitionConfig) { + this.navigateWithTransition( + "ChatPanel", + roleId, + transitionConfig, + currentPanel + ); + } else { + ViewManager.I.openBundlesView("ChatPanel", roleId); + } } /** * 带过渡动画进入聊天页面 * 从GirlDetailPanel平滑过渡到ChatPanel * + * @param {string} categoryId - 类别ID * @param {number} roleId - 角色ID * @param {any} currentPanel - 当前面板实例(GirlDetailPanel) * * @example * ```typescript - * NavigationManager.Instance.navigateToChatWithTransition(10001, this); + * NavigationManager.Instance.navigateToChatWithTransition("1", 10001, this); * ``` */ public navigateToChatWithTransition( @@ -94,30 +367,24 @@ export class NavigationManager { return; } - console.log(`Navigating to chat with transition, role ID: ${roleId}`); + const navigationData = { + categoryId: categoryId, + roleId: roleId, + withSlideTransition: true, + }; - // 打开ChatPanel,同时标记需要执行滑入动画 - ViewManager.I.openBundlesView( + const transitionConfig: PageTransitionConfig = { + incomingTransition: PageTransitionType.SLIDE_RIGHT, + outgoingTransition: PageTransitionType.SLIDE_LEFT, + duration: 0.3, + simultaneous: true, + }; + + this.navigateWithTransition( "ChatPanel", - { - categoryId: categoryId, - roleId: roleId, - withSlideTransition: true, - }, - (chatNode) => { - // ChatPanel打开后,如果有当前面板,执行滑出动画 - if (currentPanel && currentPanel.node && currentPanel.node.isValid) { - UITransitionHelper.slideOutToLeft(currentPanel.node, 0.3, () => { - // 滑出动画完成后关闭原面板 - if ( - currentPanel.onClose && - typeof currentPanel.onClose === "function" - ) { - currentPanel.onClose(); - } - }); - } - } + navigationData, + transitionConfig, + currentPanel ); } @@ -131,14 +398,49 @@ export class NavigationManager { * NavigationManager.Instance.navigateToGirlDetail(10001); * ``` */ - public navigateToGirlDetail(roleId: number): void { + public navigateToGirlDetail(roleId: number): void; + /** + * 进入角色详情页面(带过渡动画) + * + * @param {number} roleId - 角色ID + * @param {PageTransitionConfig} transitionConfig - 过渡动画配置 + * @param {any} currentPanel - 当前面板实例(可选) + * + * @example + * ```typescript + * NavigationManager.Instance.navigateToGirlDetail(10001, + * { incomingTransition: PageTransitionType.SLIDE_RIGHT, outgoingTransition: PageTransitionType.SLIDE_LEFT }, + * this + * ); + * ``` + */ + public navigateToGirlDetail( + roleId: number, + transitionConfig?: PageTransitionConfig, + currentPanel?: any + ): void; + public navigateToGirlDetail( + roleId: number, + transitionConfig?: PageTransitionConfig, + currentPanel?: any + ): void { if (roleId == null || roleId <= 0) { console.warn("Invalid role ID for detail navigation:", roleId); return; } console.log(`Navigating to girl detail with role ID: ${roleId}`); - ViewManager.I.openBundlesView("GirlDetailPanel", roleId); + + if (transitionConfig) { + this.navigateWithTransition( + "GirlDetailPanel", + roleId, + transitionConfig, + currentPanel + ); + } else { + ViewManager.I.openBundlesView("GirlDetailPanel", roleId); + } } /** @@ -184,4 +486,39 @@ export class NavigationManager { // TODO: 实现返回上一页功能 console.log("Go back feature not implemented yet"); } + + /** + * 获取预设的过渡动画配置 + */ + public static getTransitionPresets() { + return { + SLIDE_LEFT_TO_RIGHT: { + incomingTransition: PageTransitionType.SLIDE_RIGHT, + outgoingTransition: PageTransitionType.SLIDE_LEFT, + duration: 0.1, + simultaneous: true, + } as PageTransitionConfig, + + SLIDE_RIGHT_TO_LEFT: { + incomingTransition: PageTransitionType.SLIDE_LEFT, + outgoingTransition: PageTransitionType.SLIDE_RIGHT, + duration: 0.1, + simultaneous: true, + } as PageTransitionConfig, + + SLIDE_OVER: { + incomingTransition: PageTransitionType.SLIDE_RIGHT, + outgoingTransition: PageTransitionType.NONE, + duration: 0.1, + simultaneous: true, + } as PageTransitionConfig, + + SLIDE_UNDER: { + incomingTransition: PageTransitionType.NONE, + outgoingTransition: PageTransitionType.SLIDE_LEFT, + duration: 0.1, + simultaneous: true, + } as PageTransitionConfig, + }; + } } diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index 849a9226..33a53ce3 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -7,6 +7,8 @@ import { instantiate, UITransform, Size, + Vec3, + tween, } from "cc"; import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; @@ -69,10 +71,14 @@ export class GirlDetailPanel extends li_BaseView { openUIDataCT(data) { this.id = data; } - + videoAreaPos; onLoadCT() { super.onLoadCT(); this.imgItemInst.node.active = false; + this.videoAreaPos = this.videoArea.node.getWorldPosition(); + + this.node.scale = Vec3.ZERO; + tween(this.node).to(0.3, { scale: Vec3.ONE }).start(); // 检查 SceneBgVideoLayer 是否可用 if (!this.videoLayer) { @@ -80,7 +86,7 @@ export class GirlDetailPanel extends li_BaseView { } else { console.log("GirlDetailPanel: 成功获取 SceneBgVideoLayer 实例"); // 初始化视频显示位置 - this.initVideoPosition(); + //this.initVideoPosition(); } this.refresh(this.id); @@ -182,16 +188,30 @@ export class GirlDetailPanel extends li_BaseView { ? new Size(this.videoArea.width, this.videoArea.height) : new Size(600, 800); - // 获取 videoArea 的中心位置作为参考节点(使用世界坐标) - const videoAreaPos = this.videoArea - ? this.videoArea.node.getWorldPosition() - : undefined; + // 获取 videoArea 的中心位置,确保使用正确的世界坐标 + const videoAreaPos = this.videoAreaPos; + if (this.videoArea) { + // 获取 videoArea 的世界坐标 + this.videoAreaPos = this.videoArea.node.getWorldPosition(); + + // 也检查 videoLayer 的父节点信息,确保坐标系统一致 + if (this.videoLayer && this.videoLayer.getVideoPlayer()) { + const videoPlayerParent = + this.videoLayer.getVideoPlayer().node.parent; + if (videoPlayerParent) { + const parentWorldPos = videoPlayerParent.getWorldPosition(); + console.log( + `GirlDetailPanel: VideoPlayer 父节点世界位置: (${parentWorldPos.x}, ${parentWorldPos.y}, ${parentWorldPos.z})` + ); + } + } + } // 使用新的统一 playVideo 方法 this.videoLayer.playVideo(firstPath, { loop: true, size: targetSize, - position: videoAreaPos + position: videoAreaPos, }); } @@ -266,7 +286,7 @@ export class GirlDetailPanel extends li_BaseView { // 使用 videoArea 的世界坐标位置 const videoAreaWorldPos = this.videoArea.node.getWorldPosition(); // 视频位置和缩放已在 playVideo 中处理 - this.videoLayer.setVideoScale(1); + //this.videoLayer.setVideoScale(1); console.log( `GirlDetailPanel: 初始化视频世界位置到 (${videoAreaWorldPos.x}, ${videoAreaWorldPos.y})` ); diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts index 94590596..827c6cbb 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts @@ -9,6 +9,7 @@ import { DataManager, DataId } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; import proto from "db://assets/Scripts/proto/proto.pb.js"; import GameRootUI from "../../../Main/Common/GameRootUI"; +import { UITransitionHelper } from "../../utils/UITransitionHelper"; const { ccclass, property } = _decorator; @@ -23,7 +24,13 @@ export class GirlListPanel extends li_BaseView { category: number; openUIDataCT(data) { - this.category = data; + // 支持新的数据格式:既可以是单纯的数字,也可以是包含过渡动画信息的对象 + this.category = + typeof data === "object" && data.category !== undefined + ? data.category + : data; + + const withAnimation = typeof data === "object" && data.withTransition; } onLoadCT() { Utils.parseNode(this.node, this._nodeTab); @@ -69,7 +76,37 @@ export class GirlListPanel extends li_BaseView { GButton.BandClick(this._nodeTab.ReturnBtn, this.Return, this); } Return() { - this.onClose(); - GameRootUI.I.showDefaultView(); + console.log("GirlListPanel: Return button clicked"); + + // 执行同步的过渡动画:GirlListPanel向右滑出,ThemePanel从左滑入 + const duration = 0.1; + let animationsCompleted = 0; + const totalAnimations = 2; + + const onAnimationComplete = (source: string) => { + console.log(`GirlListPanel: Animation completed from ${source}`); + animationsCompleted++; + console.log( + `GirlListPanel: ${animationsCompleted}/${totalAnimations} animations completed` + ); + + if (animationsCompleted >= totalAnimations) { + console.log("GirlListPanel: All animations completed, closing panel"); + // 所有动画完成后关闭当前面板 + this.onClose(); + } + }; + + // 1. GirlListPanel向右滑出 + console.log("GirlListPanel: Starting slideOutToRight animation"); + UITransitionHelper.slideOutToRight(this.node, duration, () => + onAnimationComplete("slideOutToRight") + ); + + // 2. ThemePanel从左侧滑入 + console.log("GirlListPanel: Starting ThemePanel slide_left animation"); + GameRootUI.I.showDefaultViewWithTransition("slide_left", duration, () => + onAnimationComplete("ThemePanel_slide_left") + ); } } diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts index 5e078c6e..74d16741 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts @@ -7,6 +7,8 @@ import { View, Sprite, UITransform, + Vec3, + tween, } from "cc"; import li_BaseView from "../../../Main/Common/li_BaseView"; import Utils from "../../../Main/Common/Utils"; @@ -43,6 +45,9 @@ export class GirlListPopupPanel extends li_BaseView { this.base = data.base; } onLoadCT() { + this.node.scale = Vec3.ZERO; + tween(this.node).to(0.3, { scale: Vec3.ONE }).start(); + Utils.parseNode(this.node, this._nodeTab); this.img = this._nodeTab.img.getComponent(Sprite); this.uitransform = this._nodeTab.Img_Frame.getComponent(UITransform); diff --git a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts index fb2c4100..a6b4ed98 100644 --- a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts @@ -1,4 +1,13 @@ -import { _decorator, Component, Node, Label, UITransform, Sprite } from "cc"; +import { + _decorator, + Component, + Node, + Label, + UITransform, + Sprite, + tween, + Vec3, +} from "cc"; import li_BaseView from "../../../Main/Common/li_BaseView"; import { GButton } from "../../../Main/Common/GButton"; import Utils from "../../../Main/Common/Utils"; @@ -36,6 +45,8 @@ export class PopupGirlDetailPanel extends li_BaseView { this.type = data.type; } onLoadCT() { + this.node.scale = Vec3.ZERO; + tween(this.node).to(0.3, { scale: Vec3.ONE }).start(); Utils.parseNode(this.node, this._nodeTab); this.desc = this._nodeTab.content.getComponent(Label); this.uitransform = this._nodeTab.Img_Frame.getComponent(UITransform); diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 16e82214..ac68acb0 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -12,7 +12,7 @@ import Utils from "db://assets/Scripts/Main/Common/Utils"; import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import { ThemeItem } from "../../uiitems/ThemeItem"; -import { NavigationManager } from "../../manager/NavigationManager"; +import { NavigationManager, PageTransitionType } from "../../manager/NavigationManager"; import { GirlListItem } from "../../uiitems/GirlListItem"; import LanguageUtils from "../../../Main/Common/LanguageUtils"; import { ViewManager } from "../../../Main/Manager/ViewManager"; @@ -90,7 +90,7 @@ export class ThemePanel extends li_BaseView { for (let id of themeIds) { let newNode = instantiate(this.itemInst.node); let item = newNode.getComponent(ThemeItem); - item.refresh(id); + item.refresh(id, this); newNode.active = true; this.cache.push(item); this.content.addChild(newNode); @@ -165,7 +165,8 @@ export class ThemePanel extends li_BaseView { this.recId ) == 0; if (isRelease || isFree) { - NavigationManager.Instance.navigateToGirlDetail(this.recId); + const transitionConfig = NavigationManager.getTransitionPresets().SLIDE_LEFT_TO_RIGHT; + NavigationManager.Instance.navigateToGirlDetail(this.recId, transitionConfig, this); GameRootUI.I.hideDefaultView(); } else { //未解锁 diff --git a/assets/Scripts/chat18x/uiitems/ThemeItem.ts b/assets/Scripts/chat18x/uiitems/ThemeItem.ts index be99af62..cf7bc5ab 100644 --- a/assets/Scripts/chat18x/uiitems/ThemeItem.ts +++ b/assets/Scripts/chat18x/uiitems/ThemeItem.ts @@ -2,7 +2,7 @@ import { _decorator, Component, Label, Node, Sprite, UITransform } from "cc"; import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import Utils from "db://assets/Scripts/Main/Common/Utils"; -import { NavigationManager } from "../manager/NavigationManager"; +import { NavigationManager, PageTransitionType } from "../manager/NavigationManager"; import LanguageUtils from "../../Main/Common/LanguageUtils"; import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; import { DataManager, DataId } from "../data/DataManager"; @@ -29,6 +29,8 @@ export class ThemeItem extends Component { private isLocked: boolean; + private parentPanel: any; + key: string; protected onLoad(): void { Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => { @@ -41,8 +43,9 @@ export class ThemeItem extends Component { }); } - refresh(themeId: number) { + refresh(themeId: number, parentPanel?: any) { this.loading.active = true; + this.parentPanel = parentPanel; // 主题数据 const themeData = DataManager.I.getDataById(DataId.Theme); this.lockImg.node.active = this.lockCover.node.active = @@ -70,6 +73,9 @@ export class ThemeItem extends Component { if (this.isLocked) { return; } - NavigationManager.Instance.navigateToGirlList(this.category); + + // 使用预设的过渡动画配置 + const transitionConfig = NavigationManager.getTransitionPresets().SLIDE_LEFT_TO_RIGHT; + NavigationManager.Instance.navigateToGirlList(this.category, transitionConfig, this.parentPanel); } } diff --git a/assets/Scripts/chat18x/utils/UITransitionHelper.ts b/assets/Scripts/chat18x/utils/UITransitionHelper.ts index 1d0fd14a..96bca323 100644 --- a/assets/Scripts/chat18x/utils/UITransitionHelper.ts +++ b/assets/Scripts/chat18x/utils/UITransitionHelper.ts @@ -4,207 +4,192 @@ const { ccclass, property } = _decorator; /** * UI过渡动画帮助类 - * + * * 提供常用的UI过渡动画效果,如滑入滑出等 - * + * * @author AI Chat System * @version 1.0.0 */ @ccclass("UITransitionHelper") export class UITransitionHelper { - - /** - * 让节点从右侧滑入到原位置 - * - * @param {Node} node - 要执行动画的节点 - * @param {number} duration - 动画持续时间(秒),默认0.3秒 - * @param {Function} callback - 动画完成后的回调函数 - */ - public static slideInFromRight(node: Node, duration: number = 0.3, callback?: () => void): void { - if (!node || !node.isValid) { - console.warn("UITransitionHelper: Invalid node for slideInFromRight"); - return; - } - - const screenWidth = view.getVisibleSize().width; - const originalPosition = node.getPosition(); - - // 设置初始位置为屏幕右侧外 - node.setPosition(screenWidth, originalPosition.y, originalPosition.z); - - // 执行滑入动画 - tween(node) - .to(duration, { position: originalPosition }, { - easing: 'quartOut' - }) - .call(() => { - if (callback) { - callback(); - } - }) - .start(); + /** + * 让节点从右侧滑入到原位置 + * + * @param {Node} node - 要执行动画的节点 + * @param {number} duration - 动画持续时间(秒),默认0.3秒 + * @param {Function} callback - 动画完成后的回调函数 + */ + public static slideInFromRight( + node: Node, + duration: number = 0.1, + callback?: Function + ): void { + if (!node || !node.isValid) { + console.warn("UITransitionHelper: Invalid node for slideInFromRight"); + return; } - /** - * 让节点向左滑出到屏幕外 - * - * @param {Node} node - 要执行动画的节点 - * @param {number} duration - 动画持续时间(秒),默认0.3秒 - * @param {Function} callback - 动画完成后的回调函数 - */ - public static slideOutToLeft(node: Node, duration: number = 0.3, callback?: () => void): void { - if (!node || !node.isValid) { - console.warn("UITransitionHelper: Invalid node for slideOutToLeft"); - return; - } + const screenWidth = view.getVisibleSize().width; + const originalPosition = node.getPosition(); - const screenWidth = view.getVisibleSize().width; - const currentPosition = node.getPosition(); - const targetPosition = new Vec3(-screenWidth, currentPosition.y, currentPosition.z); - - // 执行滑出动画 - tween(node) - .to(duration, { position: targetPosition }, { - easing: 'quartOut' - }) - .call(() => { - if (callback) { - callback(); - } - }) - .start(); + // 设置初始位置为屏幕右侧外 + node.setPosition(screenWidth, originalPosition.y, originalPosition.z); + + // 执行滑入动画 + tween(node) + .to( + duration, + { position: originalPosition }, + { + easing: "linear", + onUpdate: () => { + console.log(node.position); + }, + } + ) + .call(() => { + if (callback) { + callback(); + } + }) + .start(); + } + + /** + * 让节点向左滑出到屏幕外 + * + * @param {Node} node - 要执行动画的节点 + * @param {number} duration - 动画持续时间(秒),默认0.3秒 + * @param {Function} callback - 动画完成后的回调函数 + */ + public static slideOutToLeft( + node: Node, + duration: number = 0.1, + callback?: Function + ): void { + if (!node || !node.isValid) { + console.warn("UITransitionHelper: Invalid node for slideOutToLeft"); + return; } - /** - * 让节点从左侧滑入到原位置 - * - * @param {Node} node - 要执行动画的节点 - * @param {number} duration - 动画持续时间(秒),默认0.3秒 - * @param {Function} callback - 动画完成后的回调函数 - */ - public static slideInFromLeft(node: Node, duration: number = 0.3, callback?: () => void): void { - if (!node || !node.isValid) { - console.warn("UITransitionHelper: Invalid node for slideInFromLeft"); - return; - } + const screenWidth = view.getVisibleSize().width; + const currentPosition = node.getPosition(); + const targetPosition = new Vec3( + -screenWidth, + currentPosition.y, + currentPosition.z + ); - const screenWidth = view.getVisibleSize().width; - const originalPosition = node.getPosition(); - - // 设置初始位置为屏幕左侧外 - node.setPosition(-screenWidth, originalPosition.y, originalPosition.z); - - // 执行滑入动画 - tween(node) - .to(duration, { position: originalPosition }, { - easing: 'quartOut' - }) - .call(() => { - if (callback) { - callback(); - } - }) - .start(); + // 执行滑出动画 + tween(node) + .to( + duration, + { position: targetPosition }, + { + easing: "linear", + } + ) + .call(() => { + if (callback) { + callback(); + } + }) + .start(); + } + + /** + * 让节点从左侧滑入到原位置 + * + * @param {Node} node - 要执行动画的节点 + * @param {number} duration - 动画持续时间(秒),默认0.3秒 + * @param {Function} callback - 动画完成后的回调函数 + */ + public static slideInFromLeft( + node: Node, + duration: number = 0.1, + callback?: Function + ): void { + if (!node || !node.isValid) { + console.warn("UITransitionHelper: Invalid node for slideInFromLeft"); + return; } - /** - * 让节点向右滑出到屏幕外 - * - * @param {Node} node - 要执行动画的节点 - * @param {number} duration - 动画持续时间(秒),默认0.3秒 - * @param {Function} callback - 动画完成后的回调函数 - */ - public static slideOutToRight(node: Node, duration: number = 0.3, callback?: () => void): void { - if (!node || !node.isValid) { - console.warn("UITransitionHelper: Invalid node for slideOutToRight"); - return; - } + const screenWidth = view.getVisibleSize().width; + const originalPosition = node.getPosition(); - const screenWidth = view.getVisibleSize().width; - const currentPosition = node.getPosition(); - const targetPosition = new Vec3(screenWidth, currentPosition.y, currentPosition.z); - - // 执行滑出动画 - tween(node) - .to(duration, { position: targetPosition }, { - easing: 'quartOut' - }) - .call(() => { - if (callback) { - callback(); - } - }) - .start(); + // 设置初始位置为屏幕左侧外 + node.setPosition(-screenWidth, originalPosition.y, originalPosition.z); + + // 执行滑入动画 + tween(node) + .to( + duration, + { position: originalPosition }, + { + easing: "linear", + } + ) + .call(() => { + if (callback) { + callback(); + } + }) + .start(); + } + + /** + * 让节点向右滑出到屏幕外 + * + * @param {Node} node - 要执行动画的节点 + * @param {number} duration - 动画持续时间(秒),默认0.3秒 + * @param {Function} callback - 动画完成后的回调函数 + */ + public static slideOutToRight( + node: Node, + duration: number = 0.1, + callback?: Function + ): void { + if (!node || !node.isValid) { + console.warn("UITransitionHelper: Invalid node for slideOutToRight"); + return; } - /** - * 淡入动画 - * - * @param {Node} node - 要执行动画的节点 - * @param {number} duration - 动画持续时间(秒),默认0.3秒 - * @param {Function} callback - 动画完成后的回调函数 - */ - public static fadeIn(node: Node, duration: number = 0.3, callback?: () => void): void { - if (!node || !node.isValid) { - console.warn("UITransitionHelper: Invalid node for fadeIn"); - return; - } + const screenWidth = view.getVisibleSize().width; + const currentPosition = node.getPosition(); + const targetPosition = new Vec3( + screenWidth, + currentPosition.y, + currentPosition.z + ); - // 设置初始透明度为0 - if (node.setOpacity) { - node.setOpacity(0); + // 执行滑出动画 + tween(node) + .to( + duration, + { position: targetPosition }, + { + easing: "linear", } - - // 执行淡入动画 - tween(node) - .to(duration, { opacity: 255 }, { - easing: 'quartOut' - }) - .call(() => { - if (callback) { - callback(); - } - }) - .start(); + ) + .call(() => { + if (callback) { + callback(); + } + }) + .start(); + } + + /** + * 停止节点上的所有动画 + * + * @param {Node} node - 要停止动画的节点 + */ + public static stopAllTweens(node: Node): void { + if (!node || !node.isValid) { + console.warn("UITransitionHelper: Invalid node for stopAllTweens"); + return; } - /** - * 淡出动画 - * - * @param {Node} node - 要执行动画的节点 - * @param {number} duration - 动画持续时间(秒),默认0.3秒 - * @param {Function} callback - 动画完成后的回调函数 - */ - public static fadeOut(node: Node, duration: number = 0.3, callback?: () => void): void { - if (!node || !node.isValid) { - console.warn("UITransitionHelper: Invalid node for fadeOut"); - return; - } - - // 执行淡出动画 - tween(node) - .to(duration, { opacity: 0 }, { - easing: 'quartOut' - }) - .call(() => { - if (callback) { - callback(); - } - }) - .start(); - } - - /** - * 停止节点上的所有动画 - * - * @param {Node} node - 要停止动画的节点 - */ - public static stopAllTweens(node: Node): void { - if (!node || !node.isValid) { - console.warn("UITransitionHelper: Invalid node for stopAllTweens"); - return; - } - - tween(node).stop(); - } -} \ No newline at end of file + tween(node).stop(); + } +} diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index 41bf9161..07b20d23 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -22,32 +22,32 @@ "__id__": 2 }, { - "__id__": 210 + "__id__": 214 }, { - "__id__": 79 + "__id__": 83 }, { - "__id__": 103 + "__id__": 107 }, { - "__id__": 288 + "__id__": 292 } ], "_active": true, "_components": [ - { - "__id__": 318 - }, - { - "__id__": 320 - }, { "__id__": 322 + }, + { + "__id__": 324 + }, + { + "__id__": 326 } ], "_prefab": { - "__id__": 324 + "__id__": 328 }, "_lpos": { "__type__": "cc.Vec3", @@ -94,32 +94,32 @@ "__id__": 11 }, { - "__id__": 55 + "__id__": 59 }, { - "__id__": 61 + "__id__": 65 }, { - "__id__": 127 + "__id__": 131 }, { - "__id__": 139 + "__id__": 143 } ], "_active": true, "_components": [ - { - "__id__": 203 - }, - { - "__id__": 205 - }, { "__id__": 207 + }, + { + "__id__": 209 + }, + { + "__id__": 211 } ], "_prefab": { - "__id__": 209 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -341,26 +341,26 @@ "__id__": 18 }, { - "__id__": 29 + "__id__": 33 }, { - "__id__": 37 + "__id__": 41 } ], "_active": true, "_components": [ - { - "__id__": 48 - }, - { - "__id__": 50 - }, { "__id__": 52 + }, + { + "__id__": 54 + }, + { + "__id__": 56 } ], "_prefab": { - "__id__": 54 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -535,28 +535,79 @@ "_parent": { "__id__": 11 }, + "_children": [ + { + "__id__": 19 + } + ], + "_active": true, + "_components": [ + { + "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 30 + } + ], + "_prefab": { + "__id__": 32 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -423, + "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": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 18 + }, "_children": [], "_active": true, "_components": [ { - "__id__": 19 + "__id__": 20 }, { - "__id__": 21 - }, - { - "__id__": 23 - }, - { - "__id__": 26 + "__id__": 22 } ], "_prefab": { - "__id__": 28 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", - "x": -472.5, + "x": 0, "y": 0, "z": 0 }, @@ -589,11 +640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -609,7 +660,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3803v9JUZJmJXmn0xN+Spo" + "fileId": "60tVyg1bxOdL3VqeL+UH9E" }, { "__type__": "cc.Sprite", @@ -617,11 +668,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 23 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -639,7 +690,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -654,7 +705,48 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8bZKRY3apEjqLpuSyU2Q5n" + "fileId": "7eYP/siIRF4YX62ZMNcifv" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "53LvCd2ghDnoifVdWjaJ8m", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 130, + "height": 130 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3803v9JUZJmJXmn0xN+Spo" }, { "__type__": "cc.Button", @@ -666,11 +758,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 28 }, "clickEvents": [ { - "__id__": 25 + "__id__": 29 } ], "_interactable": true, @@ -738,13 +830,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 31 }, "_alignFlags": 9, "_target": null, "_left": 52, "_right": 0, - "_top": 46.400000000000006, + "_top": 9.400000000000006, "_bottom": 30, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -788,18 +880,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 30 - }, - { - "__id__": 32 - }, { "__id__": 34 + }, + { + "__id__": 36 + }, + { + "__id__": 38 } ], "_prefab": { - "__id__": 36 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -836,11 +928,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -864,11 +956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -935,11 +1027,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 39 }, "_alignFlags": 20, "_target": null, @@ -989,21 +1081,21 @@ "_children": [], "_active": false, "_components": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, { "__id__": 42 }, { - "__id__": 45 + "__id__": 44 + }, + { + "__id__": 46 + }, + { + "__id__": 49 } ], "_prefab": { - "__id__": 47 + "__id__": 51 }, "_lpos": { "__type__": "cc.Vec3", @@ -1040,11 +1132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 43 }, "_contentSize": { "__type__": "cc.Size", @@ -1068,11 +1160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 45 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1113,15 +1205,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 47 }, "clickEvents": [ { - "__id__": 44 + "__id__": 48 } ], "_interactable": true, @@ -1161,7 +1253,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 37 + "__id__": 41 }, "_id": "" }, @@ -1185,11 +1277,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 50 }, "_alignFlags": 9, "_target": null, @@ -1238,7 +1330,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 53 }, "_contentSize": { "__type__": "cc.Size", @@ -1266,7 +1358,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 51 + "__id__": 55 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1311,7 +1403,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 57 }, "_alignFlags": 41, "_target": null, @@ -1362,14 +1454,14 @@ "_active": true, "_components": [ { - "__id__": 56 + "__id__": 60 }, { - "__id__": 58 + "__id__": 62 } ], "_prefab": { - "__id__": 60 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1406,11 +1498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1434,11 +1526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1496,17 +1588,11 @@ }, "_children": [ { - "__id__": 62 + "__id__": 66 } ], "_active": true, "_components": [ - { - "__id__": 68 - }, - { - "__id__": 70 - }, { "__id__": 72 }, @@ -1515,10 +1601,16 @@ }, { "__id__": 76 + }, + { + "__id__": 78 + }, + { + "__id__": 80 } ], "_prefab": { - "__id__": 126 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", @@ -1555,20 +1647,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 61 + "__id__": 65 }, "_children": [], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 67 }, { - "__id__": 65 + "__id__": 69 } ], "_prefab": { - "__id__": 67 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -1605,11 +1697,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 68 }, "_contentSize": { "__type__": "cc.Size", @@ -1633,11 +1725,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 70 }, "_alignFlags": 36, "_target": null, @@ -1682,11 +1774,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1710,11 +1802,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 75 }, "_alignFlags": 45, "_target": null, @@ -1746,11 +1838,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 77 }, "_type": 0, "_inverted": false, @@ -1768,11 +1860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1814,20 +1906,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 81 }, "initPos": { - "__id__": 62 + "__id__": 66 }, "lBubble": { - "__id__": 78 + "__id__": 82 }, "rBubble": { - "__id__": 102 + "__id__": 106 }, "_id": "" }, @@ -1841,20 +1933,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 105 }, "bg": { - "__id__": 81 + "__id__": 85 }, "content": { - "__id__": 91 + "__id__": 95 }, "contentT": { - "__id__": 89 + "__id__": 93 }, "_id": "" }, @@ -1868,26 +1960,26 @@ }, "_children": [ { - "__id__": 80 + "__id__": 84 }, { - "__id__": 88 + "__id__": 92 } ], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 100 }, { - "__id__": 98 + "__id__": 102 }, { - "__id__": 78 + "__id__": 82 } ], "_prefab": { - "__id__": 100 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -1924,23 +2016,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 79 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 81 - }, - { - "__id__": 83 - }, { "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 } ], "_prefab": { - "__id__": 87 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1977,11 +2069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 86 }, "_contentSize": { "__type__": "cc.Size", @@ -2005,11 +2097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 88 }, "_alignFlags": 12, "_target": null, @@ -2041,11 +2133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 90 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2099,23 +2191,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 79 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 89 - }, - { - "__id__": 91 - }, { "__id__": 93 + }, + { + "__id__": 95 + }, + { + "__id__": 97 } ], "_prefab": { - "__id__": 95 + "__id__": 99 }, "_lpos": { "__type__": "cc.Vec3", @@ -2152,11 +2244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -2180,11 +2272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 96 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2248,11 +2340,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 98 }, "_alignFlags": 12, "_target": null, @@ -2297,11 +2389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -2325,11 +2417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 103 }, "_alignFlags": 8, "_target": null, @@ -2378,20 +2470,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 129 }, "bg": { - "__id__": 105 + "__id__": 109 }, "content": { - "__id__": 115 + "__id__": 119 }, "contentT": { - "__id__": 113 + "__id__": 117 }, "_id": "" }, @@ -2405,26 +2497,26 @@ }, "_children": [ { - "__id__": 104 + "__id__": 108 }, { - "__id__": 112 + "__id__": 116 } ], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 124 }, { - "__id__": 122 + "__id__": 126 }, { - "__id__": 102 + "__id__": 106 } ], "_prefab": { - "__id__": 124 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", @@ -2461,23 +2553,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 107 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, { "__id__": 109 + }, + { + "__id__": 111 + }, + { + "__id__": 113 } ], "_prefab": { - "__id__": 111 + "__id__": 115 }, "_lpos": { "__type__": "cc.Vec3", @@ -2514,11 +2606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 110 }, "_contentSize": { "__type__": "cc.Size", @@ -2542,11 +2634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 112 }, "_alignFlags": 36, "_target": null, @@ -2578,11 +2670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 114 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2636,23 +2728,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 107 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 113 - }, - { - "__id__": 115 - }, { "__id__": 117 + }, + { + "__id__": 119 + }, + { + "__id__": 121 } ], "_prefab": { - "__id__": 119 + "__id__": 123 }, "_lpos": { "__type__": "cc.Vec3", @@ -2689,11 +2781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 118 }, "_contentSize": { "__type__": "cc.Size", @@ -2717,11 +2809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 120 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2785,11 +2877,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 122 }, "_alignFlags": 36, "_target": null, @@ -2834,11 +2926,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -2862,11 +2954,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 127 }, "_alignFlags": 32, "_target": null, @@ -2932,20 +3024,20 @@ }, "_children": [ { - "__id__": 128 + "__id__": 132 } ], "_active": true, "_components": [ { - "__id__": 134 + "__id__": 138 }, { - "__id__": 136 + "__id__": 140 } ], "_prefab": { - "__id__": 138 + "__id__": 142 }, "_lpos": { "__type__": "cc.Vec3", @@ -2982,20 +3074,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 127 + "__id__": 131 }, "_children": [], "_active": false, "_components": [ { - "__id__": 129 + "__id__": 133 }, { - "__id__": 131 + "__id__": 135 } ], "_prefab": { - "__id__": 133 + "__id__": 137 }, "_lpos": { "__type__": "cc.Vec3", @@ -3032,11 +3124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 134 }, "_contentSize": { "__type__": "cc.Size", @@ -3060,11 +3152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 136 }, "_resourceType": 1, "_remoteURL": "", @@ -3103,11 +3195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -3131,11 +3223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 141 }, "_alignFlags": 45, "_target": null, @@ -3184,32 +3276,32 @@ }, "_children": [ { - "__id__": 140 + "__id__": 144 }, { - "__id__": 148 + "__id__": 152 }, { - "__id__": 156 + "__id__": 160 }, { - "__id__": 181 + "__id__": 185 } ], "_active": true, "_components": [ - { - "__id__": 196 - }, - { - "__id__": 198 - }, { "__id__": 200 + }, + { + "__id__": 202 + }, + { + "__id__": 204 } ], "_prefab": { - "__id__": 202 + "__id__": 206 }, "_lpos": { "__type__": "cc.Vec3", @@ -3246,23 +3338,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 143 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 141 - }, - { - "__id__": 143 - }, { "__id__": 145 + }, + { + "__id__": 147 + }, + { + "__id__": 149 } ], "_prefab": { - "__id__": 147 + "__id__": 151 }, "_lpos": { "__type__": "cc.Vec3", @@ -3299,11 +3391,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 146 }, "_contentSize": { "__type__": "cc.Size", @@ -3327,11 +3419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 148 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3372,11 +3464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 150 }, "_alignFlags": 40, "_target": null, @@ -3421,23 +3513,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 143 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 149 - }, - { - "__id__": 151 - }, { "__id__": 153 + }, + { + "__id__": 155 + }, + { + "__id__": 157 } ], "_prefab": { - "__id__": 155 + "__id__": 159 }, "_lpos": { "__type__": "cc.Vec3", @@ -3474,11 +3566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 154 }, "_contentSize": { "__type__": "cc.Size", @@ -3502,11 +3594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 156 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3547,11 +3639,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 158 }, "_alignFlags": 40, "_target": null, @@ -3596,33 +3688,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 143 }, "_children": [ { - "__id__": 157 + "__id__": 161 }, { - "__id__": 163 + "__id__": 167 } ], "_active": true, "_components": [ - { - "__id__": 171 - }, - { - "__id__": 173 - }, { "__id__": 175 }, { - "__id__": 178 + "__id__": 177 + }, + { + "__id__": 179 + }, + { + "__id__": 182 } ], "_prefab": { - "__id__": 180 + "__id__": 184 }, "_lpos": { "__type__": "cc.Vec3", @@ -3659,20 +3751,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 156 + "__id__": 160 }, "_children": [], "_active": false, "_components": [ { - "__id__": 158 + "__id__": 162 }, { - "__id__": 160 + "__id__": 164 } ], "_prefab": { - "__id__": 162 + "__id__": 166 }, "_lpos": { "__type__": "cc.Vec3", @@ -3709,11 +3801,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 163 }, "_contentSize": { "__type__": "cc.Size", @@ -3737,11 +3829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 165 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3818,23 +3910,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 156 + "__id__": 160 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 164 - }, - { - "__id__": 166 - }, { "__id__": 168 + }, + { + "__id__": 170 + }, + { + "__id__": 172 } ], "_prefab": { - "__id__": 170 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -3871,11 +3963,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 169 }, "_contentSize": { "__type__": "cc.Size", @@ -3899,11 +3991,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 171 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3967,11 +4059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 173 }, "languageKey": "chatpanel.inputplaceholder", "defaultText": "", @@ -4001,11 +4093,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 176 }, "_contentSize": { "__type__": "cc.Size", @@ -4029,11 +4121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 160 }, "_enabled": false, "__prefab": { - "__id__": 174 + "__id__": 178 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4074,25 +4166,25 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 180 }, "editingDidBegan": [], "textChanged": [], "editingDidEnded": [], "editingReturn": [ { - "__id__": 177 + "__id__": 181 } ], "_textLabel": { - "__id__": 160 + "__id__": 164 }, "_placeholderLabel": { - "__id__": 166 + "__id__": 170 }, "_returnType": 0, "_string": "", @@ -4126,11 +4218,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 183 }, "_alignFlags": 44, "_target": null, @@ -4175,27 +4267,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 143 }, "_children": [ { - "__id__": 182 + "__id__": 186 } ], "_active": true, "_components": [ - { - "__id__": 188 - }, - { - "__id__": 190 - }, { "__id__": 192 + }, + { + "__id__": 194 + }, + { + "__id__": 196 } ], "_prefab": { - "__id__": 195 + "__id__": 199 }, "_lpos": { "__type__": "cc.Vec3", @@ -4232,20 +4324,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 181 + "__id__": 185 }, "_children": [], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 187 }, { - "__id__": 185 + "__id__": 189 } ], "_prefab": { - "__id__": 187 + "__id__": 191 }, "_lpos": { "__type__": "cc.Vec3", @@ -4282,11 +4374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", @@ -4310,11 +4402,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 190 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4394,11 +4486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 193 }, "_contentSize": { "__type__": "cc.Size", @@ -4422,11 +4514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 195 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4467,19 +4559,19 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 197 }, "clickEvents": [ { - "__id__": 194 + "__id__": 198 } ], "_interactable": true, - "_transition": 2, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 214, @@ -4525,9 +4617,9 @@ "__expectedType__": "cc.SpriteFrame" }, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": { - "__id__": 181 + "__id__": 185 }, "_id": "" }, @@ -4564,11 +4656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -4592,11 +4684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 143 }, "_enabled": false, "__prefab": { - "__id__": 199 + "__id__": 203 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4637,11 +4729,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 205 }, "_alignFlags": 44, "_target": null, @@ -4690,7 +4782,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 208 }, "_contentSize": { "__type__": "cc.Size", @@ -4718,7 +4810,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 206 + "__id__": 210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4763,7 +4855,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 212 }, "_alignFlags": 45, "_target": null, @@ -4812,23 +4904,17 @@ }, "_children": [ { - "__id__": 211 + "__id__": 215 }, { - "__id__": 219 + "__id__": 223 }, { - "__id__": 248 + "__id__": 252 } ], "_active": true, "_components": [ - { - "__id__": 277 - }, - { - "__id__": 279 - }, { "__id__": 281 }, @@ -4837,10 +4923,16 @@ }, { "__id__": 285 + }, + { + "__id__": 287 + }, + { + "__id__": 289 } ], "_prefab": { - "__id__": 287 + "__id__": 291 }, "_lpos": { "__type__": "cc.Vec3", @@ -4877,23 +4969,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 210 + "__id__": 214 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 212 - }, - { - "__id__": 214 - }, { "__id__": 216 + }, + { + "__id__": 218 + }, + { + "__id__": 220 } ], "_prefab": { - "__id__": 218 + "__id__": 222 }, "_lpos": { "__type__": "cc.Vec3", @@ -4930,11 +5022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -4958,11 +5050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 219 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5026,11 +5118,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 221 }, "languageKey": "chatpanel.paytotalk.desc", "defaultText": "", @@ -5060,36 +5152,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 210 + "__id__": 214 }, "_children": [ { - "__id__": 220 + "__id__": 224 }, { - "__id__": 226 + "__id__": 230 }, { - "__id__": 232 + "__id__": 236 } ], "_active": true, "_components": [ - { - "__id__": 238 - }, - { - "__id__": 240 - }, { "__id__": 242 }, { - "__id__": 245 + "__id__": 244 + }, + { + "__id__": 246 + }, + { + "__id__": 249 } ], "_prefab": { - "__id__": 247 + "__id__": 251 }, "_lpos": { "__type__": "cc.Vec3", @@ -5126,20 +5218,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 219 + "__id__": 223 }, "_children": [], "_active": true, "_components": [ { - "__id__": 221 + "__id__": 225 }, { - "__id__": 223 + "__id__": 227 } ], "_prefab": { - "__id__": 225 + "__id__": 229 }, "_lpos": { "__type__": "cc.Vec3", @@ -5176,11 +5268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 226 }, "_contentSize": { "__type__": "cc.Size", @@ -5204,11 +5296,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 228 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5288,20 +5380,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 219 + "__id__": 223 }, "_children": [], "_active": true, "_components": [ { - "__id__": 227 + "__id__": 231 }, { - "__id__": 229 + "__id__": 233 } ], "_prefab": { - "__id__": 231 + "__id__": 235 }, "_lpos": { "__type__": "cc.Vec3", @@ -5338,11 +5430,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 230 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 232 }, "_contentSize": { "__type__": "cc.Size", @@ -5366,11 +5458,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 230 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 234 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5424,20 +5516,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 219 + "__id__": 223 }, "_children": [], "_active": true, "_components": [ { - "__id__": 233 + "__id__": 237 }, { - "__id__": 235 + "__id__": 239 } ], "_prefab": { - "__id__": 237 + "__id__": 241 }, "_lpos": { "__type__": "cc.Vec3", @@ -5474,11 +5566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 238 }, "_contentSize": { "__type__": "cc.Size", @@ -5502,11 +5594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 240 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5586,11 +5678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 243 }, "_contentSize": { "__type__": "cc.Size", @@ -5614,11 +5706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 245 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5659,19 +5751,19 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 247 }, "clickEvents": [ { - "__id__": 244 + "__id__": 248 } ], "_interactable": true, - "_transition": 1, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -5705,9 +5797,9 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": { - "__id__": 219 + "__id__": 223 }, "_id": "" }, @@ -5718,7 +5810,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 210 + "__id__": 214 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -5731,11 +5823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 250 }, "_alignFlags": 16, "_target": null, @@ -5780,36 +5872,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 210 + "__id__": 214 }, "_children": [ { - "__id__": 249 + "__id__": 253 }, { - "__id__": 255 + "__id__": 259 }, { - "__id__": 261 + "__id__": 265 } ], "_active": true, "_components": [ - { - "__id__": 267 - }, - { - "__id__": 269 - }, { "__id__": 271 }, { - "__id__": 274 + "__id__": 273 + }, + { + "__id__": 275 + }, + { + "__id__": 278 } ], "_prefab": { - "__id__": 276 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -5846,20 +5938,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 252 }, "_children": [], "_active": true, "_components": [ { - "__id__": 250 + "__id__": 254 }, { - "__id__": 252 + "__id__": 256 } ], "_prefab": { - "__id__": 254 + "__id__": 258 }, "_lpos": { "__type__": "cc.Vec3", @@ -5896,11 +5988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 255 }, "_contentSize": { "__type__": "cc.Size", @@ -5924,11 +6016,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 257 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6008,20 +6100,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 252 }, "_children": [], "_active": true, "_components": [ { - "__id__": 256 + "__id__": 260 }, { - "__id__": 258 + "__id__": 262 } ], "_prefab": { - "__id__": 260 + "__id__": 264 }, "_lpos": { "__type__": "cc.Vec3", @@ -6058,11 +6150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 261 }, "_contentSize": { "__type__": "cc.Size", @@ -6086,11 +6178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 263 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6170,20 +6262,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 252 }, "_children": [], "_active": true, "_components": [ { - "__id__": 262 + "__id__": 266 }, { - "__id__": 264 + "__id__": 268 } ], "_prefab": { - "__id__": 266 + "__id__": 270 }, "_lpos": { "__type__": "cc.Vec3", @@ -6220,11 +6312,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 261 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 267 }, "_contentSize": { "__type__": "cc.Size", @@ -6248,11 +6340,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 261 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 269 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6306,11 +6398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -6334,11 +6426,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 274 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6379,19 +6471,19 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 276 }, "clickEvents": [ { - "__id__": 273 + "__id__": 277 } ], "_interactable": true, - "_transition": 1, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -6425,9 +6517,9 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": { - "__id__": 248 + "__id__": 252 }, "_id": "" }, @@ -6438,7 +6530,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 210 + "__id__": 214 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -6451,11 +6543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 279 }, "_alignFlags": 16, "_target": null, @@ -6500,11 +6592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 278 + "__id__": 282 }, "_contentSize": { "__type__": "cc.Size", @@ -6528,11 +6620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 284 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6573,11 +6665,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 286 }, "_alignFlags": 40, "_target": null, @@ -6609,23 +6701,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 288 }, "timeLabel": { - "__id__": 223 + "__id__": 227 }, "timeBtnLabel": { - "__id__": 235 + "__id__": 239 }, "vipLabel": { - "__id__": 252 + "__id__": 256 }, "vipBtnLabel": { - "__id__": 258 + "__id__": 262 }, "_id": "" }, @@ -6639,11 +6731,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 290 }, "_opacity": 255, "_id": "" @@ -6675,20 +6767,20 @@ }, "_children": [ { - "__id__": 289 + "__id__": 293 } ], "_active": true, "_components": [ { - "__id__": 313 + "__id__": 317 }, { - "__id__": 315 + "__id__": 319 } ], "_prefab": { - "__id__": 317 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -6725,24 +6817,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 288 + "__id__": 292 }, "_children": [ { - "__id__": 290 + "__id__": 294 } ], "_active": true, "_components": [ { - "__id__": 308 + "__id__": 312 }, { - "__id__": 310 + "__id__": 314 } ], "_prefab": { - "__id__": 312 + "__id__": 316 }, "_lpos": { "__type__": "cc.Vec3", @@ -6779,27 +6871,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 289 + "__id__": 293 }, "_children": [ { - "__id__": 291 + "__id__": 295 } ], "_active": true, "_components": [ - { - "__id__": 301 - }, - { - "__id__": 303 - }, { "__id__": 305 + }, + { + "__id__": 307 + }, + { + "__id__": 309 } ], "_prefab": { - "__id__": 307 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -6836,26 +6928,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 294 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 292 - }, - { - "__id__": 294 - }, { "__id__": 296 }, { "__id__": 298 + }, + { + "__id__": 300 + }, + { + "__id__": 302 } ], "_prefab": { - "__id__": 300 + "__id__": 304 }, "_lpos": { "__type__": "cc.Vec3", @@ -6892,11 +6984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 295 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 297 }, "_contentSize": { "__type__": "cc.Size", @@ -6920,11 +7012,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 295 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 299 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6962,11 +7054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 295 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 301 }, "_alignFlags": 12, "_target": null, @@ -6998,11 +7090,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 295 }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 303 }, "clickEvents": [], "_interactable": true, @@ -7067,11 +7159,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 294 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 306 }, "_contentSize": { "__type__": "cc.Size", @@ -7095,11 +7187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 294 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 308 }, "_type": 3, "_inverted": false, @@ -7117,11 +7209,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 294 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 310 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7175,11 +7267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 313 }, "_contentSize": { "__type__": "cc.Size", @@ -7203,11 +7295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 315 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7261,11 +7353,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 318 }, "_contentSize": { "__type__": "cc.Size", @@ -7289,14 +7381,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 320 }, "image": { - "__id__": 294 + "__id__": 298 }, "_id": "" }, @@ -7327,7 +7419,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -7355,7 +7447,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 325 }, "_alignFlags": 45, "_target": null, @@ -7391,26 +7483,26 @@ }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 327 }, "m_rootNode": null, "payToTalkPanel": { - "__id__": 283 + "__id__": 287 }, "editBox": { - "__id__": 175 + "__id__": 179 }, "girlName": { - "__id__": 32 + "__id__": 36 }, "videoArea": { - "__id__": 134 + "__id__": 138 }, "layout": { - "__id__": 76 + "__id__": 80 }, "popUpImage": { - "__id__": 315 + "__id__": 319 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index b95b07ac..b4c0d48f 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -2969,7 +2969,7 @@ } ], "_interactable": true, - "_transition": 1, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -3003,7 +3003,7 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": { "__id__": 98 }, @@ -4172,8 +4172,6 @@ "__id__": 0 }, "fileId": "6a2CN7fWtBcrzN10b5jxf2", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -4730,8 +4728,6 @@ "__id__": 0 }, "fileId": "10g5cCQelOxZynS+Tp8j5r", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6429,8 +6425,6 @@ "__id__": 0 }, "fileId": "33s3MVJE1MP4K1OMcHeRR6", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6597,8 +6591,6 @@ "__id__": 0 }, "fileId": "93dAiS3fFNcbPNEaVTnY6H", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -8676,7 +8668,7 @@ }, "clickEvents": [], "_interactable": true, - "_transition": 0, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -8710,7 +8702,7 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.95, "_target": { "__id__": 304 }, @@ -9106,7 +9098,7 @@ } ], "_interactable": true, - "_transition": 1, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -9140,7 +9132,7 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": { "__id__": 391 }, diff --git a/assets/bundles/Chat18x/GirlListPanel.prefab b/assets/bundles/Chat18x/GirlListPanel.prefab index 28d10cd6..29ae7f4b 100644 --- a/assets/bundles/Chat18x/GirlListPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPanel.prefab @@ -4158,7 +4158,7 @@ } ], "_interactable": true, - "_transition": 0, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -4192,7 +4192,7 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": null, "_id": "" }, diff --git a/assets/bundles/Girls/10001/avatar/10001_avatar.png b/assets/bundles/Girls/10001/avatar/10001_avatar.png index b7d3a897..4e2936df 100644 Binary files a/assets/bundles/Girls/10001/avatar/10001_avatar.png and b/assets/bundles/Girls/10001/avatar/10001_avatar.png differ diff --git a/assets/bundles/Girls/10001/avatar/10001_avatar.png.meta b/assets/bundles/Girls/10001/avatar/10001_avatar.png.meta index 2ce2fb76..dccd450a 100644 --- a/assets/bundles/Girls/10001/avatar/10001_avatar.png.meta +++ b/assets/bundles/Girls/10001/avatar/10001_avatar.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -221, 0, - 125, - -125, + 221, + -221, 0, - -125, - 125, + -221, + 221, 0, - 125, - 125, + 221, + 221, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, 0, - 250, + 442, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -125, - -125, + -221, + -221, 0 ], "maxPos": [ - 125, - 125, + 221, + 221, 0 ] }, diff --git a/assets/bundles/Girls/10002/avatar/10002_avatar.png b/assets/bundles/Girls/10002/avatar/10002_avatar.png index 6c161008..38216dd2 100644 Binary files a/assets/bundles/Girls/10002/avatar/10002_avatar.png and b/assets/bundles/Girls/10002/avatar/10002_avatar.png differ diff --git a/assets/bundles/Girls/10002/avatar/10002_avatar.png.meta b/assets/bundles/Girls/10002/avatar/10002_avatar.png.meta index 1303117e..147be451 100644 --- a/assets/bundles/Girls/10002/avatar/10002_avatar.png.meta +++ b/assets/bundles/Girls/10002/avatar/10002_avatar.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 441, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -220.5, + -221, 0, - 125, - -125, + 220.5, + -221, 0, - -125, - 125, + -220.5, + 221, 0, - 125, - 125, + 220.5, + 221, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 441, + 442, 0, 0, - 250, + 441, 0 ], "nuv": [ 0, 0, - 1, + 0.997737556561086, 0, 0, 1, - 1, + 0.997737556561086, 1 ], "minPos": [ - -125, - -125, + -220.5, + -221, 0 ], "maxPos": [ - 125, - 125, + 220.5, + 221, 0 ] }, @@ -127,7 +127,7 @@ }, "userData": { "type": "sprite-frame", - "hasAlpha": false, + "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, "redirect": "037ad634-397e-4d22-bd90-063654461da8@6c48a" } diff --git a/assets/bundles/Girls/10003/avatar/10003_avatar.png b/assets/bundles/Girls/10003/avatar/10003_avatar.png index ccc348fe..fae96b73 100644 Binary files a/assets/bundles/Girls/10003/avatar/10003_avatar.png and b/assets/bundles/Girls/10003/avatar/10003_avatar.png differ diff --git a/assets/bundles/Girls/10003/avatar/10003_avatar.png.meta b/assets/bundles/Girls/10003/avatar/10003_avatar.png.meta index a0ada9b8..ba377d43 100644 --- a/assets/bundles/Girls/10003/avatar/10003_avatar.png.meta +++ b/assets/bundles/Girls/10003/avatar/10003_avatar.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -221, 0, - 125, - -125, + 221, + -221, 0, - -125, - 125, + -221, + 221, 0, - 125, - 125, + 221, + 221, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, 0, - 250, + 442, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -125, - -125, + -221, + -221, 0 ], "maxPos": [ - 125, - 125, + 221, + 221, 0 ] }, diff --git a/assets/bundles/Girls/10004/avatar/10004_avatar.png b/assets/bundles/Girls/10004/avatar/10004_avatar.png index a2656e95..9c3629b0 100644 Binary files a/assets/bundles/Girls/10004/avatar/10004_avatar.png and b/assets/bundles/Girls/10004/avatar/10004_avatar.png differ diff --git a/assets/bundles/Girls/10004/avatar/10004_avatar.png.meta b/assets/bundles/Girls/10004/avatar/10004_avatar.png.meta index 26822c31..0329182e 100644 --- a/assets/bundles/Girls/10004/avatar/10004_avatar.png.meta +++ b/assets/bundles/Girls/10004/avatar/10004_avatar.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -221, 0, - 125, - -125, + 221, + -221, 0, - -125, - 125, + -221, + 221, 0, - 125, - 125, + 221, + 221, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, 0, - 250, + 442, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -125, - -125, + -221, + -221, 0 ], "maxPos": [ - 125, - 125, + 221, + 221, 0 ] }, diff --git a/assets/bundles/Girls/10005/avatar/10005_avatar.png b/assets/bundles/Girls/10005/avatar/10005_avatar.png index f19c170f..459e65d7 100644 Binary files a/assets/bundles/Girls/10005/avatar/10005_avatar.png and b/assets/bundles/Girls/10005/avatar/10005_avatar.png differ diff --git a/assets/bundles/Girls/10005/avatar/10005_avatar.png.meta b/assets/bundles/Girls/10005/avatar/10005_avatar.png.meta index 20413e9e..dd055bde 100644 --- a/assets/bundles/Girls/10005/avatar/10005_avatar.png.meta +++ b/assets/bundles/Girls/10005/avatar/10005_avatar.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -221, 0, - 125, - -125, + 221, + -221, 0, - -125, - 125, + -221, + 221, 0, - 125, - 125, + 221, + 221, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, 0, - 250, + 442, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -125, - -125, + -221, + -221, 0 ], "maxPos": [ - 125, - 125, + 221, + 221, 0 ] }, diff --git a/assets/bundles/Girls/10006/avatar/10006_avatar.png b/assets/bundles/Girls/10006/avatar/10006_avatar.png index 273acb83..ea42ee31 100644 Binary files a/assets/bundles/Girls/10006/avatar/10006_avatar.png and b/assets/bundles/Girls/10006/avatar/10006_avatar.png differ diff --git a/assets/bundles/Girls/10006/avatar/10006_avatar.png.meta b/assets/bundles/Girls/10006/avatar/10006_avatar.png.meta index c239f5a9..83d6fa54 100644 --- a/assets/bundles/Girls/10006/avatar/10006_avatar.png.meta +++ b/assets/bundles/Girls/10006/avatar/10006_avatar.png.meta @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 0.5, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -220.5, 0, - 125, - -125, + 221, + -220.5, 0, - -125, - 125, + -221, + 220.5, 0, - 125, - 125, + 221, + 220.5, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, - 0, - 250, - 0 + 1, + 442, + 1 ], "nuv": [ 0, - 0, + 0.0022624434389140274, 1, - 0, + 0.0022624434389140274, 0, 1, 1, 1 ], "minPos": [ - -125, - -125, + -221, + -220.5, 0 ], "maxPos": [ - 125, - 125, + 221, + 220.5, 0 ] }, @@ -127,7 +127,7 @@ }, "userData": { "type": "sprite-frame", - "hasAlpha": false, + "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, "redirect": "34320c58-8c80-4a91-b865-bc9866f861e3@6c48a" } diff --git a/assets/bundles/Girls/10007/avatar/10007_avatar.png b/assets/bundles/Girls/10007/avatar/10007_avatar.png index 2b681d42..80c94476 100644 Binary files a/assets/bundles/Girls/10007/avatar/10007_avatar.png and b/assets/bundles/Girls/10007/avatar/10007_avatar.png differ diff --git a/assets/bundles/Girls/10007/avatar/10007_avatar.png.meta b/assets/bundles/Girls/10007/avatar/10007_avatar.png.meta index 2a436fa0..8e4412e2 100644 --- a/assets/bundles/Girls/10007/avatar/10007_avatar.png.meta +++ b/assets/bundles/Girls/10007/avatar/10007_avatar.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, + "offsetX": -0.5, + "offsetY": 0.5, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 441, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -220.5, + -220.5, 0, - 125, - -125, + 220.5, + -220.5, 0, - -125, - 125, + -220.5, + 220.5, 0, - 125, - 125, + 220.5, + 220.5, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 441, + 442, 0, - 0, - 250, - 0 + 1, + 441, + 1 ], "nuv": [ 0, + 0.0022624434389140274, + 0.997737556561086, + 0.0022624434389140274, 0, 1, - 0, - 0, - 1, - 1, + 0.997737556561086, 1 ], "minPos": [ - -125, - -125, + -220.5, + -220.5, 0 ], "maxPos": [ - 125, - 125, + 220.5, + 220.5, 0 ] }, @@ -127,7 +127,7 @@ }, "userData": { "type": "sprite-frame", - "hasAlpha": false, + "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, "redirect": "3052ac1d-4d0f-41cb-9130-eeff59c2f91f@6c48a" } diff --git a/assets/bundles/Girls/10008/avatar/10008_avatar.png b/assets/bundles/Girls/10008/avatar/10008_avatar.png index 6c6c28ce..2d49c9c4 100644 Binary files a/assets/bundles/Girls/10008/avatar/10008_avatar.png and b/assets/bundles/Girls/10008/avatar/10008_avatar.png differ diff --git a/assets/bundles/Girls/10008/avatar/10008_avatar.png.meta b/assets/bundles/Girls/10008/avatar/10008_avatar.png.meta index 47a1f328..4e726de8 100644 --- a/assets/bundles/Girls/10008/avatar/10008_avatar.png.meta +++ b/assets/bundles/Girls/10008/avatar/10008_avatar.png.meta @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 0.5, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -220.5, 0, - 125, - -125, + 221, + -220.5, 0, - -125, - 125, + -221, + 220.5, 0, - 125, - 125, + 221, + 220.5, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, - 0, - 250, - 0 + 1, + 442, + 1 ], "nuv": [ 0, - 0, + 0.0022624434389140274, 1, - 0, + 0.0022624434389140274, 0, 1, 1, 1 ], "minPos": [ - -125, - -125, + -221, + -220.5, 0 ], "maxPos": [ - 125, - 125, + 221, + 220.5, 0 ] }, @@ -127,7 +127,7 @@ }, "userData": { "type": "sprite-frame", - "hasAlpha": false, + "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, "redirect": "915ed499-78fc-453a-90b5-8ce01c648795@6c48a" } diff --git a/assets/bundles/Girls/10009/avatar/10009_avatar.png b/assets/bundles/Girls/10009/avatar/10009_avatar.png index 01cb0ef4..23a75e02 100644 Binary files a/assets/bundles/Girls/10009/avatar/10009_avatar.png and b/assets/bundles/Girls/10009/avatar/10009_avatar.png differ diff --git a/assets/bundles/Girls/10009/avatar/10009_avatar.png.meta b/assets/bundles/Girls/10009/avatar/10009_avatar.png.meta index a552f4c0..4f04f3e2 100644 --- a/assets/bundles/Girls/10009/avatar/10009_avatar.png.meta +++ b/assets/bundles/Girls/10009/avatar/10009_avatar.png.meta @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 0.5, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -220.5, 0, - 125, - -125, + 221, + -220.5, 0, - -125, - 125, + -221, + 220.5, 0, - 125, - 125, + 221, + 220.5, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, - 0, - 250, - 0 + 1, + 442, + 1 ], "nuv": [ 0, - 0, + 0.0022624434389140274, 1, - 0, + 0.0022624434389140274, 0, 1, 1, 1 ], "minPos": [ - -125, - -125, + -221, + -220.5, 0 ], "maxPos": [ - 125, - 125, + 221, + 220.5, 0 ] }, @@ -127,7 +127,7 @@ }, "userData": { "type": "sprite-frame", - "hasAlpha": false, + "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, "redirect": "97a5b35c-6b48-4263-a43c-48adf9b4acaf@6c48a" } diff --git a/assets/bundles/Girls/10010/avatar/10010_avatar.png b/assets/bundles/Girls/10010/avatar/10010_avatar.png index 40095272..1df3eaf2 100644 Binary files a/assets/bundles/Girls/10010/avatar/10010_avatar.png and b/assets/bundles/Girls/10010/avatar/10010_avatar.png differ diff --git a/assets/bundles/Girls/10010/avatar/10010_avatar.png.meta b/assets/bundles/Girls/10010/avatar/10010_avatar.png.meta index f4573d84..8f4a8b88 100644 --- a/assets/bundles/Girls/10010/avatar/10010_avatar.png.meta +++ b/assets/bundles/Girls/10010/avatar/10010_avatar.png.meta @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 0.5, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -220.5, 0, - 125, - -125, + 221, + -220.5, 0, - -125, - 125, + -221, + 220.5, 0, - 125, - 125, + 221, + 220.5, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, - 0, - 250, - 0 + 1, + 442, + 1 ], "nuv": [ 0, - 0, + 0.0022624434389140274, 1, - 0, + 0.0022624434389140274, 0, 1, 1, 1 ], "minPos": [ - -125, - -125, + -221, + -220.5, 0 ], "maxPos": [ - 125, - 125, + 221, + 220.5, 0 ] }, @@ -127,7 +127,7 @@ }, "userData": { "type": "sprite-frame", - "hasAlpha": false, + "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, "redirect": "a5e4fd00-aab5-455e-92b7-0d1cb22a45f9@6c48a" } diff --git a/assets/bundles/Girls/10011/avatar/10011_avatar.png b/assets/bundles/Girls/10011/avatar/10011_avatar.png index 481a3243..f2941249 100644 Binary files a/assets/bundles/Girls/10011/avatar/10011_avatar.png and b/assets/bundles/Girls/10011/avatar/10011_avatar.png differ diff --git a/assets/bundles/Girls/10011/avatar/10011_avatar.png.meta b/assets/bundles/Girls/10011/avatar/10011_avatar.png.meta index 851e4955..ed305ab6 100644 --- a/assets/bundles/Girls/10011/avatar/10011_avatar.png.meta +++ b/assets/bundles/Girls/10011/avatar/10011_avatar.png.meta @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 0.5, "trimX": 0, "trimY": 0, - "width": 250, - "height": 250, - "rawWidth": 250, - "rawHeight": 250, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -125, - -125, + -221, + -220.5, 0, - 125, - -125, + 221, + -220.5, 0, - -125, - 125, + -221, + 220.5, 0, - 125, - 125, + 221, + 220.5, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 250, - 250, - 250, + 442, + 442, + 442, 0, - 0, - 250, - 0 + 1, + 442, + 1 ], "nuv": [ 0, - 0, + 0.0022624434389140274, 1, - 0, + 0.0022624434389140274, 0, 1, 1, 1 ], "minPos": [ - -125, - -125, + -221, + -220.5, 0 ], "maxPos": [ - 125, - 125, + 221, + 220.5, 0 ] }, @@ -127,7 +127,7 @@ }, "userData": { "type": "sprite-frame", - "hasAlpha": false, + "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, "redirect": "e2e7c434-c95f-44e5-97da-14d531b8e5da@6c48a" } diff --git a/assets/bundles/Girls/10012/avatar/10012_avatar.png b/assets/bundles/Girls/10012/avatar/10012_avatar.png new file mode 100644 index 00000000..6126bc04 Binary files /dev/null and b/assets/bundles/Girls/10012/avatar/10012_avatar.png differ diff --git a/assets/bundles/Girls/10012/avatar/10012_avatar.png.meta b/assets/bundles/Girls/10012/avatar/10012_avatar.png.meta new file mode 100644 index 00000000..cd2744ab --- /dev/null +++ b/assets/bundles/Girls/10012/avatar/10012_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "fca25927-1dba-48b9-b490-156cef5bc7e1", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "fca25927-1dba-48b9-b490-156cef5bc7e1@6c48a", + "displayName": "10012_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "fca25927-1dba-48b9-b490-156cef5bc7e1", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "fca25927-1dba-48b9-b490-156cef5bc7e1@f9941", + "displayName": "10012_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 441, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -220.5, + -220.5, + 0, + 220.5, + -220.5, + 0, + -220.5, + 220.5, + 0, + 220.5, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 441, + 442, + 0, + 1, + 441, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 0.997737556561086, + 0.0022624434389140274, + 0, + 1, + 0.997737556561086, + 1 + ], + "minPos": [ + -220.5, + -220.5, + 0 + ], + "maxPos": [ + 220.5, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "fca25927-1dba-48b9-b490-156cef5bc7e1@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "fca25927-1dba-48b9-b490-156cef5bc7e1@6c48a" + } +} diff --git a/assets/bundles/Girls/10013/avatar/10013_avatar.png b/assets/bundles/Girls/10013/avatar/10013_avatar.png new file mode 100644 index 00000000..ac7d3553 Binary files /dev/null and b/assets/bundles/Girls/10013/avatar/10013_avatar.png differ diff --git a/assets/bundles/Girls/10013/avatar/10013_avatar.png.meta b/assets/bundles/Girls/10013/avatar/10013_avatar.png.meta new file mode 100644 index 00000000..0952277d --- /dev/null +++ b/assets/bundles/Girls/10013/avatar/10013_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "04ebfd4c-3d09-4c6d-bc4d-253a17b639f7", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "04ebfd4c-3d09-4c6d-bc4d-253a17b639f7@6c48a", + "displayName": "10013_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "04ebfd4c-3d09-4c6d-bc4d-253a17b639f7", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "04ebfd4c-3d09-4c6d-bc4d-253a17b639f7@f9941", + "displayName": "10013_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "04ebfd4c-3d09-4c6d-bc4d-253a17b639f7@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "04ebfd4c-3d09-4c6d-bc4d-253a17b639f7@6c48a" + } +} diff --git a/assets/bundles/Girls/10014/avatar/10014_avatar.png b/assets/bundles/Girls/10014/avatar/10014_avatar.png new file mode 100644 index 00000000..bedcf185 Binary files /dev/null and b/assets/bundles/Girls/10014/avatar/10014_avatar.png differ diff --git a/assets/bundles/Girls/10014/avatar/10014_avatar.png.meta b/assets/bundles/Girls/10014/avatar/10014_avatar.png.meta new file mode 100644 index 00000000..2cf3d3fe --- /dev/null +++ b/assets/bundles/Girls/10014/avatar/10014_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "894b7544-89d9-48eb-ad27-e9bece08a34c", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "894b7544-89d9-48eb-ad27-e9bece08a34c@6c48a", + "displayName": "10014_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "894b7544-89d9-48eb-ad27-e9bece08a34c", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "894b7544-89d9-48eb-ad27-e9bece08a34c@f9941", + "displayName": "10014_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "894b7544-89d9-48eb-ad27-e9bece08a34c@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "894b7544-89d9-48eb-ad27-e9bece08a34c@6c48a" + } +} diff --git a/assets/bundles/Girls/10015/avatar/10015_avatar.png b/assets/bundles/Girls/10015/avatar/10015_avatar.png new file mode 100644 index 00000000..af8f25ae Binary files /dev/null and b/assets/bundles/Girls/10015/avatar/10015_avatar.png differ diff --git a/assets/bundles/Girls/10015/avatar/10015_avatar.png.meta b/assets/bundles/Girls/10015/avatar/10015_avatar.png.meta new file mode 100644 index 00000000..37b2e608 --- /dev/null +++ b/assets/bundles/Girls/10015/avatar/10015_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "83f9f7a6-b1af-4c64-baa0-1565e9a5622f", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "83f9f7a6-b1af-4c64-baa0-1565e9a5622f@6c48a", + "displayName": "10015_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "83f9f7a6-b1af-4c64-baa0-1565e9a5622f", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "83f9f7a6-b1af-4c64-baa0-1565e9a5622f@f9941", + "displayName": "10015_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "83f9f7a6-b1af-4c64-baa0-1565e9a5622f@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "83f9f7a6-b1af-4c64-baa0-1565e9a5622f@6c48a" + } +} diff --git a/assets/bundles/Girls/10016/avatar/10016_avatar.png b/assets/bundles/Girls/10016/avatar/10016_avatar.png new file mode 100644 index 00000000..3de7cfa8 Binary files /dev/null and b/assets/bundles/Girls/10016/avatar/10016_avatar.png differ diff --git a/assets/bundles/Girls/10016/avatar/10016_avatar.png.meta b/assets/bundles/Girls/10016/avatar/10016_avatar.png.meta new file mode 100644 index 00000000..18b9d8cd --- /dev/null +++ b/assets/bundles/Girls/10016/avatar/10016_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "2c082fcd-6499-42b3-ac08-d9fe9aab16f3", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "2c082fcd-6499-42b3-ac08-d9fe9aab16f3@6c48a", + "displayName": "10016_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "2c082fcd-6499-42b3-ac08-d9fe9aab16f3", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "2c082fcd-6499-42b3-ac08-d9fe9aab16f3@f9941", + "displayName": "10016_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -221, + 0, + 221, + -221, + 0, + -221, + 221, + 0, + 221, + 221, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 0, + 442, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -221, + 0 + ], + "maxPos": [ + 221, + 221, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "2c082fcd-6499-42b3-ac08-d9fe9aab16f3@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false, + "redirect": "2c082fcd-6499-42b3-ac08-d9fe9aab16f3@6c48a" + } +} diff --git a/assets/bundles/Girls/10017/avatar/10017_avatar.png b/assets/bundles/Girls/10017/avatar/10017_avatar.png new file mode 100644 index 00000000..e2e02585 Binary files /dev/null and b/assets/bundles/Girls/10017/avatar/10017_avatar.png differ diff --git a/assets/bundles/Girls/10017/avatar/10017_avatar.png.meta b/assets/bundles/Girls/10017/avatar/10017_avatar.png.meta new file mode 100644 index 00000000..6dd7656a --- /dev/null +++ b/assets/bundles/Girls/10017/avatar/10017_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "9cd39ba9-b6c7-418e-9afd-cb0597c13e37", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "9cd39ba9-b6c7-418e-9afd-cb0597c13e37@6c48a", + "displayName": "10017_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "9cd39ba9-b6c7-418e-9afd-cb0597c13e37", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "9cd39ba9-b6c7-418e-9afd-cb0597c13e37@f9941", + "displayName": "10017_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 441, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -220.5, + -221, + 0, + 220.5, + -221, + 0, + -220.5, + 221, + 0, + 220.5, + 221, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 441, + 442, + 0, + 0, + 441, + 0 + ], + "nuv": [ + 0, + 0, + 0.997737556561086, + 0, + 0, + 1, + 0.997737556561086, + 1 + ], + "minPos": [ + -220.5, + -221, + 0 + ], + "maxPos": [ + 220.5, + 221, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "9cd39ba9-b6c7-418e-9afd-cb0597c13e37@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "9cd39ba9-b6c7-418e-9afd-cb0597c13e37@6c48a" + } +} diff --git a/assets/bundles/Girls/10018/avatar/10018_avatar.png b/assets/bundles/Girls/10018/avatar/10018_avatar.png new file mode 100644 index 00000000..b7e2e970 Binary files /dev/null and b/assets/bundles/Girls/10018/avatar/10018_avatar.png differ diff --git a/assets/bundles/Girls/10018/avatar/10018_avatar.png.meta b/assets/bundles/Girls/10018/avatar/10018_avatar.png.meta new file mode 100644 index 00000000..4d452611 --- /dev/null +++ b/assets/bundles/Girls/10018/avatar/10018_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "6d04144d-02e0-4f5a-9f65-3965765ad4f1", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "6d04144d-02e0-4f5a-9f65-3965765ad4f1@6c48a", + "displayName": "10018_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "6d04144d-02e0-4f5a-9f65-3965765ad4f1", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "6d04144d-02e0-4f5a-9f65-3965765ad4f1@f9941", + "displayName": "10018_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -221, + 0, + 221, + -221, + 0, + -221, + 221, + 0, + 221, + 221, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 0, + 442, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -221, + 0 + ], + "maxPos": [ + 221, + 221, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "6d04144d-02e0-4f5a-9f65-3965765ad4f1@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false, + "redirect": "6d04144d-02e0-4f5a-9f65-3965765ad4f1@6c48a" + } +} diff --git a/assets/bundles/Girls/10019/avatar/10019_avatar.png b/assets/bundles/Girls/10019/avatar/10019_avatar.png new file mode 100644 index 00000000..af1974f3 Binary files /dev/null and b/assets/bundles/Girls/10019/avatar/10019_avatar.png differ diff --git a/assets/bundles/Girls/10019/avatar/10019_avatar.png.meta b/assets/bundles/Girls/10019/avatar/10019_avatar.png.meta new file mode 100644 index 00000000..a4e93daa --- /dev/null +++ b/assets/bundles/Girls/10019/avatar/10019_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "ab77c324-5368-40e6-87f4-30c049871121", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "ab77c324-5368-40e6-87f4-30c049871121@6c48a", + "displayName": "10019_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "ab77c324-5368-40e6-87f4-30c049871121", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "ab77c324-5368-40e6-87f4-30c049871121@f9941", + "displayName": "10019_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -221, + 0, + 221, + -221, + 0, + -221, + 221, + 0, + 221, + 221, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 0, + 442, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -221, + 0 + ], + "maxPos": [ + 221, + 221, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ab77c324-5368-40e6-87f4-30c049871121@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false, + "redirect": "ab77c324-5368-40e6-87f4-30c049871121@6c48a" + } +} diff --git a/assets/bundles/Girls/10020/avatar/10020_avatar.png b/assets/bundles/Girls/10020/avatar/10020_avatar.png new file mode 100644 index 00000000..fc971dc7 Binary files /dev/null and b/assets/bundles/Girls/10020/avatar/10020_avatar.png differ diff --git a/assets/bundles/Girls/10020/avatar/10020_avatar.png.meta b/assets/bundles/Girls/10020/avatar/10020_avatar.png.meta new file mode 100644 index 00000000..af308a79 --- /dev/null +++ b/assets/bundles/Girls/10020/avatar/10020_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "ab86c91d-0a35-4321-9199-b98bf0e94680", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "ab86c91d-0a35-4321-9199-b98bf0e94680@6c48a", + "displayName": "10020_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "ab86c91d-0a35-4321-9199-b98bf0e94680", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "ab86c91d-0a35-4321-9199-b98bf0e94680@f9941", + "displayName": "10020_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -221, + 0, + 221, + -221, + 0, + -221, + 221, + 0, + 221, + 221, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 0, + 442, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -221, + 0 + ], + "maxPos": [ + 221, + 221, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ab86c91d-0a35-4321-9199-b98bf0e94680@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false, + "redirect": "ab86c91d-0a35-4321-9199-b98bf0e94680@6c48a" + } +} diff --git a/assets/bundles/Girls/10021/avatar/10021_avatar.png b/assets/bundles/Girls/10021/avatar/10021_avatar.png new file mode 100644 index 00000000..b1cec09c Binary files /dev/null and b/assets/bundles/Girls/10021/avatar/10021_avatar.png differ diff --git a/assets/bundles/Girls/10021/avatar/10021_avatar.png.meta b/assets/bundles/Girls/10021/avatar/10021_avatar.png.meta new file mode 100644 index 00000000..5f48fca8 --- /dev/null +++ b/assets/bundles/Girls/10021/avatar/10021_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "2cf8b894-6ee4-4edd-aaa7-7465d0cedec8", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "2cf8b894-6ee4-4edd-aaa7-7465d0cedec8@6c48a", + "displayName": "10021_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "2cf8b894-6ee4-4edd-aaa7-7465d0cedec8", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "2cf8b894-6ee4-4edd-aaa7-7465d0cedec8@f9941", + "displayName": "10021_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "2cf8b894-6ee4-4edd-aaa7-7465d0cedec8@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "2cf8b894-6ee4-4edd-aaa7-7465d0cedec8@6c48a" + } +} diff --git a/assets/bundles/Girls/10022/avatar/10022_avatar.png b/assets/bundles/Girls/10022/avatar/10022_avatar.png new file mode 100644 index 00000000..0b8694e2 Binary files /dev/null and b/assets/bundles/Girls/10022/avatar/10022_avatar.png differ diff --git a/assets/bundles/Girls/10022/avatar/10022_avatar.png.meta b/assets/bundles/Girls/10022/avatar/10022_avatar.png.meta new file mode 100644 index 00000000..a2b85b26 --- /dev/null +++ b/assets/bundles/Girls/10022/avatar/10022_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "aa1ef6ff-3f6e-4890-a3ea-9796b972053e", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "aa1ef6ff-3f6e-4890-a3ea-9796b972053e@6c48a", + "displayName": "10022_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "aa1ef6ff-3f6e-4890-a3ea-9796b972053e", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "aa1ef6ff-3f6e-4890-a3ea-9796b972053e@f9941", + "displayName": "10022_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 441, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -220.5, + -220.5, + 0, + 220.5, + -220.5, + 0, + -220.5, + 220.5, + 0, + 220.5, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 441, + 442, + 0, + 1, + 441, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 0.997737556561086, + 0.0022624434389140274, + 0, + 1, + 0.997737556561086, + 1 + ], + "minPos": [ + -220.5, + -220.5, + 0 + ], + "maxPos": [ + 220.5, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "aa1ef6ff-3f6e-4890-a3ea-9796b972053e@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "aa1ef6ff-3f6e-4890-a3ea-9796b972053e@6c48a" + } +} diff --git a/assets/bundles/Girls/10023/avatar/10023_avatar.png b/assets/bundles/Girls/10023/avatar/10023_avatar.png new file mode 100644 index 00000000..ed7a9b81 Binary files /dev/null and b/assets/bundles/Girls/10023/avatar/10023_avatar.png differ diff --git a/assets/bundles/Girls/10023/avatar/10023_avatar.png.meta b/assets/bundles/Girls/10023/avatar/10023_avatar.png.meta new file mode 100644 index 00000000..f1e415aa --- /dev/null +++ b/assets/bundles/Girls/10023/avatar/10023_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "4599e277-c1a8-4623-8a1f-754ed773f5d1", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "4599e277-c1a8-4623-8a1f-754ed773f5d1@6c48a", + "displayName": "10023_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "4599e277-c1a8-4623-8a1f-754ed773f5d1", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "4599e277-c1a8-4623-8a1f-754ed773f5d1@f9941", + "displayName": "10023_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "4599e277-c1a8-4623-8a1f-754ed773f5d1@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "4599e277-c1a8-4623-8a1f-754ed773f5d1@6c48a" + } +} diff --git a/assets/bundles/Girls/10024/avatar/10024_avatar.png b/assets/bundles/Girls/10024/avatar/10024_avatar.png new file mode 100644 index 00000000..6a229c9e Binary files /dev/null and b/assets/bundles/Girls/10024/avatar/10024_avatar.png differ diff --git a/assets/bundles/Girls/10024/avatar/10024_avatar.png.meta b/assets/bundles/Girls/10024/avatar/10024_avatar.png.meta new file mode 100644 index 00000000..bed18e42 --- /dev/null +++ b/assets/bundles/Girls/10024/avatar/10024_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "05d60b39-0743-461b-8cea-f701051c61e5", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "05d60b39-0743-461b-8cea-f701051c61e5@6c48a", + "displayName": "10024_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "05d60b39-0743-461b-8cea-f701051c61e5", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "05d60b39-0743-461b-8cea-f701051c61e5@f9941", + "displayName": "10024_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "05d60b39-0743-461b-8cea-f701051c61e5@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "05d60b39-0743-461b-8cea-f701051c61e5@6c48a" + } +} diff --git a/assets/bundles/Girls/10025/avatar/10025_avatar.png b/assets/bundles/Girls/10025/avatar/10025_avatar.png new file mode 100644 index 00000000..93e0af7a Binary files /dev/null and b/assets/bundles/Girls/10025/avatar/10025_avatar.png differ diff --git a/assets/bundles/Girls/10025/avatar/10025_avatar.png.meta b/assets/bundles/Girls/10025/avatar/10025_avatar.png.meta new file mode 100644 index 00000000..4053e5bd --- /dev/null +++ b/assets/bundles/Girls/10025/avatar/10025_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "e3ba4bf9-775c-438f-818e-aaadfdc86a83", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "e3ba4bf9-775c-438f-818e-aaadfdc86a83@6c48a", + "displayName": "10025_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "e3ba4bf9-775c-438f-818e-aaadfdc86a83", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "e3ba4bf9-775c-438f-818e-aaadfdc86a83@f9941", + "displayName": "10025_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "e3ba4bf9-775c-438f-818e-aaadfdc86a83@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "e3ba4bf9-775c-438f-818e-aaadfdc86a83@6c48a" + } +} diff --git a/assets/bundles/Girls/10026/avatar/10026_avatar.png b/assets/bundles/Girls/10026/avatar/10026_avatar.png new file mode 100644 index 00000000..6f7ae046 Binary files /dev/null and b/assets/bundles/Girls/10026/avatar/10026_avatar.png differ diff --git a/assets/bundles/Girls/10026/avatar/10026_avatar.png.meta b/assets/bundles/Girls/10026/avatar/10026_avatar.png.meta new file mode 100644 index 00000000..7d29eecd --- /dev/null +++ b/assets/bundles/Girls/10026/avatar/10026_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "6d4b2c25-a63b-422d-a6a9-98cfbf56f8bd", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "6d4b2c25-a63b-422d-a6a9-98cfbf56f8bd@6c48a", + "displayName": "10026_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "6d4b2c25-a63b-422d-a6a9-98cfbf56f8bd", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "6d4b2c25-a63b-422d-a6a9-98cfbf56f8bd@f9941", + "displayName": "10026_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "6d4b2c25-a63b-422d-a6a9-98cfbf56f8bd@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "6d4b2c25-a63b-422d-a6a9-98cfbf56f8bd@6c48a" + } +} diff --git a/assets/bundles/Girls/10027/avatar/10027_avatar.png b/assets/bundles/Girls/10027/avatar/10027_avatar.png new file mode 100644 index 00000000..3b4d2653 Binary files /dev/null and b/assets/bundles/Girls/10027/avatar/10027_avatar.png differ diff --git a/assets/bundles/Girls/10027/avatar/10027_avatar.png.meta b/assets/bundles/Girls/10027/avatar/10027_avatar.png.meta new file mode 100644 index 00000000..38aa656e --- /dev/null +++ b/assets/bundles/Girls/10027/avatar/10027_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "ecd01dfc-32cb-4cb5-89f4-12c79e07a965", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "ecd01dfc-32cb-4cb5-89f4-12c79e07a965@6c48a", + "displayName": "10027_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "ecd01dfc-32cb-4cb5-89f4-12c79e07a965", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "ecd01dfc-32cb-4cb5-89f4-12c79e07a965@f9941", + "displayName": "10027_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 441, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -220.5, + -220.5, + 0, + 220.5, + -220.5, + 0, + -220.5, + 220.5, + 0, + 220.5, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 441, + 442, + 0, + 1, + 441, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 0.997737556561086, + 0.0022624434389140274, + 0, + 1, + 0.997737556561086, + 1 + ], + "minPos": [ + -220.5, + -220.5, + 0 + ], + "maxPos": [ + 220.5, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ecd01dfc-32cb-4cb5-89f4-12c79e07a965@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "ecd01dfc-32cb-4cb5-89f4-12c79e07a965@6c48a" + } +} diff --git a/assets/bundles/Girls/10028/avatar/10028_avatar.png b/assets/bundles/Girls/10028/avatar/10028_avatar.png new file mode 100644 index 00000000..b0303407 Binary files /dev/null and b/assets/bundles/Girls/10028/avatar/10028_avatar.png differ diff --git a/assets/bundles/Girls/10028/avatar/10028_avatar.png.meta b/assets/bundles/Girls/10028/avatar/10028_avatar.png.meta new file mode 100644 index 00000000..4f6f15fd --- /dev/null +++ b/assets/bundles/Girls/10028/avatar/10028_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "66b1dd3e-904a-4fcc-aa04-8afe2373552d", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "66b1dd3e-904a-4fcc-aa04-8afe2373552d@6c48a", + "displayName": "10028_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "66b1dd3e-904a-4fcc-aa04-8afe2373552d", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "66b1dd3e-904a-4fcc-aa04-8afe2373552d@f9941", + "displayName": "10028_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "66b1dd3e-904a-4fcc-aa04-8afe2373552d@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "66b1dd3e-904a-4fcc-aa04-8afe2373552d@6c48a" + } +} diff --git a/assets/bundles/Girls/10029/avatar/10029_avatar.png b/assets/bundles/Girls/10029/avatar/10029_avatar.png new file mode 100644 index 00000000..4550b202 Binary files /dev/null and b/assets/bundles/Girls/10029/avatar/10029_avatar.png differ diff --git a/assets/bundles/Girls/10029/avatar/10029_avatar.png.meta b/assets/bundles/Girls/10029/avatar/10029_avatar.png.meta new file mode 100644 index 00000000..efd74405 --- /dev/null +++ b/assets/bundles/Girls/10029/avatar/10029_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "e202d04f-973a-4d5d-899b-456ab43e170e", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "e202d04f-973a-4d5d-899b-456ab43e170e@6c48a", + "displayName": "10029_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "e202d04f-973a-4d5d-899b-456ab43e170e", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "e202d04f-973a-4d5d-899b-456ab43e170e@f9941", + "displayName": "10029_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 441, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -220.5, + 0, + 221, + -220.5, + 0, + -221, + 220.5, + 0, + 221, + 220.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 1, + 442, + 1 + ], + "nuv": [ + 0, + 0.0022624434389140274, + 1, + 0.0022624434389140274, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -220.5, + 0 + ], + "maxPos": [ + 221, + 220.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "e202d04f-973a-4d5d-899b-456ab43e170e@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "e202d04f-973a-4d5d-899b-456ab43e170e@6c48a" + } +} diff --git a/assets/bundles/Girls/10030/avatar/10030_avatar.png b/assets/bundles/Girls/10030/avatar/10030_avatar.png new file mode 100644 index 00000000..5bf404d1 Binary files /dev/null and b/assets/bundles/Girls/10030/avatar/10030_avatar.png differ diff --git a/assets/bundles/Girls/10030/avatar/10030_avatar.png.meta b/assets/bundles/Girls/10030/avatar/10030_avatar.png.meta new file mode 100644 index 00000000..aef72642 --- /dev/null +++ b/assets/bundles/Girls/10030/avatar/10030_avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "ccba57fa-d0c5-4c67-ac69-8bc64ff2acd4", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "ccba57fa-d0c5-4c67-ac69-8bc64ff2acd4@6c48a", + "displayName": "10030_avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "ccba57fa-d0c5-4c67-ac69-8bc64ff2acd4", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "ccba57fa-d0c5-4c67-ac69-8bc64ff2acd4@f9941", + "displayName": "10030_avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 442, + "height": 442, + "rawWidth": 442, + "rawHeight": 442, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -221, + -221, + 0, + 221, + -221, + 0, + -221, + 221, + 0, + 221, + 221, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 442, + 442, + 0, + 0, + 442, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -221, + -221, + 0 + ], + "maxPos": [ + 221, + 221, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ccba57fa-d0c5-4c67-ac69-8bc64ff2acd4@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false, + "redirect": "ccba57fa-d0c5-4c67-ac69-8bc64ff2acd4@6c48a" + } +}