diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts index 57e99563..355cc419 100644 --- a/assets/Scripts/chat18x/manager/NavigationManager.ts +++ b/assets/Scripts/chat18x/manager/NavigationManager.ts @@ -1,7 +1,7 @@ import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import { UITransitionHelper } from "../utils/UITransitionHelper"; import GameRootUI from "../../Main/Common/GameRootUI"; -import { Node } from "cc"; +import { Node, sys } from "cc"; import li_EventManager from "../../Main/Common/li_EventManager"; import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; import { ThemePanel } from "../ui/panels/ThemePanel"; @@ -55,12 +55,14 @@ export class NavigationManager { private currentVisiblePanel: Node = null; // 选中的角色相关信息 - private selectedGirlId: number = 1; // 当前选中的角色ID - private selectedThemeId: number = 1; // 当前选中的主题ID + private selectedGirlId: number = 10002; // 当前选中的角色ID + private selectedCategoryId: number = -1; // 当前选中的主题ID private themePanel: ThemePanel = null; private girlListPanel: GirlListPanel = null; + private static LastSelectGirlID = "LastSelectGirlID"; + /** * 获取NavigationManager的单例实例 * @@ -70,6 +72,21 @@ export class NavigationManager { public static get Instance(): NavigationManager { if (!this._instance) { this._instance = new NavigationManager(); + + //初始化默认选的girl + let cacheGirlId = sys.localStorage.getItem(this.LastSelectGirlID); + if (!cacheGirlId) { + cacheGirlId = 10002; + sys.localStorage.setItem(this.LastSelectGirlID, cacheGirlId); + } + this._instance.selectedGirlId = Number(cacheGirlId); + + let cacheCategoryId = sys.localStorage.getItem("LastSelectCategoryId"); + if (!cacheCategoryId) { + cacheCategoryId = 0; + sys.localStorage.setItem("LastSelectCategoryId", cacheCategoryId); + } + this._instance.selectedCategoryId = cacheCategoryId; } return this._instance; } @@ -101,6 +118,10 @@ export class NavigationManager { */ public switchToPanel(panelType: PanelType, force: boolean = false): void { if (this.currentActivePanel === panelType && !force) { + if (panelType === PanelType.THEME) { + this.girlListPanel.hide(); + } + return; } @@ -361,6 +382,7 @@ export class NavigationManager { */ public setSelectedGirlId(girlId: number): void { this.selectedGirlId = girlId; + sys.localStorage.setItem(NavigationManager.LastSelectGirlID, girlId); console.log("[NavigationManager] Selected girl ID set to:", girlId); } @@ -377,7 +399,7 @@ export class NavigationManager { * @param themeId 主题ID */ public setSelectedCategoryId(themeId: number): void { - this.selectedThemeId = themeId; + this.selectedCategoryId = themeId; console.log("[NavigationManager] Selected theme ID set to:", themeId); } @@ -385,8 +407,8 @@ export class NavigationManager { * 获取当前选中的主题ID * @returns 当前选中的主题ID */ - public getSelectedThemeId(): number { - return this.selectedThemeId; + public getSelectedCategoryId(): number { + return this.selectedCategoryId; } /** @@ -418,7 +440,7 @@ export class NavigationManager { if (existingGirlListPanel) { // 如果面板已存在，重新显示并刷新数据 console.log("[NavigationManager] Reactivating existing GirlListPanel"); - this.reactivateGirlListPanel(existingGirlListPanel, themeId); + this.reactivateGirlListPanel(existingGirlListPanel); } else { // 如果面板不存在，创建新的 console.log("[NavigationManager] Creating new GirlListPanel"); @@ -451,7 +473,7 @@ export class NavigationManager { /** * 重新激活已存在的GirlListPanel */ - private reactivateGirlListPanel(panel: GirlListPanel, themeId: number): void { + private reactivateGirlListPanel(panel: GirlListPanel): void { try { // 重新激活面板 panel.node.active = true; @@ -460,10 +482,10 @@ export class NavigationManager { //const girlListComponent = panelNode.getComponent("GirlListPanel"); if (panel) { // 如果有刷新方法，调用它来更新主题数据 - panel.refresh(themeId); + panel.refresh(); console.log( "[NavigationManager] GirlListPanel reactivated with theme:", - themeId + this.selectedCategoryId ); } diff --git a/assets/Scripts/chat18x/ui/items/NavigationBtn.ts b/assets/Scripts/chat18x/ui/items/NavigationBtn.ts new file mode 100644 index 00000000..f97fbc1e --- /dev/null +++ b/assets/Scripts/chat18x/ui/items/NavigationBtn.ts @@ -0,0 +1,20 @@ +import { _decorator, Component, Node, SpringJoint2D, Sprite } from "cc"; +const { ccclass, property } = _decorator; + +@ccclass("NavigationBtn") +export class NavigationBtn extends Component { + focus: Node; + unfocus: Node; + + start() { + this.focus = this.node.getChildByName("focus"); + this.unfocus = this.node.getChildByName("unfocus"); + } + + setFocus(focus: boolean) { + if (!this.focus) this.focus = this.node.getChildByName("focus"); + if (!this.unfocus) this.unfocus = this.node.getChildByName("unfocus"); + this.focus.active = focus; + this.unfocus.active = !focus; + } +} diff --git a/assets/Scripts/chat18x/ui/items/NavigationBtn.ts.meta b/assets/Scripts/chat18x/ui/items/NavigationBtn.ts.meta new file mode 100644 index 00000000..9b8bd69e --- /dev/null +++ b/assets/Scripts/chat18x/ui/items/NavigationBtn.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "54ca6f08-c166-47ca-a969-6a7cb141f29a", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts index d33d97ce..f99d24e0 100644 --- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts @@ -25,12 +25,14 @@ import { ImagePopup } from "../components/ImagePopup"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import LanguageUtils from "../../../Main/Common/LanguageUtils"; import { UITransitionHelper } from "../../utils/UITransitionHelper"; -import { VideoEmotion, purchase } from "../../../schema/schema"; +import { PriceType, VideoEmotion, purchase } from "../../../schema/schema"; import { PayToTalkSubpanel } from "./PayToTalkSubpanel"; import { DataId, DataManager } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; import { SceneBgVideoLayer } from "../../../Sub/UI/SceneBgVideoLayer"; import { NavigationManager, PanelType } from "../../manager/NavigationManager"; +import { GirlService } from "../../network/services/GirlService"; +import proto from "db://assets/Scripts/proto/proto.pb.js"; const { ccclass, property } = _decorator; @ccclass("ChatPanel") @@ -143,15 +145,33 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { this.chatController = null; } } - refresh() { + async refresh() { const newRoleId = NavigationManager.Instance.getSelectedGirlId(); + const girlData = DataManager.I.getDataById(DataId.Girl); // 检查是否是切换角色 const isRoleSwitch = this.id && this.id !== newRoleId; this.id = newRoleId; this.categoryId = - NavigationManager.Instance.getSelectedThemeId().toString(); + 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) { + //未解锁 + ViewManager.I.openBundlesPopupView("GirlListPopupPanel", { + base: this, + category: this.categoryId, + id: this.id, + }); + return; + } // 获取ChatController单例并绑定当前Panel this.chatController = ChatController.Instance; @@ -177,9 +197,19 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { } } - const girlData = DataManager.I.getDataById(DataId.Girl); - this.nameKey = girlData.getGrilName(this.categoryId, this.id); + if (this.nameKey == "") { + const reqData = { + id: this.id, + }; + let res = await GirlService.I.reqGetGirlDetail(reqData); + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { + // 保存数据 + girlData.setGirlDetailData(this.categoryId.toString(), res.data); + this.nameKey = girlData.getGrilName(this.categoryId, this.id); + } + } + this.girlName.string = LanguageUtils.getText(this.nameKey); // 通过ChatController获取商业视频数据 diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index 12db56d2..1390c291 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -137,7 +137,7 @@ export class GirlDetailPanel extends li_BaseView { category: number; async refresh() { this.id = NavigationManager.Instance.getSelectedGirlId(); - + this.category = NavigationManager.Instance.getSelectedCategoryId(); this.imgItemInst.node.active = false; this.videoAreaPos = new Vec3(540, 1384); @@ -162,7 +162,6 @@ export class GirlDetailPanel extends li_BaseView { } const girlData = DataManager.I.getDataById(DataId.Girl); - this.category = girlData.getGrilCategoryById(this.id); // 请求详细数据 const reqData = { id: this.id, diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts index c38ab6bf..bdcabb36 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts @@ -30,25 +30,13 @@ export class GirlListPanel extends li_BaseView { category: number; private parentPanelName: string = null; - openUIDataCT(data) { - console.log("[GirlListPanel] openUIDataCT called with data:", data); - - // 支持新的数据格式：既可以是单纯的数字，也可以是包含主题ID和父页面信息的对象 - if (typeof data === "object") { - this.category = data.themeId; - this.parentPanelName = data.parentPanel; - console.log("[GirlListPanel] Set parent panel:", this.parentPanelName); - } else { - this.category = data; - } - } onLoadCT() { Utils.parseNode(this.node, this._nodeTab); this.registerListener(); this.itemInst = this._nodeTab.BubbleItem.getComponent(GirlListItem); this.itemInst.node.active = false; this.content = this._nodeTab.content; - this.refresh(this.category); + this.refresh(); } cacheCategory: number = -1; @@ -68,7 +56,7 @@ export class GirlListPanel extends li_BaseView { } } } - + // 没有可复用的节点，创建新节点 let newNode = instantiate(this.itemInst.node); let item = newNode.getComponent(GirlListItem); @@ -88,7 +76,8 @@ export class GirlListPanel extends li_BaseView { } } - async refresh(category: number) { + async refresh() { + const category = NavigationManager.Instance.getSelectedCategoryId(); if (category == this.cacheCategory) return; this.cacheCategory = category; @@ -119,7 +108,7 @@ export class GirlListPanel extends li_BaseView { item.refreshData(category, id, this.node); item.node.active = true; this.cache.push(item); - + // 确保节点在 content 中（可能已经在了） if (item.node.parent !== this.content) { this.content.addChild(item.node); @@ -156,7 +145,7 @@ export class GirlListPanel extends li_BaseView { } } this.cache = []; - + // 清理 content 中所有的 GirlListItem 节点 for (let i = this.content.children.length - 1; i >= 0; i--) { let child = this.content.children[i]; diff --git a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts index c99c0803..ce7dd7dc 100644 --- a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts @@ -2,11 +2,8 @@ import { _decorator, Component, Label, Node } from "cc"; import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView"; import Utils from "db://assets/Scripts/Main/Common/Utils"; import { GButton } from "db://assets/Scripts/Main/Common/GButton"; -import { - NavigationManager, - PanelType, -} from "../../manager/NavigationManager"; - +import { NavigationManager, PanelType } from "../../manager/NavigationManager"; +import { NavigationBtn } from "../items/NavigationBtn"; const { ccclass, property } = _decorator; @@ -15,20 +12,21 @@ export class NavigationPanel extends li_BaseView { private _nodeTab: any = {}; private currentActivePanel: PanelType = PanelType.THEME; - private themeBtn: Node; - private girlDetailBtn: Node; - private chatBtn: Node; - private settingBtn: Node; + private themeBtn: NavigationBtn; + private girlDetailBtn: NavigationBtn; + private chatBtn: NavigationBtn; + private settingBtn: NavigationBtn; private loadingView: Node; onLoadCT() { Utils.parseNode(this.node, this._nodeTab); - this.themeBtn = this._nodeTab.themeBtn; - this.girlDetailBtn = this._nodeTab.girlDetailBtn; - this.chatBtn = this._nodeTab.chatBtn; - this.settingBtn = this._nodeTab.settingBtn; + this.themeBtn = this._nodeTab.themeBtn.getComponent(NavigationBtn); + this.girlDetailBtn = + this._nodeTab.girlDetailBtn.getComponent(NavigationBtn); + this.chatBtn = this._nodeTab.chatBtn.getComponent(NavigationBtn); + this.settingBtn = this._nodeTab.settingBtn.getComponent(NavigationBtn); this.loadingView = this._nodeTab.loadingView; this.hideLoading(); @@ -46,22 +44,24 @@ export class NavigationPanel extends li_BaseView { private registerListener() { // 所有按钮点击都通过NavigationManager处理 GButton.BandClick( - this.themeBtn, - () => NavigationManager.Instance.switchToPanel(PanelType.THEME), + this.themeBtn.node, + () => { + NavigationManager.Instance.switchToPanel(PanelType.THEME); + }, this ); GButton.BandClick( - this.girlDetailBtn, + this.girlDetailBtn.node, () => NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL), this ); GButton.BandClick( - this.chatBtn, + this.chatBtn.node, () => NavigationManager.Instance.switchToPanel(PanelType.CHAT), this ); GButton.BandClick( - this.settingBtn, + this.settingBtn.node, () => NavigationManager.Instance.switchToPanel(PanelType.SETTING), this ); @@ -75,6 +75,7 @@ export class NavigationPanel extends li_BaseView { this.currentActivePanel = activePanel; this._nodeTab.CurrentPanel.getComponent(Label).string = this.currentActivePanel; + this.refreshButtonVisuals(); } @@ -88,6 +89,13 @@ export class NavigationPanel extends li_BaseView { "[NavigationPanel] Button states updated for:", this.currentActivePanel ); + + this.themeBtn.setFocus(this.currentActivePanel === PanelType.THEME); + this.girlDetailBtn.setFocus( + this.currentActivePanel === PanelType.GIRL_DETAIL + ); + this.chatBtn.setFocus(this.currentActivePanel === PanelType.CHAT); + this.settingBtn.setFocus(this.currentActivePanel === PanelType.SETTING); } private initializeFirstPanel() { diff --git a/assets/bundles/Chat18x/NavigationPanel.prefab b/assets/bundles/Chat18x/NavigationPanel.prefab index 0861908f..2907bc4d 100644 --- a/assets/bundles/Chat18x/NavigationPanel.prefab +++ b/assets/bundles/Chat18x/NavigationPanel.prefab @@ -25,23 +25,23 @@ "__id__": 32 }, { - "__id__": 106 + "__id__": 138 } ], "_active": true, "_components": [ { - "__id__": 112 + "__id__": 144 }, { - "__id__": 114 + "__id__": 146 }, { - "__id__": 116 + "__id__": 148 } ], "_prefab": { - "__id__": 118 + "__id__": 150 }, "_lpos": { "__type__": "cc.Vec3", @@ -717,32 +717,32 @@ "__id__": 33 }, { - "__id__": 49 - }, - { - "__id__": 65 + "__id__": 57 }, { "__id__": 81 + }, + { + "__id__": 105 } ], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 129 }, { - "__id__": 99 + "__id__": 131 }, { - "__id__": 101 + "__id__": 133 }, { - "__id__": 103 + "__id__": 135 } ], "_prefab": { - "__id__": 105 + "__id__": 137 }, "_lpos": { "__type__": "cc.Vec3", @@ -784,25 +784,31 @@ "_children": [ { "__id__": 34 + }, + { + "__id__": 40 } ], "_active": true, "_components": [ - { - "__id__": 40 - }, - { - "__id__": 42 - }, - { - "__id__": 44 - }, { "__id__": 46 + }, + { + "__id__": 48 + }, + { + "__id__": 50 + }, + { + "__id__": 52 + }, + { + "__id__": 54 } ], "_prefab": { - "__id__": 48 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -835,8 +841,8 @@ }, { "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 512, + "_name": "unfocus", + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 33 @@ -856,8 +862,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 2.842170943040401e-14, + "y": 37.650000000000006, "z": 0 }, "_lrot": { @@ -897,8 +903,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 134.946 + "width": 90, + "height": 90 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -909,10 +915,10 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a3fReHRLRFKaQ32L2c7xkB" + "fileId": "ddYdxmSRpNxr1zGvztTdQA" }, { - "__type__": "cc.Label", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -928,56 +934,33 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, - "_string": "主题", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 50, - "_fontSize": 50, - "_fontFamily": "Arial", - "_lineHeight": 107.1, - "_overflow": 0, - "_enableWrapText": false, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": false, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_spriteFrame": { + "__uuid__": "60f7661e-17db-4c75-93d0-563fed8e2611@f9941", + "__expectedType__": "cc.SpriteFrame" }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { "__type__": "cc.Vec2", - "x": 2, - "y": 2 + "x": 0, + "y": 0 }, - "_shadowBlur": 2, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "28FsFlkddMwoPBe1UdeyBg" + "fileId": "a1+nFDQL5KrbN+kQJskyPt" }, { "__type__": "cc.PrefabInfo", @@ -987,7 +970,143 @@ "asset": { "__id__": 0 }, - "fileId": "1fFSDf7UNFmpofDj5mg1gj", + "fileId": "f19AVO1zBAoJ9PmzC6HZWu", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "focus", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 33 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 41 + }, + { + "__id__": 43 + } + ], + "_prefab": { + "__id__": 45 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 2.842170943040401e-14, + "y": 37.650000000000006, + "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__": 40 + }, + "_enabled": true, + "__prefab": { + "__id__": 42 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e5hd+3fW1C0bqN2lrZezzo" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 40 + }, + "_enabled": true, + "__prefab": { + "__id__": 44 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "891810fb-1dac-4da9-9f9d-054a94194d35@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "67T0N5h4RPQZzWDpozHadM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "04qnbeWeNKRYv0gcsCZCwk", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1002,7 +1121,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -1030,7 +1149,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1042,10 +1161,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1075,7 +1191,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 51 }, "clickEvents": [], "_interactable": true, @@ -1108,22 +1224,10 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 0.9, "_target": { @@ -1145,7 +1249,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 53 }, "_alignFlags": 1, "_target": null, @@ -1171,6 +1275,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "28gsPZcMFKv615Jb9KGm49" }, + { + "__type__": "54ca68IwWZHyqlpanyxQfKa", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 33 + }, + "_enabled": true, + "__prefab": { + "__id__": 55 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e5XCcjIaNGs4nF5dCWWPGM" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1194,26 +1316,32 @@ }, "_children": [ { - "__id__": 50 + "__id__": 58 + }, + { + "__id__": 64 } ], "_active": true, "_components": [ { - "__id__": 56 + "__id__": 70 }, { - "__id__": 58 + "__id__": 72 }, { - "__id__": 60 + "__id__": 74 }, { - "__id__": 62 + "__id__": 76 + }, + { + "__id__": 78 } ], "_prefab": { - "__id__": 64 + "__id__": 80 }, "_lpos": { "__type__": "cc.Vec3", @@ -1246,29 +1374,29 @@ }, { "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 512, + "_name": "unfocus", + "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 49 + "__id__": 57 }, "_children": [], "_active": true, "_components": [ { - "__id__": 51 + "__id__": 59 }, { - "__id__": 53 + "__id__": 61 } ], "_prefab": { - "__id__": 55 + "__id__": 63 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 5.684341886080802e-14, + "y": 37.650000000000006, "z": 0 }, "_lrot": { @@ -1300,16 +1428,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 134.946 + "width": 34, + "height": 90 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1320,75 +1448,52 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2fXV8HUlJB0o1TjztuXtkK" + "fileId": "07iu4G6CVKqq7RCeYr9b+b" }, { - "__type__": "cc.Label", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 62 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, - "_string": "详情", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 50, - "_fontSize": 50, - "_fontFamily": "Arial", - "_lineHeight": 107.1, - "_overflow": 0, - "_enableWrapText": false, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": false, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_spriteFrame": { + "__uuid__": "d18cf3f7-b72f-4fbe-86b1-bb2a09326d4a@f9941", + "__expectedType__": "cc.SpriteFrame" }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { "__type__": "cc.Vec2", - "x": 2, - "y": 2 + "x": 0, + "y": 0 }, - "_shadowBlur": 2, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "11c0dbgvNHjZKJeaG1HG+G" + "fileId": "a0jmvwEixHL6vs3AbtwTHE" }, { "__type__": "cc.PrefabInfo", @@ -1398,7 +1503,143 @@ "asset": { "__id__": 0 }, - "fileId": "cbs78wRu9FNbfcetd+2EO5", + "fileId": "2dNkpVHz5AwIy9UQNwdt78", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "focus", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 57 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 65 + }, + { + "__id__": 67 + } + ], + "_prefab": { + "__id__": 69 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 5.684341886080802e-14, + "y": 37.650000000000006, + "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__": 64 + }, + "_enabled": true, + "__prefab": { + "__id__": 66 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 34, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20E+O9gNZDD57LE00LvlDv" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 64 + }, + "_enabled": true, + "__prefab": { + "__id__": 68 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "d618d70b-7e60-4490-9d0e-fb2703eb36fd@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "92IF0YvO1I856Kc+AFvbKv" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4760EZMQNFd6XEoVAgSWtx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1409,11 +1650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -1437,11 +1678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 73 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1453,10 +1694,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1482,11 +1720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 75 }, "clickEvents": [], "_interactable": true, @@ -1519,26 +1757,14 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 49 + "__id__": 57 }, "_id": "" }, @@ -1552,11 +1778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 77 }, "_alignFlags": 1, "_target": null, @@ -1582,6 +1808,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8byUQtXZFE1LQ5+xkdPcmc" }, + { + "__type__": "54ca68IwWZHyqlpanyxQfKa", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 57 + }, + "_enabled": true, + "__prefab": { + "__id__": 79 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "00ayNUfqNKYKTU7cFZ/d+a" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1605,26 +1849,32 @@ }, "_children": [ { - "__id__": 66 + "__id__": 82 + }, + { + "__id__": 88 } ], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 94 }, { - "__id__": 74 + "__id__": 96 }, { - "__id__": 76 + "__id__": 98 }, { - "__id__": 78 + "__id__": 100 + }, + { + "__id__": 102 } ], "_prefab": { - "__id__": 80 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -1657,420 +1907,9 @@ }, { "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 512, - "__editorExtras__": {}, - "_parent": { - "__id__": 65 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 67 - }, - { - "__id__": 69 - } - ], - "_prefab": { - "__id__": 71 - }, - "_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": "", + "_name": "unfocus", "_objFlags": 0, "__editorExtras__": {}, - "node": { - "__id__": 66 - }, - "_enabled": true, - "__prefab": { - "__id__": 68 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 134.946 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4b7SN60QNE3LloFCVdLXY4" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 66 - }, - "_enabled": true, - "__prefab": { - "__id__": 70 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_string": "聊天", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 50, - "_fontSize": 50, - "_fontFamily": "Arial", - "_lineHeight": 107.1, - "_overflow": 0, - "_enableWrapText": false, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": false, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4fA1po1F9Dp6XNDS/flzKs" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "45xictZdRMgbRP5z0Ifd6V", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 65 - }, - "_enabled": true, - "__prefab": { - "__id__": 73 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 261.8, - "height": 222.3 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "64eQVvfZ1Jd6Txipsnfyos" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 65 - }, - "_enabled": true, - "__prefab": { - "__id__": 75 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "02U6DSKH5Cr5wobecN02TD" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 65 - }, - "_enabled": true, - "__prefab": { - "__id__": 77 - }, - "clickEvents": [], - "_interactable": true, - "_transition": 3, - "_normalColor": { - "__type__": "cc.Color", - "r": 214, - "g": 214, - "b": 214, - "a": 255 - }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_duration": 0.1, - "_zoomScale": 0.9, - "_target": { - "__id__": 65 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1aoq5nNRJAxYARZuF7JJes" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 65 - }, - "_enabled": true, - "__prefab": { - "__id__": 79 - }, - "_alignFlags": 1, - "_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": 0, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1cIXYs0tRAta73qTmOjikZ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "31DFTEsXNKTaX9uocyTrw4", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "settingBtn", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 32 - }, - "_children": [ - { - "__id__": 82 - } - ], - "_active": true, - "_components": [ - { - "__id__": 88 - }, - { - "__id__": 90 - }, - { - "__id__": 92 - }, - { - "__id__": 94 - } - ], - "_prefab": { - "__id__": 96 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 404.09999999999997, - "y": 130.25, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 512, - "__editorExtras__": {}, "_parent": { "__id__": 81 }, @@ -2089,8 +1928,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 1.1368683772161603e-13, + "y": 37.650000000000006, "z": 0 }, "_lrot": { @@ -2130,8 +1969,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 254.499963, - "height": 134.946 + "width": 80, + "height": 70 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2142,10 +1981,10 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2aWdrgVb1JI7F+4Tf1ThFt" + "fileId": "4eFu9FKMNJPIOrmOR/0J7V" }, { - "__type__": "cc.Label", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -2161,56 +2000,33 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, - "_string": "个人信息", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 50, - "_fontSize": 50, - "_fontFamily": "Arial", - "_lineHeight": 107.1, - "_overflow": 2, - "_enableWrapText": false, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": false, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_spriteFrame": { + "__uuid__": "0ba93037-4e1b-4198-a585-ef771a382bb2@f9941", + "__expectedType__": "cc.SpriteFrame" }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { "__type__": "cc.Vec2", - "x": 2, - "y": 2 + "x": 0, + "y": 0 }, - "_shadowBlur": 2, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36CFi18HJAC55WX0Lq0HOU" + "fileId": "09nUK+ekpIwoeu4npFKGGe" }, { "__type__": "cc.PrefabInfo", @@ -2220,7 +2036,143 @@ "asset": { "__id__": 0 }, - "fileId": "04XSzTmvpMIrIwWzL5ZqIG", + "fileId": "d0+tv/OvBKt7dSKvF0BSD3", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "focus", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 81 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 89 + }, + { + "__id__": 91 + } + ], + "_prefab": { + "__id__": 93 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 1.1368683772161603e-13, + "y": 37.650000000000006, + "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__": 88 + }, + "_enabled": true, + "__prefab": { + "__id__": 90 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 70 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "85kE3KIPJJv5kCl6SZ7Z3s" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 88 + }, + "_enabled": true, + "__prefab": { + "__id__": 92 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "71e60e39-7d32-425d-a5c0-b645c80fa780@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d8HYGyqiJAXJ/bkhsPbeeM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "98S56a5EZOfa2Ox4zgJ4fq", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2235,7 +2187,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -2251,7 +2203,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "01vsnV3zNGTZVuhrOhwU4f" + "fileId": "64eQVvfZ1Jd6Txipsnfyos" }, { "__type__": "cc.Sprite", @@ -2263,7 +2215,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 97 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2275,10 +2227,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -2296,7 +2245,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1cJ5NAHu1OMqA6fQ1sf3OK" + "fileId": "02U6DSKH5Cr5wobecN02TD" }, { "__type__": "cc.Button", @@ -2308,7 +2257,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 99 }, "clickEvents": [], "_interactable": true, @@ -2341,22 +2290,10 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 0.9, "_target": { @@ -2364,6 +2301,539 @@ }, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1aoq5nNRJAxYARZuF7JJes" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 81 + }, + "_enabled": true, + "__prefab": { + "__id__": 101 + }, + "_alignFlags": 1, + "_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": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1cIXYs0tRAta73qTmOjikZ" + }, + { + "__type__": "54ca68IwWZHyqlpanyxQfKa", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 81 + }, + "_enabled": true, + "__prefab": { + "__id__": 103 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80fQWcRvRDHZkwf/72DekP" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "31DFTEsXNKTaX9uocyTrw4", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "settingBtn", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 32 + }, + "_children": [ + { + "__id__": 106 + }, + { + "__id__": 112 + } + ], + "_active": true, + "_components": [ + { + "__id__": 118 + }, + { + "__id__": 120 + }, + { + "__id__": 122 + }, + { + "__id__": 124 + }, + { + "__id__": 126 + } + ], + "_prefab": { + "__id__": 128 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 404.09999999999997, + "y": 130.25, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "unfocus", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 105 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 107 + }, + { + "__id__": 109 + } + ], + "_prefab": { + "__id__": 111 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 1.1368683772161603e-13, + "y": 37.650000000000006, + "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__": 106 + }, + "_enabled": true, + "__prefab": { + "__id__": 108 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 65, + "height": 79 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dajjBOSBlFzZSK5PsObRBh" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 106 + }, + "_enabled": true, + "__prefab": { + "__id__": 110 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "d6569937-8612-46e1-b88b-791f8bc28945@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b3BYJxsgBDarasMbBFN/u1" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d2PxErnQZFtqzmLi2gUfux", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "focus", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 105 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 113 + }, + { + "__id__": 115 + } + ], + "_prefab": { + "__id__": 117 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 1.1368683772161603e-13, + "y": 37.650000000000006, + "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__": 112 + }, + "_enabled": true, + "__prefab": { + "__id__": 114 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 65, + "height": 79 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "260r8wxnFKYpDp//1sNF2v" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 112 + }, + "_enabled": true, + "__prefab": { + "__id__": 116 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "ab09e9c6-eed7-4b15-9cdf-689e446ed0f0@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "08qpi8g+lGc45QJ50L68JL" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "01yKWlbsJE0a7Wi3ToRYlJ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 105 + }, + "_enabled": true, + "__prefab": { + "__id__": 119 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 261.8, + "height": 222.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "01vsnV3zNGTZVuhrOhwU4f" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 105 + }, + "_enabled": true, + "__prefab": { + "__id__": 121 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1cJ5NAHu1OMqA6fQ1sf3OK" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 105 + }, + "_enabled": true, + "__prefab": { + "__id__": 123 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 0.9, + "_target": { + "__id__": 105 + }, + "_id": "" + }, { "__type__": "cc.CompPrefabInfo", "fileId": "9ekFivtj9K45kHlrgltNiE" @@ -2374,11 +2844,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 125 }, "_alignFlags": 1, "_target": null, @@ -2404,6 +2874,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "96P+6nTK5Mr48hEvIVKn7N" }, + { + "__type__": "54ca68IwWZHyqlpanyxQfKa", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 105 + }, + "_enabled": true, + "__prefab": { + "__id__": 127 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3fmzp3PqREmJj27JnBdHtR" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2427,7 +2915,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 130 }, "_contentSize": { "__type__": "cc.Size", @@ -2455,16 +2943,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 132 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 33, + "g": 27, + "b": 39, "a": 255 }, "_spriteFrame": { @@ -2500,7 +2988,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 134 }, "_alignFlags": 44, "_target": null, @@ -2536,7 +3024,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 136 }, "_resizeMode": 0, "_layoutType": 1, @@ -2589,14 +3077,14 @@ "_active": true, "_components": [ { - "__id__": 107 + "__id__": 139 }, { - "__id__": 109 + "__id__": 141 } ], "_prefab": { - "__id__": 111 + "__id__": 143 }, "_lpos": { "__type__": "cc.Vec3", @@ -2633,11 +3121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 140 }, "_contentSize": { "__type__": "cc.Size", @@ -2661,11 +3149,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 142 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2746,7 +3234,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 145 }, "_contentSize": { "__type__": "cc.Size", @@ -2774,7 +3262,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 147 }, "_alignFlags": 45, "_target": null, @@ -2810,7 +3298,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 149 }, "m_rootNode": null, "_id": "" diff --git a/assets/resources/ui/navigation.meta b/assets/resources/ui/navigation.meta new file mode 100644 index 00000000..16328bb7 --- /dev/null +++ b/assets/resources/ui/navigation.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "24e74b45-57f5-4184-b05b-e623b8d6c850", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/ui/navigation/chat.png b/assets/resources/ui/navigation/chat.png new file mode 100644 index 00000000..c5bbf244 Binary files /dev/null and b/assets/resources/ui/navigation/chat.png differ diff --git a/assets/resources/ui/navigation/chat.png.meta b/assets/resources/ui/navigation/chat.png.meta new file mode 100644 index 00000000..78474139 --- /dev/null +++ b/assets/resources/ui/navigation/chat.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "71e60e39-7d32-425d-a5c0-b645c80fa780", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "71e60e39-7d32-425d-a5c0-b645c80fa780@6c48a", + "displayName": "chat", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "71e60e39-7d32-425d-a5c0-b645c80fa780", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "71e60e39-7d32-425d-a5c0-b645c80fa780@f9941", + "displayName": "chat", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 80, + "height": 70, + "rawWidth": 80, + "rawHeight": 70, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -40, + -35, + 0, + 40, + -35, + 0, + -40, + 35, + 0, + 40, + 35, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 70, + 80, + 70, + 0, + 0, + 80, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -40, + -35, + 0 + ], + "maxPos": [ + 40, + 35, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "71e60e39-7d32-425d-a5c0-b645c80fa780@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "71e60e39-7d32-425d-a5c0-b645c80fa780@6c48a" + } +} diff --git a/assets/resources/ui/navigation/chat_unfocus.png b/assets/resources/ui/navigation/chat_unfocus.png new file mode 100644 index 00000000..4da3307b Binary files /dev/null and b/assets/resources/ui/navigation/chat_unfocus.png differ diff --git a/assets/resources/ui/navigation/chat_unfocus.png.meta b/assets/resources/ui/navigation/chat_unfocus.png.meta new file mode 100644 index 00000000..865b39a3 --- /dev/null +++ b/assets/resources/ui/navigation/chat_unfocus.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "0ba93037-4e1b-4198-a585-ef771a382bb2", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "0ba93037-4e1b-4198-a585-ef771a382bb2@6c48a", + "displayName": "chat_unfocus", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "0ba93037-4e1b-4198-a585-ef771a382bb2", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "0ba93037-4e1b-4198-a585-ef771a382bb2@f9941", + "displayName": "chat_unfocus", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 80, + "height": 70, + "rawWidth": 80, + "rawHeight": 70, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -40, + -35, + 0, + 40, + -35, + 0, + -40, + 35, + 0, + 40, + 35, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 70, + 80, + 70, + 0, + 0, + 80, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -40, + -35, + 0 + ], + "maxPos": [ + 40, + 35, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0ba93037-4e1b-4198-a585-ef771a382bb2@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "0ba93037-4e1b-4198-a585-ef771a382bb2@6c48a" + } +} diff --git a/assets/resources/ui/navigation/home.png b/assets/resources/ui/navigation/home.png new file mode 100644 index 00000000..753b53c9 Binary files /dev/null and b/assets/resources/ui/navigation/home.png differ diff --git a/assets/resources/ui/navigation/home.png.meta b/assets/resources/ui/navigation/home.png.meta new file mode 100644 index 00000000..28d820f0 --- /dev/null +++ b/assets/resources/ui/navigation/home.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "891810fb-1dac-4da9-9f9d-054a94194d35", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "891810fb-1dac-4da9-9f9d-054a94194d35@6c48a", + "displayName": "home", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "891810fb-1dac-4da9-9f9d-054a94194d35", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "891810fb-1dac-4da9-9f9d-054a94194d35@f9941", + "displayName": "home", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 90, + "height": 90, + "rawWidth": 90, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -45, + -45, + 0, + 45, + -45, + 0, + -45, + 45, + 0, + 45, + 45, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 90, + 90, + 90, + 0, + 0, + 90, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -45, + -45, + 0 + ], + "maxPos": [ + 45, + 45, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "891810fb-1dac-4da9-9f9d-054a94194d35@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "891810fb-1dac-4da9-9f9d-054a94194d35@6c48a" + } +} diff --git a/assets/resources/ui/navigation/home_unfocus.png b/assets/resources/ui/navigation/home_unfocus.png new file mode 100644 index 00000000..d1bb47b7 Binary files /dev/null and b/assets/resources/ui/navigation/home_unfocus.png differ diff --git a/assets/resources/ui/navigation/home_unfocus.png.meta b/assets/resources/ui/navigation/home_unfocus.png.meta new file mode 100644 index 00000000..1e7d22b1 --- /dev/null +++ b/assets/resources/ui/navigation/home_unfocus.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "60f7661e-17db-4c75-93d0-563fed8e2611", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "60f7661e-17db-4c75-93d0-563fed8e2611@6c48a", + "displayName": "home_unfocus", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "60f7661e-17db-4c75-93d0-563fed8e2611", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "60f7661e-17db-4c75-93d0-563fed8e2611@f9941", + "displayName": "home_unfocus", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 90, + "height": 90, + "rawWidth": 90, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -45, + -45, + 0, + 45, + -45, + 0, + -45, + 45, + 0, + 45, + 45, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 90, + 90, + 90, + 0, + 0, + 90, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -45, + -45, + 0 + ], + "maxPos": [ + 45, + 45, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "60f7661e-17db-4c75-93d0-563fed8e2611@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "60f7661e-17db-4c75-93d0-563fed8e2611@6c48a" + } +} diff --git a/assets/resources/ui/navigation/info.png b/assets/resources/ui/navigation/info.png new file mode 100644 index 00000000..dce9dbcb Binary files /dev/null and b/assets/resources/ui/navigation/info.png differ diff --git a/assets/resources/ui/navigation/info.png.meta b/assets/resources/ui/navigation/info.png.meta new file mode 100644 index 00000000..90579cad --- /dev/null +++ b/assets/resources/ui/navigation/info.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "d618d70b-7e60-4490-9d0e-fb2703eb36fd", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "d618d70b-7e60-4490-9d0e-fb2703eb36fd@6c48a", + "displayName": "info", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "d618d70b-7e60-4490-9d0e-fb2703eb36fd", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "d618d70b-7e60-4490-9d0e-fb2703eb36fd@f9941", + "displayName": "info", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 34, + "height": 90, + "rawWidth": 34, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -17, + -45, + 0, + 17, + -45, + 0, + -17, + 45, + 0, + 17, + 45, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 90, + 34, + 90, + 0, + 0, + 34, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -17, + -45, + 0 + ], + "maxPos": [ + 17, + 45, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "d618d70b-7e60-4490-9d0e-fb2703eb36fd@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "d618d70b-7e60-4490-9d0e-fb2703eb36fd@6c48a" + } +} diff --git a/assets/resources/ui/navigation/info_unfocus.png b/assets/resources/ui/navigation/info_unfocus.png new file mode 100644 index 00000000..cdf9b39f Binary files /dev/null and b/assets/resources/ui/navigation/info_unfocus.png differ diff --git a/assets/resources/ui/navigation/info_unfocus.png.meta b/assets/resources/ui/navigation/info_unfocus.png.meta new file mode 100644 index 00000000..6ee9f077 --- /dev/null +++ b/assets/resources/ui/navigation/info_unfocus.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "d18cf3f7-b72f-4fbe-86b1-bb2a09326d4a", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "d18cf3f7-b72f-4fbe-86b1-bb2a09326d4a@6c48a", + "displayName": "info_unfocus", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "d18cf3f7-b72f-4fbe-86b1-bb2a09326d4a", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "d18cf3f7-b72f-4fbe-86b1-bb2a09326d4a@f9941", + "displayName": "info_unfocus", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 34, + "height": 90, + "rawWidth": 34, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -17, + -45, + 0, + 17, + -45, + 0, + -17, + 45, + 0, + 17, + 45, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 90, + 34, + 90, + 0, + 0, + 34, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -17, + -45, + 0 + ], + "maxPos": [ + 17, + 45, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "d18cf3f7-b72f-4fbe-86b1-bb2a09326d4a@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "d18cf3f7-b72f-4fbe-86b1-bb2a09326d4a@6c48a" + } +} diff --git a/assets/resources/ui/navigation/personal.png b/assets/resources/ui/navigation/personal.png new file mode 100644 index 00000000..d308d7a0 Binary files /dev/null and b/assets/resources/ui/navigation/personal.png differ diff --git a/assets/resources/ui/navigation/personal.png.meta b/assets/resources/ui/navigation/personal.png.meta new file mode 100644 index 00000000..8de99251 --- /dev/null +++ b/assets/resources/ui/navigation/personal.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "ab09e9c6-eed7-4b15-9cdf-689e446ed0f0", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "ab09e9c6-eed7-4b15-9cdf-689e446ed0f0@6c48a", + "displayName": "personal", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "ab09e9c6-eed7-4b15-9cdf-689e446ed0f0", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "ab09e9c6-eed7-4b15-9cdf-689e446ed0f0@f9941", + "displayName": "personal", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 65, + "height": 79, + "rawWidth": 65, + "rawHeight": 79, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -32.5, + -39.5, + 0, + 32.5, + -39.5, + 0, + -32.5, + 39.5, + 0, + 32.5, + 39.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 79, + 65, + 79, + 0, + 0, + 65, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -32.5, + -39.5, + 0 + ], + "maxPos": [ + 32.5, + 39.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ab09e9c6-eed7-4b15-9cdf-689e446ed0f0@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "ab09e9c6-eed7-4b15-9cdf-689e446ed0f0@6c48a" + } +} diff --git a/assets/resources/ui/navigation/personal_unfocus.png b/assets/resources/ui/navigation/personal_unfocus.png new file mode 100644 index 00000000..27585fe8 Binary files /dev/null and b/assets/resources/ui/navigation/personal_unfocus.png differ diff --git a/assets/resources/ui/navigation/personal_unfocus.png.meta b/assets/resources/ui/navigation/personal_unfocus.png.meta new file mode 100644 index 00000000..924d00cc --- /dev/null +++ b/assets/resources/ui/navigation/personal_unfocus.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "d6569937-8612-46e1-b88b-791f8bc28945", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "d6569937-8612-46e1-b88b-791f8bc28945@6c48a", + "displayName": "personal_unfocus", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "d6569937-8612-46e1-b88b-791f8bc28945", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "d6569937-8612-46e1-b88b-791f8bc28945@f9941", + "displayName": "personal_unfocus", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 65, + "height": 79, + "rawWidth": 65, + "rawHeight": 79, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -32.5, + -39.5, + 0, + 32.5, + -39.5, + 0, + -32.5, + 39.5, + 0, + 32.5, + 39.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 79, + 65, + 79, + 0, + 0, + 65, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -32.5, + -39.5, + 0 + ], + "maxPos": [ + 32.5, + 39.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "d6569937-8612-46e1-b88b-791f8bc28945@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "d6569937-8612-46e1-b88b-791f8bc28945@6c48a" + } +} diff --git a/xchat_cfg b/xchat_cfg index 40338460..8e114f49 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 4033846049030a80068ffa2ced898e8dad91c30c +Subproject commit 8e114f49a01f6bdf58ca4fa35938eb33856134f5