diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene index 6c2322ab..cead2628 100644 --- a/assets/Scenes/MainScene.scene +++ b/assets/Scenes/MainScene.scene @@ -2580,7 +2580,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 102.5, + "y": 115.354, "z": 0 }, "_lrot": { @@ -2619,7 +2619,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1394.4 + "height": 1394.3999999999999 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2642,8 +2642,8 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 0.30000000000009663, - "_bottom": 205.29999999999998, + "_top": -12.553999999999917, + "_bottom": 218.154, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, diff --git a/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts b/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts index c33da139..d75cfb8c 100644 --- a/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts +++ b/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts @@ -249,7 +249,7 @@ export class SceneBgVideoLayer extends li_BaseView { } else { targetWorldPos = new Vec3(pos.x, pos.y, pos.z || 0); } - this.videoPlayer.node.setWorldPosition(targetWorldPos); + this.videoPlayer.node.setPosition(targetWorldPos); logger.log( `SceneBgVideoLayer: 设置视频位置 (${targetWorldPos.x}, ${targetWorldPos.y}, ${targetWorldPos.z})` ); diff --git a/assets/Scripts/chat18x/core/MainController.ts b/assets/Scripts/chat18x/core/MainController.ts index 1198a947..ca654d0e 100644 --- a/assets/Scripts/chat18x/core/MainController.ts +++ b/assets/Scripts/chat18x/core/MainController.ts @@ -38,7 +38,7 @@ export class MainController { // 并行预加载所有数据 await Promise.all([ this.preloadThemeData(), - this.preloadDailyRecommend(), + //this.preloadDailyRecommend(), this.preloadRecommendList(true, 1, 10), this.preloadShopList(), ]); @@ -267,4 +267,33 @@ export class MainController { return false; } } + + /** + * 强制刷新推荐列表数据 + */ + async refreshRecommendList(): Promise { + logger.log("[MainController] 开始强制刷新推荐列表数据"); + try { + const reqData = { + page: 1, + limit: 10, + }; + const res = await GirlService.I.reqRecommendList(reqData); + + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { + // 保存数据到DataManager + const girlData = DataManager.I.getDataById(DataId.Girl); + girlData.setRecommendList(res.data); + this.isRecommendListPreloaded = true; + logger.log("[MainController] 推荐列表数据刷新成功"); + return true; + } else { + logger.warn("[MainController] 推荐列表数据刷新失败:", res); + return false; + } + } catch (error) { + logger.error("[MainController] 推荐列表数据刷新异常:", error); + return false; + } + } } diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts index fe737ab5..98286bed 100644 --- a/assets/Scripts/chat18x/manager/NavigationManager.ts +++ b/assets/Scripts/chat18x/manager/NavigationManager.ts @@ -143,6 +143,7 @@ export class NavigationManager { logger.log( `[NavigationManager] Already on ${panelType}, skipping switch` ); + callback && callback(this.getCurrentActivePanelNode()); return this.currentActivePanel; } @@ -373,7 +374,9 @@ export class NavigationManager { // 如果配置了隐藏basePanel，记录映射关系 if (config.hideBasePanel) { this.hiddenBasePanels.set(n, basePanel); - logger.log(`[NavigationManager] 记录隐藏映射: ${n.name} -> ${basePanel.name}`); + logger.log( + `[NavigationManager] 记录隐藏映射: ${n.name} -> ${basePanel.name}` + ); } // 执行打开动画 @@ -619,7 +622,9 @@ export class NavigationManager { if (this.hiddenBasePanels.has(panelNode)) { const basePanel = this.hiddenBasePanels.get(panelNode); if (basePanel && basePanel.isValid) { - logger.log(`[NavigationManager] 恢复显示basePanel: ${basePanel.name}`); + logger.log( + `[NavigationManager] 恢复显示basePanel: ${basePanel.name}` + ); basePanel.active = true; } this.hiddenBasePanels.delete(panelNode); diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts index d3a8d2a8..3ab7486a 100644 --- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts @@ -99,7 +99,7 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { this.waitingAI = this._nodeTab.waitingAI; // 获取 videoArea 的尺寸和位置 this.targetSize = this.videoArea.contentSize; - this.videoAreaPos = new Vec3(540, 1170, 0); + this.videoAreaPos = new Vec3(0, 92.637, 0); this.register(); //this.refresh(); @@ -168,23 +168,6 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { this.categoryId = NavigationManager.Instance.getSelectedCategoryId().toString(); - const isFree = - girlData.getGrilPriceType(this.categoryId.toString(), this.id) == - PriceType.free; - const isRelease = girlData.getIsRelease( - this.categoryId.toString(), - this.id - ); - if (!isFree && !isRelease) { - //未解锁 - NavigationManager.Instance.openPopupPanel("GirlListPopupPanel-Fix", { - base: this, - category: this.categoryId, - id: this.id, - }); - return; - } - // 获取ChatController单例并绑定当前Panel this.chatController = ChatController.Instance; this.chatController.bindView(this); diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index 435544d3..e3e70429 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -77,7 +77,7 @@ export class GirlDetailPanel extends li_BaseView { @property(Node) imgsLayout: Node; - videoAreaPos: Vec3; + //videoAreaPos: Vec3; @property(Node) sendMsgText: Node; @@ -165,7 +165,7 @@ export class GirlDetailPanel extends li_BaseView { this.id = NavigationManager.Instance.getSelectedGirlId(); this.category = NavigationManager.Instance.getSelectedCategoryId(); this.imgItemInst.node.active = false; - this.videoAreaPos = new Vec3(540, 1384 - 60); + //this.videoAreaPos = new Vec3(540, 1384 - 60); const pos = new Vec3( this.descContent.position.x, @@ -255,7 +255,7 @@ export class GirlDetailPanel extends li_BaseView { this.videoLayer.playVideo(firstPath, { loop: true, size: targetSize, - position: this.videoAreaPos, + position: new Vec3(0, 67.717, 0), }); } @@ -349,6 +349,8 @@ export class GirlDetailPanel extends li_BaseView { // id: this.id, // }); // } + + this.close(); } returnBtn() { diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts index fd50c12e..26560cde 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts @@ -128,7 +128,7 @@ export class GirlListPanel extends li_BaseView { for (let i = 0; i < allId.length; i++) { let id = allId[i]; let item = this.getItemFromPool(); - item.refreshData(category, id, this.node); + item.refreshData(category, id, this); item.node.active = true; this.cache.push(item); diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 5e57fdb9..25cbdc8b 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -6,6 +6,7 @@ import { Label, Sprite, UITransform, + ScrollView, } from "cc"; import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView"; import Utils from "db://assets/Scripts/Main/Common/Utils"; @@ -67,6 +68,13 @@ export class ThemePanel extends li_BaseView { private themeScroll: Node; private recomandScroll: Node; + private recomandScrollView: ScrollView = null; + + // 推荐列表分页状态 + private currentPage: number = 1; + private pageLimit: number = 10; + private isLoadingMore: boolean = false; + private hasMoreData: boolean = true; onLoadCT() { Utils.parseNode(this.node, this._nodeTab); @@ -81,6 +89,12 @@ export class ThemePanel extends li_BaseView { this.themeScroll = this._nodeTab.themeScroll; this.recomandScroll = this._nodeTab.recomandScroll; + // 获取推荐列表的 ScrollView 组件 + if (this.recomandScroll) { + this.recomandScrollView = + this.recomandScroll.getComponentInChildren(ScrollView); + } + this.registerListener(); this.itemInst = this._nodeTab.ThemeItem.getComponent(ThemeItem); this.itemInst.node.active = false; @@ -145,7 +159,7 @@ export class ThemePanel extends li_BaseView { logger.log("[ThemePanel] 开始强制刷新数据"); await Promise.all([ MainController.I.refreshThemeData(), - MainController.I.refreshDailyRecommend(), + MainController.I.refreshRecommendList(), ]); logger.log("[ThemePanel] 数据刷新完成"); @@ -167,8 +181,8 @@ export class ThemePanel extends li_BaseView { throw new Error("Operation was aborted"); } - // 处理每日推荐数据 - await this.handleRecommendData(preloadStatus.dailyRecommend); + // 处理推荐列表数据 + await this.handleRecommendData(preloadStatus.recommendList); // 检查是否已被取消 if (signal.aborted) { @@ -240,7 +254,7 @@ export class ThemePanel extends li_BaseView { */ private async handleRecommendData(isPreloaded: boolean): Promise { if (isPreloaded) { - logger.log("[ThemePanel] 使用预加载的每日推荐数据"); + logger.log("[ThemePanel] 使用预加载的推荐列表数据"); // 直接使用预加载的数据渲染界面 const girlData = DataManager.I.getDataById(DataId.Girl); if (girlData) { @@ -249,25 +263,35 @@ export class ThemePanel extends li_BaseView { } // 如果没有预加载数据，则请求数据 - logger.log("[ThemePanel] 请求每日推荐数据"); - const reqData = {}; - let res = await GirlService.I.reqDailyRecommend(reqData); + logger.log("[ThemePanel] 请求推荐列表数据"); + const reqData = { + page: 1, + limit: 10, + }; + let res = await GirlService.I.reqRecommendList(reqData); if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { const girlData = DataManager.I.getDataById(DataId.Girl); - girlData.setDailyRecommend(res.data); + girlData.setRecommendList(res.data); } } /** - * 渲染每日推荐数据 + * 渲染推荐列表数据（首次渲染） */ private renderRecommendData(): void { if (this.recItemCache.length > 0) return; + // 重置分页状态 + this.currentPage = 1; + this.hasMoreData = true; + this.isLoadingMore = false; + const girlData = DataManager.I.getDataById(DataId.Girl); - let girlIDs = []; - girlIDs.push(girlData.getRecommendGirlId()); + // 获取推荐列表的所有 ID + let girlIDs = girlData.getRecommendListIds(); + + // 遍历创建推荐项 for (let id of girlIDs) { let newNode = instantiate(this.recItemInst.node); let item = newNode.getComponent(RecomandItem); @@ -278,7 +302,127 @@ export class ThemePanel extends li_BaseView { this.recGirlContent.addChild(newNode); } - console.error("未实现每日推荐数据渲染"); + // 检查首次加载的数据量，判断是否还有更多数据 + if (girlIDs.length < this.pageLimit) { + this.hasMoreData = false; + } + + logger.log(`[ThemePanel] 渲染推荐列表完成，共 ${girlIDs.length} 个推荐项`); + } + + /** + * 滚动到底部回调（Cocos Creator 内置事件） + */ + private onRecommendScrollToBottom(): void { + logger.log("[ThemePanel] 推荐列表滚动到底部"); + this.loadMoreRecommendData(); + } + + /** + * 滚动中回调，用于检测接近底部 + */ + private onRecommendScrolling(): void { + if (!this.recomandScrollView) return; + + // 获取滚动进度（0-1） + const scrollOffset = this.recomandScrollView.getScrollOffset(); + const maxScrollOffset = this.recomandScrollView.getMaxScrollOffset(); + + // 当滚动到距离底部 100 像素以内时，开始加载 + if (maxScrollOffset.y > 0 && scrollOffset.y >= maxScrollOffset.y - 100) { + this.loadMoreRecommendData(); + } + } + + /** + * 加载下一页推荐数据 + */ + private async loadMoreRecommendData(): Promise { + // 防止重复加载 + if (this.isLoadingMore) { + logger.log("[ThemePanel] 正在加载中，跳过"); + return; + } + + // 检查是否还有更多数据 + if (!this.hasMoreData) { + logger.log("[ThemePanel] 没有更多数据了"); + return; + } + + try { + this.isLoadingMore = true; + this.currentPage++; + + logger.log(`[ThemePanel] 开始加载第 ${this.currentPage} 页推荐数据`); + + const reqData = { + page: this.currentPage, + limit: this.pageLimit, + }; + + const res = await GirlService.I.reqRecommendList(reqData); + + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { + const girlData = DataManager.I.getDataById(DataId.Girl); + + // 追加数据到 GirlData + girlData.addRecommendList(res.data); + + // 检查是否还有更多数据 + const girls = res.data.girls || []; + if (girls.length < this.pageLimit) { + this.hasMoreData = false; + logger.log("[ThemePanel] 已加载所有推荐数据"); + } + + // 渲染新增数据 + this.renderMoreRecommendData(girls.length); + + logger.log( + `[ThemePanel] 第 ${this.currentPage} 页加载完成，新增 ${girls.length} 项` + ); + } else { + logger.warn("[ThemePanel] 加载下一页推荐数据失败:", res); + // 加载失败，回退页码 + this.currentPage--; + } + } catch (error) { + logger.error("[ThemePanel] 加载下一页推荐数据异常:", error); + // 加载失败，回退页码 + this.currentPage--; + } finally { + this.isLoadingMore = false; + } + } + + /** + * 渲染新增的推荐数据 + * @param newCount 新增数据的数量 + */ + private renderMoreRecommendData(newCount: number): void { + if (newCount <= 0) return; + + const girlData = DataManager.I.getDataById(DataId.Girl); + const allGirlIDs = girlData.getRecommendListIds(); + + // 只渲染新增的部分（从末尾开始取 newCount 个） + const startIndex = allGirlIDs.length - newCount; + const newGirlIDs = allGirlIDs.slice(startIndex); + + logger.log(`[ThemePanel] 开始渲染 ${newCount} 个新增推荐项`); + + for (let id of newGirlIDs) { + let newNode = instantiate(this.recItemInst.node); + let item = newNode.getComponent(RecomandItem); + item.init(); + item.refresh(id); + newNode.active = true; + this.recItemCache.push(item); + this.recGirlContent.addChild(newNode); + } + + logger.log(`[ThemePanel] 新增推荐项渲染完成`); } /** @@ -302,6 +446,20 @@ export class ThemePanel extends li_BaseView { GButton.BandClick(this.recomandListBtn, this.openRecomandList, this); GButton.BandClick(this.moreThemeBtn, this.openMoreTheme, this); + // 注册推荐列表滚动事件 + if (this.recomandScrollView) { + this.recomandScrollView.node.on( + "scroll-to-bottom", + this.onRecommendScrollToBottom, + this + ); + this.recomandScrollView.node.on( + "scrolling", + this.onRecommendScrolling, + this + ); + } + Utils.addInnerEL(InnerMsgCode.LanguageChange, this, this.onLanguageChange); Utils.addInnerEL(InnerMsgCode.BalanceChange, this, this.onBalanceChange); Utils.addInnerEL( @@ -394,8 +552,9 @@ export class ThemePanel extends li_BaseView { * 清理缓存节点 */ private clearCache(): void { + // 清理主题缓存 if (this.cache && this.cache.length > 0) { - logger.log(`[ThemePanel] 清理 ${this.cache.length} 个缓存节点`); + logger.log(`[ThemePanel] 清理 ${this.cache.length} 个主题缓存节点`); for (let i = this.cache.length - 1; i >= 0; i--) { if (this.cache[i] && this.cache[i].node && this.cache[i].node.isValid) { this.cache[i].node.destroy(); @@ -403,6 +562,28 @@ export class ThemePanel extends li_BaseView { } this.cache = []; } + + // 清理推荐项缓存 + if (this.recItemCache && this.recItemCache.length > 0) { + logger.log( + `[ThemePanel] 清理 ${this.recItemCache.length} 个推荐项缓存节点` + ); + for (let i = this.recItemCache.length - 1; i >= 0; i--) { + if ( + this.recItemCache[i] && + this.recItemCache[i].node && + this.recItemCache[i].node.isValid + ) { + this.recItemCache[i].node.destroy(); + } + } + this.recItemCache = []; + } + + // 重置推荐列表分页状态 + this.currentPage = 1; + this.hasMoreData = true; + this.isLoadingMore = false; } /** @@ -437,6 +618,20 @@ export class ThemePanel extends li_BaseView { this.isLoading = false; this.loadingPromise = null; + // 移除推荐列表滚动事件监听 + if (this.recomandScrollView) { + this.recomandScrollView.node.off( + "scroll-to-bottom", + this.onRecommendScrollToBottom, + this + ); + this.recomandScrollView.node.off( + "scrolling", + this.onRecommendScrolling, + this + ); + } + // 移除事件监听器（修复回调函数引用问题） Utils.removeInnerEL( InnerMsgCode.LanguageChange, diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index 4bf78a97..3a9a13b9 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -22,6 +22,8 @@ import { DataManager, DataId } from "../data/DataManager"; import { GirlData } from "../data/GirlData"; import { EnvData } from "../data/EnvData"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; +import { GButton } from "../../Main/Common/GButton"; +import { GirlListPanel } from "../ui/panels/GirlListPanel"; const { ccclass, property } = _decorator; @@ -36,6 +38,8 @@ export class GirlListItem extends Component { @property(Node) chatIcon: Node; + @property(Node) + detailBtn: Node; @property(Node) starParent: Node; @@ -68,6 +72,8 @@ export class GirlListItem extends Component { this, this.onLanguageChangeCallback ); + GButton.BandClick(this.chatIcon, this.onClickChat, this); + GButton.BandClick(this.detailBtn, this.onClickDetail, this); } protected onDestroy(): void { @@ -78,8 +84,8 @@ export class GirlListItem extends Component { ); } - baseNode: Node; - refreshData(category: number, girlId: number, baseNode: Node) { + baseNode: GirlListPanel; + refreshData(category: number, girlId: number, baseNode: GirlListPanel) { if (!this.stars) { this.stars = this.starParent.getComponentsInChildren(Sprite); } @@ -92,17 +98,8 @@ export class GirlListItem extends Component { this.nameKey = girlData.getGrilName(this.category.toString(), this.id); this.girlName.string = LanguageUtils.getText(this.nameKey); this.tagKey = girlData.getGrilTagKey(this.category.toString(), this.id); - // let desc = ""; - // const tags = LanguageUtils.getText(this.tagKey).split("|"); - // for (let i = 0; i < tags.length; i++) { - // if (i != 0) desc += "|"; - // desc += tags[i]; - // } + this.tags.string = LanguageUtils.getText(this.tagKey); - let priceType = girlData.getGrilPriceType( - this.category.toString(), - this.id - ); this.starParent.active = true; this.chatIcon.active = true; @@ -115,7 +112,7 @@ export class GirlListItem extends Component { //listAvatarPath = listAvatarPath.replace("Avatar", "avatar"); //临时 ResManager.I.changeRemoteSpriteFrame(this.avatar, newPath, () => { let sizeTran = this.avatar.node.parent.getComponent(UITransform); - Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.avatar.node, 2); + Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.avatar.node, 1); this.loading.active = false; }); @@ -197,6 +194,7 @@ export class GirlListItem extends Component { } else { logger.warn("[GirlListItem] 无法获取当前激活的主页面"); } + this.baseNode.close(); } onClickChat() { diff --git a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts index c7b2e6aa..86384df8 100644 --- a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts @@ -4,6 +4,7 @@ import Utils from "db://assets/Scripts/Main/Common/Utils"; import { NavigationManager, PageTransitionType, + PanelType, } from "../manager/NavigationManager"; import LanguageUtils from "../../Main/Common/LanguageUtils"; import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; @@ -11,6 +12,8 @@ import { DataManager, DataId } from "../data/DataManager"; import { GirlData } from "../data/GirlData"; import { EnvData } from "../data/EnvData"; import { ThemeData } from "../data/ThemeData"; +import { GButton } from "../../Main/Common/GButton"; +import { logger } from "../../Main/Common/Logger"; const { ccclass, property } = _decorator; @@ -28,6 +31,11 @@ export class PastGirlListItem extends Component { @property(Node) starParent: Node; + @property(Node) + chatBtn: Node; + @property(Node) + detailBtn: Node; + stars: Sprite[]; id: number = -1; @@ -55,6 +63,9 @@ export class PastGirlListItem extends Component { this, this.onLanguageChangeCallback ); + + GButton.BandClick(this.chatBtn, this.onClickChat, this); + GButton.BandClick(this.detailBtn, this.onClickDetail, this); } protected onDestroy(): void { @@ -120,7 +131,7 @@ export class PastGirlListItem extends Component { let newPath = envData.cdn + "/" + "Girls/" + avatarPath + ".png"; ResManager.I.changeRemoteSpriteFrame(this.avatar, newPath, () => { let sizeTran = this.avatar.node.parent.getComponent(UITransform); - Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.avatar.node, 2); + Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.avatar.node, 1); }); // 显示星级（好感度） @@ -194,20 +205,48 @@ export class PastGirlListItem extends Component { } } - onClickGirl() { - // 由于都是已解锁的女孩，直接打开聊天面板作为子面板 - // 先设置选中的角色ID - NavigationManager.Instance.setSelectedGirlId(this.id); + onClickDetail() { + const girlData = DataManager.I.getDataById(DataId.Girl); + // 是否已经解锁 - // 通过openSubPanel打开ChatPanel作为子面板 - const chatData = { base: this.baseNode }; - NavigationManager.Instance.openSubPanel( - "ChatPanel", - this.baseNode, - chatData, - { - openAnimation: PageTransitionType.SLIDE_LEFT, - closeAnimation: PageTransitionType.SLIDE_RIGHT, + NavigationManager.Instance.setSelectedGirlId(this.id); + NavigationManager.Instance.setSelectedCategoryId(this.category); + + // 以subpanel方式打开GirlDetailPanel + const currentPanel = NavigationManager.Instance.getCurrentActivePanelNode(); + if (currentPanel) { + NavigationManager.Instance.openSubPanel( + "GirlDetailPanel", + currentPanel, + this.id, + { + openAnimation: PageTransitionType.SLIDE_LEFT, + closeAnimation: PageTransitionType.SLIDE_RIGHT, + hideBasePanel: true, // 隐藏底层panel，实现全屏显示 + } + ); + } else { + logger.warn("[GirlListItem] 无法获取当前激活的主页面"); + } + } + + onClickChat() { + const girlData = DataManager.I.getDataById(DataId.Girl); + + NavigationManager.Instance.setSelectedGirlId(this.id); + NavigationManager.Instance.setSelectedCategoryId( + girlData.getGrilCategoryById(this.id) + ); + + NavigationManager.Instance.switchToPanel( + PanelType.PAST_GIRL_LIST, + false, + (base) => { + const chatData = { girlId: this.id, base: base }; + NavigationManager.Instance.openSubPanel("ChatPanel", base, chatData, { + openAnimation: PageTransitionType.SLIDE_LEFT, + closeAnimation: PageTransitionType.SLIDE_RIGHT, + }); } ); } diff --git a/assets/Scripts/chat18x/uiitems/RecomandItem.ts b/assets/Scripts/chat18x/uiitems/RecomandItem.ts index f66a5876..871907a4 100644 --- a/assets/Scripts/chat18x/uiitems/RecomandItem.ts +++ b/assets/Scripts/chat18x/uiitems/RecomandItem.ts @@ -51,19 +51,31 @@ export class RecomandItem extends Component { this.id = girlId; const girlData = DataManager.I.getDataById(DataId.Girl); const category = girlData.getGrilCategoryById(girlId); - const rectNameKey = girlData.getRecommendGrilName(); - this.girlName.string = LanguageUtils.getText(rectNameKey); - const tagkey = girlData.getGrilTagKey(category.toString(), girlId); - this.tag.string = LanguageUtils.getText(tagkey); + // 数据 + let nameKey = girlData.getGrilName(category.toString(), this.id); + this.girlName.string = LanguageUtils.getText(nameKey); + let tagKey = girlData.getGrilTagKey(category.toString(), this.id); - let avatarPath = girlData.getRecommendGrilAvatar(); + this.tag.string = LanguageUtils.getText(tagKey); - const starCount = girlData.getStar(category.toString(), girlId); + this.heartParent.active = true; + let avatarPath = girlData.getGrilAvatar(category.toString(), this.id); + + const envData = DataManager.I.getDataById(DataId.Env); + let newPath = envData.cdn + "/" + "Girls/" + avatarPath + ".png"; + //listAvatarPath = listAvatarPath.replace("Avatar", "avatar"); //临时 + ResManager.I.changeRemoteSpriteFrame(this.recPic, newPath, () => { + let sizeTran = this.recPic.node.parent.getComponent(UITransform); + Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.recPic.node, 1); + }); + + const star = girlData.getStar(category.toString(), this.id); + logger.log("好感度:" + star); for (let i = 0; i < this.hearts.length; i++) { const element = this.hearts[i]; - if (starCount > i) { + if (star > i) { ResManager.I.changeResourceSpriteFrame( element, "ui/common/heart/heart" @@ -75,14 +87,6 @@ export class RecomandItem extends Component { ); } } - - // 加载远程资源 - const envData = DataManager.I.getDataById(DataId.Env); - let newPath = envData.cdn + "/" + "Girls/" + avatarPath + ".png"; - ResManager.I.changeRemoteSpriteFrame(this.recPic, newPath, () => { - let sizeTran = this.recPic.node.parent.getComponent(UITransform); - Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.recPic.node, 1); - }); } chatToHer() { const girlData = DataManager.I.getDataById(DataId.Girl); diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index 669752f7..48301860 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -25,26 +25,26 @@ "__id__": 22 }, { - "__id__": 337 + "__id__": 345 } ], "_active": true, "_components": [ { - "__id__": 348 + "__id__": 356 }, { - "__id__": 350 + "__id__": 358 }, { - "__id__": 352 + "__id__": 360 }, { - "__id__": 354 + "__id__": 362 } ], "_prefab": { - "__id__": 356 + "__id__": 364 }, "_lpos": { "__type__": "cc.Vec3", @@ -519,23 +519,23 @@ "__id__": 23 }, { - "__id__": 284 + "__id__": 292 } ], "_active": true, "_components": [ { - "__id__": 330 + "__id__": 338 }, { - "__id__": 332 + "__id__": 340 }, { - "__id__": 334 + "__id__": 342 } ], "_prefab": { - "__id__": 336 + "__id__": 344 }, "_lpos": { "__type__": "cc.Vec3", @@ -582,20 +582,20 @@ "_active": true, "_components": [ { - "__id__": 275 + "__id__": 283 }, { - "__id__": 277 + "__id__": 285 }, { - "__id__": 279 + "__id__": 287 }, { - "__id__": 281 + "__id__": 289 } ], "_prefab": { - "__id__": 283 + "__id__": 291 }, "_lpos": { "__type__": "cc.Vec3", @@ -642,20 +642,20 @@ "_active": true, "_components": [ { - "__id__": 266 + "__id__": 274 }, { - "__id__": 268 + "__id__": 276 }, { - "__id__": 270 + "__id__": 278 }, { - "__id__": 272 + "__id__": 280 } ], "_prefab": { - "__id__": 274 + "__id__": 282 }, "_lpos": { "__type__": "cc.Vec3", @@ -699,23 +699,23 @@ "__id__": 26 }, { - "__id__": 163 + "__id__": 171 } ], "_active": true, "_components": [ { - "__id__": 259 + "__id__": 267 }, { - "__id__": 261 + "__id__": 269 }, { - "__id__": 263 + "__id__": 271 } ], "_prefab": { - "__id__": 265 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -762,14 +762,14 @@ "_active": true, "_components": [ { - "__id__": 158 + "__id__": 166 }, { - "__id__": 160 + "__id__": 168 } ], "_prefab": { - "__id__": 162 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -822,26 +822,29 @@ "__id__": 70 }, { - "__id__": 110 + "__id__": 80 }, { - "__id__": 137 + "__id__": 118 + }, + { + "__id__": 145 } ], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 159 }, { - "__id__": 153 + "__id__": 161 }, { - "__id__": 155 + "__id__": 163 } ], "_prefab": { - "__id__": 157 + "__id__": 165 }, "_lpos": { "__type__": "cc.Vec3", @@ -1881,6 +1884,222 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "Starsbg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 27 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 71 + }, + { + "__id__": 73 + }, + { + "__id__": 75 + }, + { + "__id__": 77 + } + ], + "_prefab": { + "__id__": 79 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -316.756, + "y": 40.64100000000002, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": { + "__id__": 72 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 304, + "height": 54 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "89A6UmhdNH/IcJh7yOS6pl" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": { + "__id__": 74 + }, + "_alignFlags": 16, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 170.007, + "_bottom": 0, + "_horizontalCenter": -164.75599999999997, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c8X2apFFNEs7QU0R6rhteH" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": { + "__id__": 76 + }, + "_resizeMode": 0, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 10.2, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 4.5, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4bAhe52JxIY5RIKTI1YttJ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": { + "__id__": 78 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "884ca568-6950-4e59-be5e-ffefb31ec9dd@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "30bsKXYTtM5p1/VZcu6wwB" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "54otGrwjJMS5aNXu0e5s73", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "Stars", @@ -1891,38 +2110,35 @@ }, "_children": [ { - "__id__": 71 + "__id__": 81 }, { - "__id__": 77 + "__id__": 87 }, { - "__id__": 83 + "__id__": 93 }, { - "__id__": 89 + "__id__": 99 }, { - "__id__": 95 + "__id__": 105 } ], "_active": true, "_components": [ { - "__id__": 101 + "__id__": 111 }, { - "__id__": 103 + "__id__": 113 }, { - "__id__": 105 - }, - { - "__id__": 107 + "__id__": 115 } ], "_prefab": { - "__id__": 109 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", @@ -1959,20 +2175,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 82 }, { - "__id__": 74 + "__id__": 84 } ], "_prefab": { - "__id__": 76 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -2009,11 +2225,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 83 }, "_contentSize": { "__type__": "cc.Size", @@ -2037,11 +2253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 85 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2095,20 +2311,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 78 + "__id__": 88 }, { - "__id__": 80 + "__id__": 90 } ], "_prefab": { - "__id__": 82 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -2145,11 +2361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 77 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 89 }, "_contentSize": { "__type__": "cc.Size", @@ -2173,11 +2389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 77 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 91 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2231,20 +2447,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 94 }, { - "__id__": 86 + "__id__": 96 } ], "_prefab": { - "__id__": 88 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -2281,11 +2497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -2309,11 +2525,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 97 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2367,20 +2583,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 100 }, { - "__id__": 92 + "__id__": 102 } ], "_prefab": { - "__id__": 94 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -2417,11 +2633,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -2445,11 +2661,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 103 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2503,20 +2719,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 106 }, { - "__id__": 98 + "__id__": 108 } ], "_prefab": { - "__id__": 100 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -2553,11 +2769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", @@ -2581,11 +2797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 109 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2639,11 +2855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 112 }, "_contentSize": { "__type__": "cc.Size", @@ -2667,11 +2883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 114 }, "_alignFlags": 16, "_target": null, @@ -2703,11 +2919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 116 }, "_resizeMode": 0, "_layoutType": 1, @@ -2735,51 +2951,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "60CiXfblBBO45c17oeZQLh" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": { - "__id__": 108 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "884ca568-6950-4e59-be5e-ffefb31ec9dd@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "73hh2N9L1Hw7QVtRLlNk2V" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -2803,29 +2974,29 @@ }, "_children": [ { - "__id__": 111 + "__id__": 119 }, { - "__id__": 119 + "__id__": 127 } ], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 135 }, { - "__id__": 129 + "__id__": 137 }, { - "__id__": 131 + "__id__": 139 }, { - "__id__": 134 + "__id__": 142 } ], "_prefab": { - "__id__": 136 + "__id__": 144 }, "_lpos": { "__type__": "cc.Vec3", @@ -2862,194 +3033,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 110 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 112 - }, - { - "__id__": 114 - }, - { - "__id__": 116 - } - ], - "_prefab": { "__id__": 118 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 35.501, - "y": 1.933, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 111 - }, - "_enabled": true, - "__prefab": { - "__id__": 113 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 134.065625, - "height": 81.13399999999999 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3cPD1Osp9J0qua5HginsgA" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 111 - }, - "_enabled": true, - "__prefab": { - "__id__": 115 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 191, - "g": 61, - "b": 216, - "a": 255 - }, - "_string": "Send\nMessage", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 33, - "_fontSize": 38, - "_fontFamily": "Arial", - "_lineHeight": 35.9, - "_overflow": 2, - "_enableWrapText": true, - "_font": { - "__uuid__": "52af39e6-df78-413a-88bb-72dfdca7ec84", - "__expectedType__": "cc.TTFFont" - }, - "_isSystemFontUsed": false, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": false, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6dv7LTj8VEw761XsL5ZLd1" - }, - { - "__type__": "d7e4fOii5xNLqH2PF6de4pP", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 111 - }, - "_enabled": true, - "__prefab": { - "__id__": 117 - }, - "languageKey": "girldetailpanel.chatbtn", - "defaultText": "", - "autoUpdate": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9buKYIsGdL4rzTKYt4XpvY" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "06jLQq9y1EiYCkIXl0LrXt", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "sendMsgText-001", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 110 - }, "_children": [], "_active": true, "_components": [ @@ -3068,8 +3053,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 32.900999999999954, - "y": 3.4329999999999927, + "x": 35.501, + "y": 1.933, "z": 0 }, "_lrot": { @@ -3121,7 +3106,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9d/9shXXVKVZMq8YlBlwYl" + "fileId": "3cPD1Osp9J0qua5HginsgA" }, { "__type__": "cc.Label", @@ -3138,6 +3123,192 @@ "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 191, + "g": 61, + "b": 216, + "a": 255 + }, + "_string": "Send\nMessage", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 32, + "_fontSize": 31.5, + "_fontFamily": "Arial", + "_lineHeight": 29.8, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "52af39e6-df78-413a-88bb-72dfdca7ec84", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6dv7LTj8VEw761XsL5ZLd1" + }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 119 + }, + "_enabled": true, + "__prefab": { + "__id__": 125 + }, + "languageKey": "girldetailpanel.chatbtn", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9buKYIsGdL4rzTKYt4XpvY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "06jLQq9y1EiYCkIXl0LrXt", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "sendMsgText-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 118 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 128 + }, + { + "__id__": 130 + }, + { + "__id__": 132 + } + ], + "_prefab": { + "__id__": 134 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 32.900999999999954, + "y": 3.4329999999999927, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 127 + }, + "_enabled": true, + "__prefab": { + "__id__": 129 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 134.065625, + "height": 81.13399999999999 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9d/9shXXVKVZMq8YlBlwYl" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 127 + }, + "_enabled": true, + "__prefab": { + "__id__": 131 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", "r": 255, @@ -3148,10 +3319,10 @@ "_string": "Send\nMessage", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 33, - "_fontSize": 38, + "_actualFontSize": 32, + "_fontSize": 31.5, "_fontFamily": "Arial", - "_lineHeight": 35.9, + "_lineHeight": 29.8, "_overflow": 2, "_enableWrapText": true, "_font": { @@ -3200,11 +3371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 133 }, "languageKey": "girldetailpanel.chatbtn", "defaultText": "", @@ -3234,11 +3405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 136 }, "_contentSize": { "__type__": "cc.Size", @@ -3262,11 +3433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 138 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3307,15 +3478,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 140 }, "clickEvents": [ { - "__id__": 133 + "__id__": 141 } ], "_interactable": true, @@ -3355,7 +3526,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 110 + "__id__": 118 }, "_id": "" }, @@ -3379,11 +3550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 143 }, "_alignFlags": 42, "_target": null, @@ -3432,20 +3603,20 @@ }, "_children": [ { - "__id__": 138 + "__id__": 146 } ], "_active": true, "_components": [ { - "__id__": 146 + "__id__": 154 }, { - "__id__": 148 + "__id__": 156 } ], "_prefab": { - "__id__": 150 + "__id__": 158 }, "_lpos": { "__type__": "cc.Vec3", @@ -3482,23 +3653,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 137 + "__id__": 145 }, "_children": [], "_active": true, "_components": [ { - "__id__": 139 + "__id__": 147 }, { - "__id__": 141 + "__id__": 149 }, { - "__id__": 143 + "__id__": 151 } ], "_prefab": { - "__id__": 145 + "__id__": 153 }, "_lpos": { "__type__": "cc.Vec3", @@ -3535,11 +3706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 138 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", @@ -3563,11 +3734,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 138 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 150 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3634,11 +3805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 138 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 152 }, "_alignFlags": 45, "_target": null, @@ -3683,11 +3854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", @@ -3711,11 +3882,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 157 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3773,7 +3944,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 160 }, "_contentSize": { "__type__": "cc.Size", @@ -3801,7 +3972,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 154 + "__id__": 162 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3846,7 +4017,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 156 + "__id__": 164 }, "_alignFlags": 41, "_target": null, @@ -3895,7 +4066,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 167 }, "_contentSize": { "__type__": "cc.Size", @@ -3923,7 +4094,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 161 + "__id__": 169 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3981,26 +4152,26 @@ }, "_children": [ { - "__id__": 164 + "__id__": 172 }, { - "__id__": 244 + "__id__": 252 } ], "_active": true, "_components": [ { - "__id__": 252 + "__id__": 260 }, { - "__id__": 254 + "__id__": 262 }, { - "__id__": 256 + "__id__": 264 } ], "_prefab": { - "__id__": 258 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -4037,30 +4208,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 163 + "__id__": 171 }, "_children": [ { - "__id__": 165 + "__id__": 173 }, { - "__id__": 171 + "__id__": 179 }, { - "__id__": 205 + "__id__": 213 } ], "_active": true, "_components": [ { - "__id__": 239 + "__id__": 247 }, { - "__id__": 241 + "__id__": 249 } ], "_prefab": { - "__id__": 243 + "__id__": 251 }, "_lpos": { "__type__": "cc.Vec3", @@ -4097,20 +4268,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 164 + "__id__": 172 }, "_children": [], "_active": true, "_components": [ { - "__id__": 166 + "__id__": 174 }, { - "__id__": 168 + "__id__": 176 } ], "_prefab": { - "__id__": 170 + "__id__": 178 }, "_lpos": { "__type__": "cc.Vec3", @@ -4147,11 +4318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 175 }, "_contentSize": { "__type__": "cc.Size", @@ -4175,11 +4346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 173 }, "_enabled": false, "__prefab": { - "__id__": 169 + "__id__": 177 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4233,33 +4404,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 164 + "__id__": 172 }, "_children": [ { - "__id__": 172 + "__id__": 180 }, { - "__id__": 184 + "__id__": 192 } ], "_active": true, "_components": [ { - "__id__": 196 + "__id__": 204 }, { - "__id__": 198 + "__id__": 206 }, { - "__id__": 200 + "__id__": 208 }, { - "__id__": 202 + "__id__": 210 } ], "_prefab": { - "__id__": 204 + "__id__": 212 }, "_lpos": { "__type__": "cc.Vec3", @@ -4296,24 +4467,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 171 + "__id__": 179 }, "_children": [ { - "__id__": 173 + "__id__": 181 } ], "_active": true, "_components": [ { - "__id__": 179 + "__id__": 187 }, { - "__id__": 181 + "__id__": 189 } ], "_prefab": { - "__id__": 183 + "__id__": 191 }, "_lpos": { "__type__": "cc.Vec3", @@ -4350,20 +4521,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 172 + "__id__": 180 }, "_children": [], "_active": true, "_components": [ { - "__id__": 174 + "__id__": 182 }, { - "__id__": 176 + "__id__": 184 } ], "_prefab": { - "__id__": 178 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -4400,11 +4571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -4428,11 +4599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4486,11 +4657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 172 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", @@ -4514,11 +4685,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 172 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 190 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4572,24 +4743,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 171 + "__id__": 179 }, "_children": [ { - "__id__": 185 + "__id__": 193 } ], "_active": true, "_components": [ { - "__id__": 191 + "__id__": 199 }, { - "__id__": 193 + "__id__": 201 } ], "_prefab": { - "__id__": 195 + "__id__": 203 }, "_lpos": { "__type__": "cc.Vec3", @@ -4626,20 +4797,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 192 }, "_children": [], "_active": true, "_components": [ { - "__id__": 186 + "__id__": 194 }, { - "__id__": 188 + "__id__": 196 } ], "_prefab": { - "__id__": 190 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -4676,11 +4847,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -4704,11 +4875,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 197 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4762,11 +4933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -4790,11 +4961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4848,11 +5019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 205 }, "_contentSize": { "__type__": "cc.Size", @@ -4876,11 +5047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 207 }, "_alignFlags": 5, "_target": null, @@ -4912,17 +5083,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 209 }, "selectedSprite": { - "__id__": 193 + "__id__": 201 }, "unSelectedSprite": { - "__id__": 181 + "__id__": 189 }, "_id": "" }, @@ -4936,11 +5107,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 211 }, "clickEvents": [], "_interactable": true, @@ -5005,33 +5176,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 164 + "__id__": 172 }, "_children": [ { - "__id__": 206 + "__id__": 214 }, { - "__id__": 218 + "__id__": 226 } ], "_active": true, "_components": [ { - "__id__": 230 + "__id__": 238 }, { - "__id__": 232 + "__id__": 240 }, { - "__id__": 234 + "__id__": 242 }, { - "__id__": 236 + "__id__": 244 } ], "_prefab": { - "__id__": 238 + "__id__": 246 }, "_lpos": { "__type__": "cc.Vec3", @@ -5068,24 +5239,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 205 + "__id__": 213 }, "_children": [ { - "__id__": 207 + "__id__": 215 } ], "_active": true, "_components": [ { - "__id__": 213 + "__id__": 221 }, { - "__id__": 215 + "__id__": 223 } ], "_prefab": { - "__id__": 217 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -5122,20 +5293,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 206 + "__id__": 214 }, "_children": [], "_active": true, "_components": [ { - "__id__": 208 + "__id__": 216 }, { - "__id__": 210 + "__id__": 218 } ], "_prefab": { - "__id__": 212 + "__id__": 220 }, "_lpos": { "__type__": "cc.Vec3", @@ -5172,11 +5343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -5200,11 +5371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 219 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5258,11 +5429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 222 }, "_contentSize": { "__type__": "cc.Size", @@ -5286,11 +5457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 224 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5344,24 +5515,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 205 + "__id__": 213 }, "_children": [ { - "__id__": 219 + "__id__": 227 } ], "_active": true, "_components": [ { - "__id__": 225 + "__id__": 233 }, { - "__id__": 227 + "__id__": 235 } ], "_prefab": { - "__id__": 229 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -5398,20 +5569,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 218 + "__id__": 226 }, "_children": [], "_active": true, "_components": [ { - "__id__": 220 + "__id__": 228 }, { - "__id__": 222 + "__id__": 230 } ], "_prefab": { - "__id__": 224 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -5448,11 +5619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 229 }, "_contentSize": { "__type__": "cc.Size", @@ -5476,11 +5647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 231 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5534,11 +5705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", @@ -5562,11 +5733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5620,11 +5791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -5648,11 +5819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 241 }, "_alignFlags": 5, "_target": null, @@ -5684,17 +5855,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 243 }, "selectedSprite": { - "__id__": 227 + "__id__": 235 }, "unSelectedSprite": { - "__id__": 215 + "__id__": 223 }, "_id": "" }, @@ -5708,11 +5879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 245 }, "clickEvents": [], "_interactable": true, @@ -5777,11 +5948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 248 }, "_contentSize": { "__type__": "cc.Size", @@ -5805,11 +5976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 250 }, "_id": "" }, @@ -5836,23 +6007,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 163 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ { - "__id__": 245 + "__id__": 253 }, { - "__id__": 247 + "__id__": 255 }, { - "__id__": 249 + "__id__": 257 } ], "_prefab": { - "__id__": 251 + "__id__": 259 }, "_lpos": { "__type__": "cc.Vec3", @@ -5889,11 +6060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 244 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 254 }, "_contentSize": { "__type__": "cc.Size", @@ -5917,11 +6088,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 244 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 256 }, "_resizeMode": 1, "_layoutType": 3, @@ -5955,11 +6126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 244 + "__id__": 252 }, "_enabled": false, "__prefab": { - "__id__": 250 + "__id__": 258 }, "_alignFlags": 40, "_target": null, @@ -6004,11 +6175,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 261 }, "_contentSize": { "__type__": "cc.Size", @@ -6032,11 +6203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 263 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6077,11 +6248,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 265 }, "_resizeMode": 1, "_layoutType": 2, @@ -6132,7 +6303,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", @@ -6160,7 +6331,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 270 }, "_alignFlags": 41, "_target": null, @@ -6196,7 +6367,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 272 }, "_resizeMode": 1, "_layoutType": 2, @@ -6247,7 +6418,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", @@ -6275,7 +6446,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 277 }, "_type": 0, "_inverted": false, @@ -6297,7 +6468,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 279 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6343,7 +6514,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 281 }, "_alignFlags": 45, "_target": null, @@ -6392,7 +6563,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", @@ -6420,7 +6591,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 278 + "__id__": 286 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6465,7 +6636,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 288 }, "bounceDuration": 0.23, "brake": 0.75, @@ -6496,7 +6667,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 290 }, "_alignFlags": 45, "_target": null, @@ -6545,35 +6716,35 @@ }, "_children": [ { - "__id__": 285 + "__id__": 293 }, { - "__id__": 291 + "__id__": 299 }, { - "__id__": 297 + "__id__": 305 } ], "_active": true, "_components": [ - { - "__id__": 319 - }, - { - "__id__": 321 - }, - { - "__id__": 323 - }, - { - "__id__": 325 - }, { "__id__": 327 + }, + { + "__id__": 329 + }, + { + "__id__": 331 + }, + { + "__id__": 333 + }, + { + "__id__": 335 } ], "_prefab": { - "__id__": 329 + "__id__": 337 }, "_lpos": { "__type__": "cc.Vec3", @@ -6610,20 +6781,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 284 + "__id__": 292 }, "_children": [], "_active": true, "_components": [ { - "__id__": 286 + "__id__": 294 }, { - "__id__": 288 + "__id__": 296 } ], "_prefab": { - "__id__": 290 + "__id__": 298 }, "_lpos": { "__type__": "cc.Vec3", @@ -6660,11 +6831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 285 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 295 }, "_contentSize": { "__type__": "cc.Size", @@ -6688,11 +6859,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 285 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 297 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6746,20 +6917,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 284 + "__id__": 292 }, "_children": [], "_active": true, "_components": [ { - "__id__": 292 + "__id__": 300 }, { - "__id__": 294 + "__id__": 302 } ], "_prefab": { - "__id__": 296 + "__id__": 304 }, "_lpos": { "__type__": "cc.Vec3", @@ -6796,11 +6967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 301 }, "_contentSize": { "__type__": "cc.Size", @@ -6824,11 +6995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 303 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6882,33 +7053,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 284 + "__id__": 292 }, "_children": [ { - "__id__": 298 + "__id__": 306 }, { - "__id__": 304 + "__id__": 312 } ], "_active": true, "_components": [ { - "__id__": 310 + "__id__": 318 }, { - "__id__": 312 + "__id__": 320 }, { - "__id__": 314 + "__id__": 322 }, { - "__id__": 316 + "__id__": 324 } ], "_prefab": { - "__id__": 318 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", @@ -6945,20 +7116,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 297 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 299 + "__id__": 307 }, { - "__id__": 301 + "__id__": 309 } ], "_prefab": { - "__id__": 303 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -6995,11 +7166,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 308 }, "_contentSize": { "__type__": "cc.Size", @@ -7023,11 +7194,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 310 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7081,20 +7252,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 297 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 305 + "__id__": 313 }, { - "__id__": 307 + "__id__": 315 } ], "_prefab": { - "__id__": 309 + "__id__": 317 }, "_lpos": { "__type__": "cc.Vec3", @@ -7131,11 +7302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 304 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 314 }, "_contentSize": { "__type__": "cc.Size", @@ -7159,11 +7330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 304 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 316 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7240,11 +7411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 319 }, "_contentSize": { "__type__": "cc.Size", @@ -7268,11 +7439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 321 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7313,11 +7484,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 323 }, "_alignFlags": 12, "_target": null, @@ -7349,11 +7520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 305 }, "_enabled": false, "__prefab": { - "__id__": 317 + "__id__": 325 }, "_resizeMode": 0, "_layoutType": 1, @@ -7400,11 +7571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 328 }, "_contentSize": { "__type__": "cc.Size", @@ -7428,11 +7599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 330 }, "clickEvents": [], "_interactable": true, @@ -7472,7 +7643,7 @@ "_duration": 0.1, "_zoomScale": 0.95, "_target": { - "__id__": 284 + "__id__": 292 }, "_id": "" }, @@ -7486,23 +7657,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 332 }, "img": { - "__id__": 288 + "__id__": 296 }, "video": { - "__id__": 294 + "__id__": 302 }, "priceFrame": { - "__id__": 297 + "__id__": 305 }, "videoPrice": { - "__id__": 307 + "__id__": 315 }, "_id": "" }, @@ -7516,11 +7687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 334 }, "_type": 3, "_inverted": false, @@ -7538,11 +7709,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 336 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7600,7 +7771,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 339 }, "_contentSize": { "__type__": "cc.Size", @@ -7628,7 +7799,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 333 + "__id__": 341 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7673,7 +7844,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 343 }, "_alignFlags": 45, "_target": null, @@ -7724,20 +7895,20 @@ "_active": true, "_components": [ { - "__id__": 338 + "__id__": 346 }, { - "__id__": 340 + "__id__": 348 }, { - "__id__": 342 + "__id__": 350 }, { - "__id__": 345 + "__id__": 353 } ], "_prefab": { - "__id__": 347 + "__id__": 355 }, "_lpos": { "__type__": "cc.Vec3", @@ -7774,11 +7945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -7802,11 +7973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 349 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7847,15 +8018,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 351 }, "clickEvents": [ { - "__id__": 344 + "__id__": 352 } ], "_interactable": true, @@ -7895,7 +8066,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 337 + "__id__": 345 }, "_id": "" }, @@ -7919,11 +8090,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 346 + "__id__": 354 }, "_alignFlags": 9, "_target": null, @@ -7972,7 +8143,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 357 }, "_contentSize": { "__type__": "cc.Size", @@ -8000,7 +8171,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 359 }, "_alignFlags": 45, "_target": null, @@ -8036,7 +8207,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 361 }, "_id": "" }, @@ -8054,7 +8225,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 355 + "__id__": 363 }, "m_rootNode": null, "videoArea": { @@ -8064,13 +8235,13 @@ "__id__": 40 }, "imgToggle": { - "__id__": 200 + "__id__": 208 }, "videoToggle": { - "__id__": 234 + "__id__": 242 }, "starParent": { - "__id__": 70 + "__id__": 80 }, "tags": { "__id__": 65 @@ -8079,22 +8250,22 @@ "__id__": 49 }, "desc": { - "__id__": 141 + "__id__": 149 }, "chatBtn": { - "__id__": 110 + "__id__": 118 }, "descContent": { "__id__": 22 }, "imgItemInst": { - "__id__": 323 + "__id__": 331 }, "imgsLayout": { - "__id__": 244 + "__id__": 252 }, "sendMsgText": { - "__id__": 111 + "__id__": 119 }, "_id": "" }, @@ -8111,6 +8282,7 @@ "__id__": 0 }, "fileId": "24mSBg+Z9OS5KNS5Yscqr0", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/GirlListPanel.prefab b/assets/bundles/Chat18x/GirlListPanel.prefab index 17cef3cc..842dd39e 100644 --- a/assets/bundles/Chat18x/GirlListPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPanel.prefab @@ -3027,6 +3027,9 @@ "chatIcon": { "__id__": 114 }, + "detailBtn": { + "__id__": 106 + }, "starParent": { "__id__": 70 }, diff --git a/assets/bundles/Chat18x/Image/Theme/1001.png b/assets/bundles/Chat18x/Image/Theme/1001.png index f16b3bd5..49a834d3 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1001.png and b/assets/bundles/Chat18x/Image/Theme/1001.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1001.png.meta b/assets/bundles/Chat18x/Image/Theme/1001.png.meta index 9417a6df..c3dc7506 100644 --- a/assets/bundles/Chat18x/Image/Theme/1001.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1001.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 444, - "height": 330, - "rawWidth": 444, - "rawHeight": 330, + "width": 319, + "height": 220, + "rawWidth": 319, + "rawHeight": 220, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -222, - -165, + -159.5, + -110, 0, - 222, - -165, + 159.5, + -110, 0, - -222, - 165, + -159.5, + 110, 0, - 222, - 165, + 159.5, + 110, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 330, - 444, - 330, + 220, + 319, + 220, 0, 0, - 444, + 319, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -222, - -165, + -159.5, + -110, 0 ], "maxPos": [ - 222, - 165, + 159.5, + 110, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1002.png b/assets/bundles/Chat18x/Image/Theme/1002.png index 4bdd1755..ef55892e 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1002.png and b/assets/bundles/Chat18x/Image/Theme/1002.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1002.png.meta b/assets/bundles/Chat18x/Image/Theme/1002.png.meta index 0db8ffbb..1003da10 100644 --- a/assets/bundles/Chat18x/Image/Theme/1002.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1002.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 444, - "height": 330, - "rawWidth": 444, - "rawHeight": 330, + "width": 319, + "height": 220, + "rawWidth": 319, + "rawHeight": 220, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -222, - -165, + -159.5, + -110, 0, - 222, - -165, + 159.5, + -110, 0, - -222, - 165, + -159.5, + 110, 0, - 222, - 165, + 159.5, + 110, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 330, - 444, - 330, + 220, + 319, + 220, 0, 0, - 444, + 319, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -222, - -165, + -159.5, + -110, 0 ], "maxPos": [ - 222, - 165, + 159.5, + 110, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1003.png b/assets/bundles/Chat18x/Image/Theme/1003.png index 8b6aa4ed..e8a93d04 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1003.png and b/assets/bundles/Chat18x/Image/Theme/1003.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1003.png.meta b/assets/bundles/Chat18x/Image/Theme/1003.png.meta index 2e9db948..2e51cd3d 100644 --- a/assets/bundles/Chat18x/Image/Theme/1003.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1003.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 444, - "height": 330, - "rawWidth": 444, - "rawHeight": 330, + "width": 319, + "height": 220, + "rawWidth": 319, + "rawHeight": 220, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -222, - -165, + -159.5, + -110, 0, - 222, - -165, + 159.5, + -110, 0, - -222, - 165, + -159.5, + 110, 0, - 222, - 165, + 159.5, + 110, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 330, - 444, - 330, + 220, + 319, + 220, 0, 0, - 444, + 319, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -222, - -165, + -159.5, + -110, 0 ], "maxPos": [ - 222, - 165, + 159.5, + 110, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1004.png b/assets/bundles/Chat18x/Image/Theme/1004.png index 8be86e08..d3b61a07 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1004.png and b/assets/bundles/Chat18x/Image/Theme/1004.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1004.png.meta b/assets/bundles/Chat18x/Image/Theme/1004.png.meta index 09711144..c00f01e1 100644 --- a/assets/bundles/Chat18x/Image/Theme/1004.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1004.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 444, - "height": 329, - "rawWidth": 444, - "rawHeight": 329, + "width": 319, + "height": 220, + "rawWidth": 319, + "rawHeight": 220, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -222, - -164.5, + -159.5, + -110, 0, - 222, - -164.5, + 159.5, + -110, 0, - -222, - 164.5, + -159.5, + 110, 0, - 222, - 164.5, + 159.5, + 110, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 329, - 444, - 329, + 220, + 319, + 220, 0, 0, - 444, + 319, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -222, - -164.5, + -159.5, + -110, 0 ], "maxPos": [ - 222, - 164.5, + 159.5, + 110, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1005.png b/assets/bundles/Chat18x/Image/Theme/1005.png index 6a6224f8..9225f2c6 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1005.png and b/assets/bundles/Chat18x/Image/Theme/1005.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1005.png.meta b/assets/bundles/Chat18x/Image/Theme/1005.png.meta index 3bcf5664..6ae8ed6e 100644 --- a/assets/bundles/Chat18x/Image/Theme/1005.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1005.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 444, - "height": 327, - "rawWidth": 444, - "rawHeight": 327, + "width": 319, + "height": 220, + "rawWidth": 319, + "rawHeight": 220, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -222, - -163.5, + -159.5, + -110, 0, - 222, - -163.5, + 159.5, + -110, 0, - -222, - 163.5, + -159.5, + 110, 0, - 222, - 163.5, + 159.5, + 110, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 327, - 444, - 327, + 220, + 319, + 220, 0, 0, - 444, + 319, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -222, - -163.5, + -159.5, + -110, 0 ], "maxPos": [ - 222, - 163.5, + 159.5, + 110, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1006.png b/assets/bundles/Chat18x/Image/Theme/1006.png index 462c2504..65b4e19a 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1006.png and b/assets/bundles/Chat18x/Image/Theme/1006.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1006.png.meta b/assets/bundles/Chat18x/Image/Theme/1006.png.meta index 862bfdb5..9ce6a558 100644 --- a/assets/bundles/Chat18x/Image/Theme/1006.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1006.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 444, - "height": 329, - "rawWidth": 444, - "rawHeight": 329, + "width": 319, + "height": 220, + "rawWidth": 319, + "rawHeight": 220, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -222, - -164.5, + -159.5, + -110, 0, - 222, - -164.5, + 159.5, + -110, 0, - -222, - 164.5, + -159.5, + 110, 0, - 222, - 164.5, + 159.5, + 110, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 329, - 444, - 329, + 220, + 319, + 220, 0, 0, - 444, + 319, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -222, - -164.5, + -159.5, + -110, 0 ], "maxPos": [ - 222, - 164.5, + 159.5, + 110, 0 ] }, diff --git a/assets/bundles/Chat18x/PastGirlListPanel.prefab b/assets/bundles/Chat18x/PastGirlListPanel.prefab index 7842a754..aad60fff 100644 --- a/assets/bundles/Chat18x/PastGirlListPanel.prefab +++ b/assets/bundles/Chat18x/PastGirlListPanel.prefab @@ -25,20 +25,20 @@ "_active": true, "_components": [ { - "__id__": 190 + "__id__": 200 }, { - "__id__": 192 + "__id__": 202 }, { - "__id__": 194 + "__id__": 204 }, { - "__id__": 196 + "__id__": 206 } ], "_prefab": { - "__id__": 198 + "__id__": 208 }, "_lpos": { "__type__": "cc.Vec3", @@ -82,23 +82,23 @@ "__id__": 3 }, { - "__id__": 139 + "__id__": 149 } ], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 193 }, { - "__id__": 185 + "__id__": 195 }, { - "__id__": 187 + "__id__": 197 } ], "_prefab": { - "__id__": 189 + "__id__": 199 }, "_lpos": { "__type__": "cc.Vec3", @@ -145,20 +145,20 @@ "_active": true, "_components": [ { - "__id__": 130 + "__id__": 140 }, { - "__id__": 132 + "__id__": 142 }, { - "__id__": 134 + "__id__": 144 }, { - "__id__": 136 + "__id__": 146 } ], "_prefab": { - "__id__": 138 + "__id__": 148 }, "_lpos": { "__type__": "cc.Vec3", @@ -208,20 +208,20 @@ "_active": true, "_components": [ { - "__id__": 121 + "__id__": 131 }, { - "__id__": 123 + "__id__": 133 }, { - "__id__": 125 + "__id__": 135 }, { - "__id__": 127 + "__id__": 137 } ], "_prefab": { - "__id__": 129 + "__id__": 139 }, "_lpos": { "__type__": "cc.Vec3", @@ -638,20 +638,20 @@ "__id__": 24 }, { - "__id__": 110 + "__id__": 120 } ], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 126 }, { - "__id__": 118 + "__id__": 128 } ], "_prefab": { - "__id__": 120 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", @@ -711,16 +711,19 @@ }, { "__id__": 101 + }, + { + "__id__": 109 } ], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 117 } ], "_prefab": { - "__id__": 109 + "__id__": 119 }, "_lpos": { "__type__": "cc.Vec3", @@ -2530,10 +2533,13 @@ }, { "__id__": 104 + }, + { + "__id__": 106 } ], "_prefab": { - "__id__": 106 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -2637,6 +2643,62 @@ "__type__": "cc.CompPrefabInfo", "fileId": "15bvwd0d5HmalSCKDMfaNx" }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 101 + }, + "_enabled": true, + "__prefab": { + "__id__": 107 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 0, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "06nslvNYNH65cg9n7c0mLT" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2650,6 +2712,192 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "detailBtn", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 24 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 110 + }, + { + "__id__": 112 + }, + { + "__id__": 114 + } + ], + "_prefab": { + "__id__": 116 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 109 + }, + "_enabled": true, + "__prefab": { + "__id__": 111 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 690, + "height": 180 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "85MUsweIVK5L3FFtT0TEZ1" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 109 + }, + "_enabled": true, + "__prefab": { + "__id__": 113 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "535aLc925HuqW9jtjkssz2" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 109 + }, + "_enabled": true, + "__prefab": { + "__id__": 115 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 0, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f0kGWHBNdKv4Bh/VqTRN1V" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c3K4m/IMJG94t8ShUriO9C", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -2660,7 +2908,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 118 }, "_contentSize": { "__type__": "cc.Size", @@ -2703,14 +2951,14 @@ "_active": true, "_components": [ { - "__id__": 111 + "__id__": 121 }, { - "__id__": 113 + "__id__": 123 } ], "_prefab": { - "__id__": 115 + "__id__": 125 }, "_lpos": { "__type__": "cc.Vec3", @@ -2747,11 +2995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 120 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 122 }, "_contentSize": { "__type__": "cc.Size", @@ -2775,11 +3023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 120 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 124 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2860,7 +3108,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 127 }, "_contentSize": { "__type__": "cc.Size", @@ -2888,7 +3136,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 129 }, "avatar": { "__id__": 35 @@ -2900,11 +3148,17 @@ "__id__": 54 }, "lastChatTime": { - "__id__": 113 + "__id__": 123 }, "starParent": { "__id__": 65 }, + "chatBtn": { + "__id__": 101 + }, + "detailBtn": { + "__id__": 109 + }, "_id": "" }, { @@ -2934,7 +3188,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 132 }, "_contentSize": { "__type__": "cc.Size", @@ -2962,7 +3216,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 124 + "__id__": 134 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3007,7 +3261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 136 }, "bounceDuration": 0.23, "brake": 0.75, @@ -3038,7 +3292,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 138 }, "_alignFlags": 45, "_target": null, @@ -3087,7 +3341,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 141 }, "_contentSize": { "__type__": "cc.Size", @@ -3115,7 +3369,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 143 }, "_alignFlags": 45, "_target": null, @@ -3151,7 +3405,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 145 }, "_type": 0, "_inverted": false, @@ -3173,7 +3427,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 147 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3232,26 +3486,26 @@ }, "_children": [ { - "__id__": 140 + "__id__": 150 }, { - "__id__": 148 + "__id__": 158 } ], "_active": true, "_components": [ { - "__id__": 176 + "__id__": 186 }, { - "__id__": 178 + "__id__": 188 }, { - "__id__": 180 + "__id__": 190 } ], "_prefab": { - "__id__": 182 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -3288,23 +3542,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 149 }, "_children": [], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 151 }, { - "__id__": 143 + "__id__": 153 }, { - "__id__": 145 + "__id__": 155 } ], "_prefab": { - "__id__": 147 + "__id__": 157 }, "_lpos": { "__type__": "cc.Vec3", @@ -3341,11 +3595,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 152 }, "_contentSize": { "__type__": "cc.Size", @@ -3369,11 +3623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 154 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3414,11 +3668,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 156 }, "_alignFlags": 4, "_target": null, @@ -3463,21 +3717,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 149 }, "_children": [ { - "__id__": 149 + "__id__": 159 } ], "_active": true, "_components": [ { - "__id__": 173 + "__id__": 183 } ], "_prefab": { - "__id__": 175 + "__id__": 185 }, "_lpos": { "__type__": "cc.Vec3", @@ -3514,30 +3768,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 148 + "__id__": 158 }, "_children": [ { - "__id__": 150 + "__id__": 160 }, { - "__id__": 158 + "__id__": 168 } ], "_active": true, "_components": [ { - "__id__": 166 + "__id__": 176 }, { - "__id__": 168 + "__id__": 178 }, { - "__id__": 170 + "__id__": 180 } ], "_prefab": { - "__id__": 172 + "__id__": 182 }, "_lpos": { "__type__": "cc.Vec3", @@ -3574,23 +3828,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 149 + "__id__": 159 }, "_children": [], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 161 }, { - "__id__": 153 + "__id__": 163 }, { - "__id__": 155 + "__id__": 165 } ], "_prefab": { - "__id__": 157 + "__id__": 167 }, "_lpos": { "__type__": "cc.Vec3", @@ -3627,11 +3881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -3655,11 +3909,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3723,11 +3977,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 166 }, "languageKey": "themepanel.more", "defaultText": "", @@ -3757,23 +4011,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 149 + "__id__": 159 }, "_children": [], "_active": true, "_components": [ { - "__id__": 159 + "__id__": 169 }, { - "__id__": 161 + "__id__": 171 }, { - "__id__": 163 + "__id__": 173 } ], "_prefab": { - "__id__": 165 + "__id__": 175 }, "_lpos": { "__type__": "cc.Vec3", @@ -3810,11 +4064,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 170 }, "_contentSize": { "__type__": "cc.Size", @@ -3838,11 +4092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 172 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3883,11 +4137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 168 }, "_enabled": false, "__prefab": { - "__id__": 164 + "__id__": 174 }, "_alignFlags": 4, "_target": null, @@ -3932,11 +4186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 159 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -3960,11 +4214,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 159 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4028,11 +4282,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 159 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 181 }, "languageKey": "themepanel.more", "defaultText": "", @@ -4062,11 +4316,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 184 }, "_contentSize": { "__type__": "cc.Size", @@ -4103,11 +4357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 149 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 187 }, "_contentSize": { "__type__": "cc.Size", @@ -4131,11 +4385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 149 }, "_enabled": false, "__prefab": { - "__id__": 179 + "__id__": 189 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4176,11 +4430,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 149 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 191 }, "_alignFlags": 41, "_target": null, @@ -4229,7 +4483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 194 }, "_contentSize": { "__type__": "cc.Size", @@ -4257,7 +4511,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 196 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4302,7 +4556,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 198 }, "_alignFlags": 45, "_target": null, @@ -4351,7 +4605,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -4379,7 +4633,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 203 }, "_alignFlags": 45, "_target": null, @@ -4415,7 +4669,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 205 }, "_id": "" }, @@ -4433,7 +4687,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 207 }, "m_rootNode": null, "_id": "" @@ -4451,7 +4705,6 @@ "__id__": 0 }, "fileId": "50O8GAOyNKI4WyeNDAmUoh", - "instance": null, - "targetOverrides": null + "targetOverrides": [] } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index 5ed6791e..a2443b24 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -2020,6 +2020,8 @@ "__id__": 0 }, "fileId": "1fB4ecWkhGQ4x6XhJQdNjH", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -3350,7 +3352,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -70.58100000000002, + "y": -52.21500000000002, "z": 0 }, "_lrot": { @@ -4535,7 +4537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 621.9, + "y": 603.5339999999999, "z": 0 }, "_lrot": { @@ -6766,7 +6768,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 730, - "height": 1243.8 + "height": 1207.068 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6911,7 +6913,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 730, - "height": 1243.8 + "height": 1207.068 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7064,7 +7066,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1243.8 + "height": 1207.068 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7138,8 +7140,8 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 248.68099999999998, - "_bottom": 107.519, + "_top": 248.68100000000004, + "_bottom": 144.25099999999992, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -7205,7 +7207,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -70.58100000000002, + "y": -52.21500000000002, "z": 0 }, "_lrot": { @@ -8008,7 +8010,7 @@ "_actualFontSize": 25, "_fontSize": 24, "_fontFamily": "Arial", - "_lineHeight": 18.1, + "_lineHeight": 31.1, "_overflow": 2, "_enableWrapText": true, "_font": { @@ -9686,7 +9688,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1243.8 + "height": 1207.068 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9831,7 +9833,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1243.8 + "height": 1207.068 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9906,7 +9908,7 @@ "elastic": true, "inertia": true, "horizontal": false, - "vertical": false, + "vertical": true, "cancelInnerEvents": true, "scrollEvents": [], "_content": { @@ -9984,7 +9986,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1243.8 + "height": 1207.068 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10059,7 +10061,7 @@ "_left": 0, "_right": 0, "_top": 248.68099999999998, - "_bottom": 107.519, + "_bottom": 144.25099999999998, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true,