diff --git a/assets/Scripts/Main/Common/Utils.ts b/assets/Scripts/Main/Common/Utils.ts index 0f21a195..3f535bb0 100644 --- a/assets/Scripts/Main/Common/Utils.ts +++ b/assets/Scripts/Main/Common/Utils.ts @@ -394,14 +394,14 @@ export default class Utils { minutes ); if (days > 0) { - return `${days}${LanguageUtils.getText("purchasepanel.day")}`; + return `${days} ${LanguageUtils.getText("purchasepanel.day")}`; } if (hours > 0) { - return `${hours}${LanguageUtils.getText( + return `${hours} ${LanguageUtils.getText( "purchasepanel.hour" - )}:${minutes}${LanguageUtils.getText("purchasepanel.minute")}`; + )}:${minutes} ${LanguageUtils.getText("purchasepanel.minute")}`; } - return `${minutes}${LanguageUtils.getText("purchasepanel.minute")}`; + return `${minutes} ${LanguageUtils.getText("purchasepanel.minute")}`; } /** diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts index e7926530..fe737ab5 100644 --- a/assets/Scripts/chat18x/manager/NavigationManager.ts +++ b/assets/Scripts/chat18x/manager/NavigationManager.ts @@ -27,7 +27,7 @@ export enum PageTransitionType { */ export enum PanelType { THEME = "ThemePanel", - GIRL_DETAIL = "GirlDetailPanel", + RANK = "RankPanel", PAST_GIRL_LIST = "PastGirlListPanel", PERSONAL = "PersonalPanel", } @@ -49,6 +49,7 @@ export interface SubPanelAnimationConfig { openAnimation: PageTransitionType; closeAnimation: PageTransitionType; duration?: number; + hideBasePanel?: boolean; // 是否隐藏basePanel，用于全屏子面板 } /** @@ -195,6 +196,9 @@ export class NavigationManager { private subPanelAnimationConfigs: Map = new Map(); + // 隐藏的basePanel映射：subPanel -> basePanel + private hiddenBasePanels: Map = new Map(); + // 弹窗管理相关属性 private popupPanels: Set = new Set(); // 管理所有打开的弹窗 @@ -330,9 +334,16 @@ export class NavigationManager { openAnimation: PageTransitionType.SCALE, closeAnimation: PageTransitionType.SCALE, duration: 0.3, + hideBasePanel: false, }; const config = animationConfig || defaultConfig; + // 如果需要隐藏basePanel，在打开动画前隐藏 + if (config.hideBasePanel && basePanel.active) { + logger.log(`[NavigationManager] 隐藏basePanel: ${basePanel.name}`); + basePanel.active = false; + } + const callback = (n: Node) => { if (!n || !n.isValid) { logger.error( @@ -359,6 +370,12 @@ export class NavigationManager { // 存储动画配置 this.subPanelAnimationConfigs.set(n, config); + // 如果配置了隐藏basePanel，记录映射关系 + if (config.hideBasePanel) { + this.hiddenBasePanels.set(n, basePanel); + logger.log(`[NavigationManager] 记录隐藏映射: ${n.name} -> ${basePanel.name}`); + } + // 执行打开动画 this.playSubPanelOpenAnimation(n, config); }; @@ -592,11 +609,22 @@ export class NavigationManager { openAnimation: PageTransitionType.SCALE, closeAnimation: PageTransitionType.SCALE, duration: 0.3, + hideBasePanel: false, }; } // 执行关闭动画 this.playSubPanelCloseAnimation(panelNode, config, () => { + // 如果隐藏了basePanel，需要恢复显示 + if (this.hiddenBasePanels.has(panelNode)) { + const basePanel = this.hiddenBasePanels.get(panelNode); + if (basePanel && basePanel.isValid) { + logger.log(`[NavigationManager] 恢复显示basePanel: ${basePanel.name}`); + basePanel.active = true; + } + this.hiddenBasePanels.delete(panelNode); + } + // 从管理映射中移除 this.removeSubPanelFromMappings(panelNode); @@ -643,6 +671,11 @@ export class NavigationManager { if (this.subPanelAnimationConfigs.has(panelNode)) { this.subPanelAnimationConfigs.delete(panelNode); } + + // 移除隐藏映射 + if (this.hiddenBasePanels.has(panelNode)) { + this.hiddenBasePanels.delete(panelNode); + } } /** @@ -652,7 +685,7 @@ export class NavigationManager { switch (panelType) { case PanelType.THEME: return 0; - case PanelType.GIRL_DETAIL: + case PanelType.RANK: return 1; case PanelType.PAST_GIRL_LIST: return 2; @@ -671,8 +704,8 @@ export class NavigationManager { switch (node.name) { case "ThemePanel": return PanelType.THEME; - case "GirlDetailPanel": - return PanelType.GIRL_DETAIL; + case "RankPanel": + return PanelType.RANK; case "PastGirlListPanel": return PanelType.PAST_GIRL_LIST; case "PersonalPanel": @@ -696,12 +729,8 @@ export class NavigationManager { * 获取面板数据 */ private getPanelData(panelType: PanelType): any { - switch (panelType) { - case PanelType.GIRL_DETAIL: - return this.selectedGirlId; // 使用当前选中的角色ID - default: - return null; - } + // 所有主页面都不需要特殊数据 + return null; } /** diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index 445b6e95..f5ec4023 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -349,7 +349,8 @@ export class GirlDetailPanel extends li_BaseView { } returnBtn() { - NavigationManager.Instance.switchToPanel(PanelType.THEME); + // GirlDetailPanel现在是subpanel，关闭自己即可 + NavigationManager.Instance.closeSubPanel(this); } /** @@ -445,9 +446,9 @@ export class GirlDetailPanel extends li_BaseView { } // 回收所有使用中的节点到对象池 - for (let i = this.imgsLayout.children.length - 1; i >= 0; i--) { - DetailImageItemPool.Instance.put(this.imgsLayout.children[i]); - } + // for (let i = this.imgsLayout.children.length - 1; i >= 0; i--) { + // DetailImageItemPool.Instance.put(this.imgsLayout.children[i]); + // } super.onDestroy(); } diff --git a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts index 28cb5036..475aee10 100644 --- a/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/NavigationPanel.ts @@ -16,7 +16,7 @@ export class NavigationPanel extends li_BaseView { private currentActivePanel: PanelType = PanelType.THEME; private themeBtn: NavigationBtn; - private girlDetailBtn: NavigationBtn; + private rankBtn: NavigationBtn; private pastGirlListBtn: NavigationBtn; private settingBtn: NavigationBtn; @@ -26,8 +26,7 @@ export class NavigationPanel extends li_BaseView { Utils.parseNode(this.node, this._nodeTab); this.themeBtn = this._nodeTab.themeBtn.getComponent(NavigationBtn); - this.girlDetailBtn = - this._nodeTab.girlDetailBtn.getComponent(NavigationBtn); + this.rankBtn = this._nodeTab.rankBtn.getComponent(NavigationBtn); this.pastGirlListBtn = this._nodeTab.chatBtn.getComponent(NavigationBtn); this.settingBtn = this._nodeTab.settingBtn.getComponent(NavigationBtn); this.loadingView = this._nodeTab.loadingView; @@ -54,8 +53,8 @@ export class NavigationPanel extends li_BaseView { this ); GButton.BandClick( - this.girlDetailBtn.node, - () => NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL), + this.rankBtn.node, + () => NavigationManager.Instance.switchToPanel(PanelType.RANK), this ); GButton.BandClick( @@ -108,9 +107,7 @@ export class NavigationPanel extends li_BaseView { ); this.themeBtn.setFocus(this.currentActivePanel === PanelType.THEME); - this.girlDetailBtn.setFocus( - this.currentActivePanel === PanelType.GIRL_DETAIL - ); + this.rankBtn.setFocus(this.currentActivePanel === PanelType.RANK); this.pastGirlListBtn.setFocus( this.currentActivePanel === PanelType.PAST_GIRL_LIST ); diff --git a/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts b/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts index bd257dd4..03293a31 100644 --- a/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PersonalPanel.ts @@ -1,8 +1,4 @@ -import { - _decorator, - Label, - Sprite, -} from "cc"; +import { _decorator, isCCObject, Label, Node, Sprite } from "cc"; import Utils from "../../../Main/Common/Utils"; import li_BaseView from "../../../Main/Common/li_BaseView"; import { GButton } from "../../../Main/Common/GButton"; @@ -10,8 +6,7 @@ import { DataManager, DataId } from "../../data/DataManager"; import { PlayerData } from "../../data/PlayerData"; import { AccountData } from "../../data/AccountData"; import { WalletData } from "../../data/WalletData"; -import LanguageUtils, { -} from "../../../Main/Common/LanguageUtils"; +import LanguageUtils from "../../../Main/Common/LanguageUtils"; import { NavigationManager, PageTransitionType, @@ -19,6 +14,7 @@ import { import { PlayerDataService } from "../../network/services/PlayerDataService"; import proto from "db://assets/Scripts/proto/proto.pb.js"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; +import { TipsPanel } from "./TipsPanel"; const { ccclass, property } = _decorator; @@ -41,6 +37,12 @@ export class PersonalPanel extends li_BaseView { @property(Sprite) private avatarSprite: Sprite = null; + @property([Node]) + private vipStuff: Node[] = []; + + @property([Node]) + private notVipStuff: Node[] = []; + private playerData: PlayerData = null; private accountData: AccountData = null; private walletData: WalletData = null; @@ -79,6 +81,11 @@ export class PersonalPanel extends li_BaseView { if (this._nodeTab.settingBtn) { GButton.BandClick(this._nodeTab.settingBtn, this.openSettings, this); } + + // + if (this._nodeTab.favoritesBtn) { + GButton.BandClick(this._nodeTab.favoritesBtn, this.openFavorites, this); + } } private async refresh() { @@ -125,20 +132,25 @@ export class PersonalPanel extends li_BaseView { } private updateVipStatus(): void { + let isVip = false; if (this.vipStatusLabel && this.walletData) { const vipExpire = this.walletData.vipExpire; - if (vipExpire && vipExpire > Date.now()) { - const expireDate = new Date(vipExpire); - this.vipStatusLabel.string = `${LanguageUtils.getText( - "purchasepanel.vip_left" - )} ${expireDate.toLocaleDateString()}`; + if (vipExpire && this.walletData.isVip) { + const leftTime = Utils.formatVipLeftTime(vipExpire); + + this.vipStatusLabel.string = leftTime; + + isVip = true; } else { - this.vipStatusLabel.string = LanguageUtils.getText( - "purchasepanel.notvip" - ); + // this.vipStatusLabel.string = LanguageUtils.getText( + // "purchasepanel.notvip" + // ); } } + + this.vipStuff.forEach((n) => (n.active = isVip)); + this.notVipStuff.forEach((n) => (n.active = !isVip)); } private openSettings(): void { @@ -156,4 +168,8 @@ export class PersonalPanel extends li_BaseView { } ); } + + private openFavorites() { + TipsPanel.show("敬请期待~"); + } } diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index 889bdb36..a49fb7ae 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -16,7 +16,7 @@ import { NavigationManager } from "../../manager/NavigationManager"; import { Web3PopPanel } from "./Web3PopPanel"; import { TipsPanel } from "./TipsPanel"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; -import { PaymentMethod } from 'db://assets/Scripts/chat18x/payment/types'; +import { PaymentMethod } from "db://assets/Scripts/chat18x/payment/types"; const { ccclass, property } = _decorator; @@ -30,8 +30,6 @@ export class PurchasePanel extends li_BaseView { private vipPrice30: Label; private vipTime30: Label; - private ScrollView: ScrollView; - private currentPayType: proto.cs.EnmPayType = proto.cs.EnmPayType.EPT_Cash_INR; private defaultNetworkType: proto.cs.EnmNetworkType = @@ -44,9 +42,7 @@ export class PurchasePanel extends li_BaseView { } cashBtnSelecting; - cashBtnNotSelect; web3BtnSelecting; - web3BtnNotSelect; base: Node; openUIDataCT(data: any): void { @@ -66,12 +62,8 @@ export class PurchasePanel extends li_BaseView { this.vipPrice30 = this._nodeTab.vipPrice30.getComponent(Label); this.vipTime30 = this._nodeTab.vipTime30.getComponent(Label); - this.ScrollView = this._nodeTab.ScrollView.getComponent(ScrollView); - this.cashBtnSelecting = this._nodeTab.cashBtn.getChildByName("selecting"); - this.cashBtnNotSelect = this._nodeTab.cashBtn.getChildByName("notSelect"); this.web3BtnSelecting = this._nodeTab.web3Btn.getChildByName("selecting"); - this.web3BtnNotSelect = this._nodeTab.web3Btn.getChildByName("notSelect"); this.bandBtn(); @@ -172,7 +164,6 @@ export class PurchasePanel extends li_BaseView { const memberId30 = this.shopData.get30DayMemberId(); const price30 = this.shopData.getOriginalPriceById(memberId30); this.vipPrice30.string = `$ ${price30}`; - this.ScrollView.scrollToBottom(); } // 0:cash 1:web3 @@ -195,7 +186,12 @@ export class PurchasePanel extends li_BaseView { const isRechargeId = shopData.isRechargeId(id); if (isRechargeId) { // 需要外部支付进行购买 - this.startPayment(id, this.currentPayType, networkType, PaymentMethod.CashPay); + this.startPayment( + id, + this.currentPayType, + networkType, + PaymentMethod.CashPay + ); } //测试用 // Utils.sendInnerMsg(InnerMsgCode.PayOrderCreateSucc, { @@ -288,7 +284,12 @@ export class PurchasePanel extends li_BaseView { } // 创建订单 - async startPayment(goodId: number, payType: number, network: number, payMethod: PaymentMethod) { + async startPayment( + goodId: number, + payType: number, + network: number, + payMethod: PaymentMethod + ) { // 请求数据 const reqData = { goodId, @@ -319,15 +320,15 @@ export class PurchasePanel extends li_BaseView { onClickCashBtn() { if (this.curPayType == 0) return; this.curPayType = 0; - this.cashBtnSelecting.active = this.web3BtnNotSelect.active = true; - this.cashBtnNotSelect.active = this.web3BtnSelecting.active = false; + this.cashBtnSelecting.active = true; + this.web3BtnSelecting.active = false; this.updateShops(0); } onClickWeb3Btn() { if (this.curPayType == 1) return; this.curPayType = 1; - this.cashBtnSelecting.active = this.web3BtnNotSelect.active = false; - this.cashBtnNotSelect.active = this.web3BtnSelecting.active = true; + this.cashBtnSelecting.active = false; + this.web3BtnSelecting.active = true; this.updateShops(1); } diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 6c120181..5e57fdb9 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -372,9 +372,7 @@ export class ThemePanel extends li_BaseView { if (leftTime == null) { LanguageUtils.getText("purchasepanel.notvip"); } else { - this.vipLeftTime.string = LanguageUtils.getText( - "purchasepanel.vip_left" - ).replace("${leftTime}", leftTime); + this.vipLeftTime.string = leftTime; } } } diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index 20f8a046..99ba717b 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -10,7 +10,11 @@ import { } from "cc"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import Utils from "db://assets/Scripts/Main/Common/Utils"; -import { NavigationManager, PanelType } from "../manager/NavigationManager"; +import { + NavigationManager, + PanelType, + PageTransitionType, +} from "../manager/NavigationManager"; import { PriceType } from "../../schema/schema"; import LanguageUtils from "../../Main/Common/LanguageUtils"; import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; @@ -172,22 +176,46 @@ export class GirlListItem extends Component { onClickDetail() { const girlData = DataManager.I.getDataById(DataId.Girl); // 是否已经解锁 - const isRelease = girlData.getIsRelease(this.category.toString(), this.id); NavigationManager.Instance.setSelectedGirlId(this.id); + NavigationManager.Instance.setSelectedCategoryId(this.category); - // 通过switchToPanel切换到角色详情面板，保持动画和状态同步 - NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL); + // 以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] 无法获取当前激活的主页面"); + } + } - // if (isRelease) { - // // 先设置选中的角色ID - // } else { - // //未解锁 - // NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", { - // base: this, - // category: this.category, - // id: this.id, - // }); - // } + 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 4cde658a..d1245105 100644 --- a/assets/Scripts/chat18x/uiitems/RecomandItem.ts +++ b/assets/Scripts/chat18x/uiitems/RecomandItem.ts @@ -6,7 +6,12 @@ import { GirlData } from "../data/GirlData"; import LanguageUtils from "../../Main/Common/LanguageUtils"; import ResManager from "../../Main/Manager/ResManager"; import { EnvData } from "../data/EnvData"; -import { NavigationManager, PanelType } from "../manager/NavigationManager"; +import { + NavigationManager, + PanelType, + PageTransitionType, +} from "../manager/NavigationManager"; +import { logger } from "../../Main/Common/Logger"; const { ccclass, property } = _decorator; @ccclass("RecomandItem") @@ -39,7 +44,7 @@ export class RecomandItem extends Component { this.chatBtn = this._nodeTab.chatBtn; GButton.BandClick(this.chatBtn, this.chatToHer, this); - GButton.BandClick(this.chatBtn, this.gotoDetail, this); + GButton.BandClick(this._nodeTab.detailBtn, this.gotoDetail, this); } refresh(girlId: number) { @@ -80,16 +85,42 @@ export class RecomandItem extends Component { NavigationManager.Instance.setSelectedCategoryId( girlData.getGrilCategoryById(this.id) ); - NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL); + + 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, + }); + } + ); } - gotoDetail() - { + gotoDetail() { const girlData = DataManager.I.getDataById(DataId.Girl); NavigationManager.Instance.setSelectedGirlId(this.id); NavigationManager.Instance.setSelectedCategoryId( girlData.getGrilCategoryById(this.id) ); - NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL); + + // 以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("[RecomandItem] 无法获取当前激活的主页面"); + } } } diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index c7eddaaa..669752f7 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -600,7 +600,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 70.79600000000005, + "y": 81.17100000000005, "z": 0 }, "_lrot": { @@ -720,7 +720,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 669.75, + "y": 659.375, "z": 0 }, "_lrot": { @@ -6252,7 +6252,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1339.5 + "height": 1318.75 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6397,7 +6397,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1339.5 + "height": 1318.75 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6502,8 +6502,8 @@ "_target": null, "_left": 0, "_right": 0, - "_top": -20.49599999999998, - "_bottom": 121.096, + "_top": -20.49600000000018, + "_bottom": 141.846, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8111,7 +8111,6 @@ "__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 00f0cc66..44b4e18b 100644 --- a/assets/bundles/Chat18x/GirlListPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPanel.prefab @@ -25,20 +25,20 @@ "_active": true, "_components": [ { - "__id__": 209 + "__id__": 219 }, { - "__id__": 211 + "__id__": 221 }, { - "__id__": 213 + "__id__": 223 }, { - "__id__": 215 + "__id__": 225 } ], "_prefab": { - "__id__": 217 + "__id__": 227 }, "_lpos": { "__type__": "cc.Vec3", @@ -82,23 +82,23 @@ "__id__": 3 }, { - "__id__": 147 + "__id__": 157 } ], "_active": true, "_components": [ { - "__id__": 202 + "__id__": 212 }, { - "__id__": 204 + "__id__": 214 }, { - "__id__": 206 + "__id__": 216 } ], "_prefab": { - "__id__": 208 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -145,20 +145,20 @@ "_active": true, "_components": [ { - "__id__": 138 + "__id__": 148 }, { - "__id__": 140 + "__id__": 150 }, { - "__id__": 142 + "__id__": 152 }, { - "__id__": 144 + "__id__": 154 } ], "_prefab": { - "__id__": 146 + "__id__": 156 }, "_lpos": { "__type__": "cc.Vec3", @@ -202,26 +202,26 @@ "__id__": 5 }, { - "__id__": 111 + "__id__": 121 } ], "_active": true, "_components": [ { - "__id__": 129 + "__id__": 139 }, { - "__id__": 131 + "__id__": 141 }, { - "__id__": 133 + "__id__": 143 }, { - "__id__": 135 + "__id__": 145 } ], "_prefab": { - "__id__": 137 + "__id__": 147 }, "_lpos": { "__type__": "cc.Vec3", @@ -278,19 +278,22 @@ }, { "__id__": 100 - } - ], - "_active": true, - "_components": [ - { - "__id__": 106 }, { "__id__": 108 } ], + "_active": true, + "_components": [ + { + "__id__": 116 + }, + { + "__id__": 118 + } + ], "_prefab": { - "__id__": 110 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -2461,7 +2464,7 @@ }, { "__type__": "cc.Node", - "_name": "chatBtn", + "_name": "detailBtn", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2475,15 +2478,18 @@ }, { "__id__": 103 + }, + { + "__id__": 105 } ], "_prefab": { - "__id__": 105 + "__id__": 107 }, "_lpos": { "__type__": "cc.Vec3", - "x": 240.08799999999997, - "y": -2.285999999999831, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -2521,6 +2527,192 @@ "__prefab": { "__id__": 102 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 690, + "height": 180 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "66f0H5YQBKlKChF958RcUK" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 104 + }, + "_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": "00cGekWdJKrpEsZ5+W6VQf" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 106 + }, + "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": "566RMwaSBNG4gTFm/sLmDL" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2aw0Zyr0NLEJjfGJ03xnTz", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "chatBtn", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 5 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 109 + }, + { + "__id__": 111 + }, + { + "__id__": 113 + } + ], + "_prefab": { + "__id__": 115 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 240.08799999999997, + "y": -2.285999999999831, + "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__": 108 + }, + "_enabled": true, + "__prefab": { + "__id__": 110 + }, "_contentSize": { "__type__": "cc.Size", "width": 100, @@ -2543,11 +2735,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 100 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 112 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2582,6 +2774,62 @@ "__type__": "cc.CompPrefabInfo", "fileId": "9bllo4atpIv5Wps3cztvfv" }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 108 + }, + "_enabled": true, + "__prefab": { + "__id__": 114 + }, + "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": "a2iNkNZjpKn4YNVTkvAvyv" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2605,7 +2853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 117 }, "_contentSize": { "__type__": "cc.Size", @@ -2633,7 +2881,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 119 }, "avatar": { "__id__": 16 @@ -2645,7 +2893,7 @@ "__id__": 59 }, "chatIcon": { - "__id__": 100 + "__id__": 108 }, "starParent": { "__id__": 62 @@ -2682,26 +2930,26 @@ }, "_children": [ { - "__id__": 112 + "__id__": 122 } ], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 130 }, { - "__id__": 122 + "__id__": 132 }, { - "__id__": 124 + "__id__": 134 }, { - "__id__": 126 + "__id__": 136 } ], "_prefab": { - "__id__": 128 + "__id__": 138 }, "_lpos": { "__type__": "cc.Vec3", @@ -2738,23 +2986,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 111 + "__id__": 121 }, "_children": [], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 123 }, { - "__id__": 115 + "__id__": 125 }, { - "__id__": 117 + "__id__": 127 } ], "_prefab": { - "__id__": 119 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -2791,11 +3039,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -2819,11 +3067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 126 }, "_resizeMode": 1, "_layoutType": 2, @@ -2857,11 +3105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 128 }, "_alignFlags": 40, "_target": null, @@ -2906,11 +3154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -2934,11 +3182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 133 }, "_type": 0, "_inverted": false, @@ -2956,11 +3204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 135 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3002,11 +3250,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 137 }, "_alignFlags": 45, "_target": null, @@ -3055,7 +3303,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 140 }, "_contentSize": { "__type__": "cc.Size", @@ -3083,7 +3331,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 132 + "__id__": 142 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3128,7 +3376,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 144 }, "bounceDuration": 0.23, "brake": 0.75, @@ -3139,7 +3387,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 112 + "__id__": 122 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -3159,7 +3407,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 146 }, "_alignFlags": 45, "_target": null, @@ -3208,7 +3456,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 149 }, "_contentSize": { "__type__": "cc.Size", @@ -3236,7 +3484,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 151 }, "_alignFlags": 45, "_target": null, @@ -3272,7 +3520,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 153 }, "_type": 0, "_inverted": false, @@ -3294,7 +3542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 155 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3353,29 +3601,29 @@ }, "_children": [ { - "__id__": 148 + "__id__": 158 }, { - "__id__": 156 + "__id__": 166 }, { - "__id__": 180 + "__id__": 190 } ], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 205 }, { - "__id__": 197 + "__id__": 207 }, { - "__id__": 199 + "__id__": 209 } ], "_prefab": { - "__id__": 201 + "__id__": 211 }, "_lpos": { "__type__": "cc.Vec3", @@ -3412,23 +3660,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 147 + "__id__": 157 }, "_children": [], "_active": true, "_components": [ { - "__id__": 149 + "__id__": 159 }, { - "__id__": 151 + "__id__": 161 }, { - "__id__": 153 + "__id__": 163 } ], "_prefab": { - "__id__": 155 + "__id__": 165 }, "_lpos": { "__type__": "cc.Vec3", @@ -3465,11 +3713,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 160 }, "_contentSize": { "__type__": "cc.Size", @@ -3493,11 +3741,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 162 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3538,11 +3786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 164 }, "_alignFlags": 4, "_target": null, @@ -3587,27 +3835,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 147 + "__id__": 157 }, "_children": [ { - "__id__": 157 + "__id__": 167 }, { - "__id__": 165 + "__id__": 175 }, { - "__id__": 171 + "__id__": 181 } ], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 187 } ], "_prefab": { - "__id__": 179 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", @@ -3644,23 +3892,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 156 + "__id__": 166 }, "_children": [], "_active": true, "_components": [ { - "__id__": 158 + "__id__": 168 }, { - "__id__": 160 + "__id__": 170 }, { - "__id__": 162 + "__id__": 172 } ], "_prefab": { - "__id__": 164 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -3697,11 +3945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 169 }, "_contentSize": { "__type__": "cc.Size", @@ -3725,11 +3973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 171 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3770,11 +4018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 167 }, "_enabled": false, "__prefab": { - "__id__": 163 + "__id__": 173 }, "_alignFlags": 4, "_target": null, @@ -3819,20 +4067,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 156 + "__id__": 166 }, "_children": [], "_active": true, "_components": [ { - "__id__": 166 + "__id__": 176 }, { - "__id__": 168 + "__id__": 178 } ], "_prefab": { - "__id__": 170 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -3869,11 +4117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -3897,11 +4145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3981,20 +4229,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 156 + "__id__": 166 }, "_children": [], "_active": true, "_components": [ { - "__id__": 172 + "__id__": 182 }, { - "__id__": 174 + "__id__": 184 } ], "_prefab": { - "__id__": 176 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -4031,11 +4279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -4059,11 +4307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4143,11 +4391,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", @@ -4184,27 +4432,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 147 + "__id__": 157 }, "_children": [ { - "__id__": 181 + "__id__": 191 } ], "_active": true, "_components": [ { - "__id__": 187 + "__id__": 197 }, { - "__id__": 189 + "__id__": 199 }, { - "__id__": 192 + "__id__": 202 } ], "_prefab": { - "__id__": 194 + "__id__": 204 }, "_lpos": { "__type__": "cc.Vec3", @@ -4241,20 +4489,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 190 }, "_children": [], "_active": true, "_components": [ { - "__id__": 182 + "__id__": 192 }, { - "__id__": 184 + "__id__": 194 } ], "_prefab": { - "__id__": 186 + "__id__": 196 }, "_lpos": { "__type__": "cc.Vec3", @@ -4291,11 +4539,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 193 }, "_contentSize": { "__type__": "cc.Size", @@ -4319,11 +4567,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 195 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4377,11 +4625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", @@ -4405,15 +4653,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 200 }, "clickEvents": [ { - "__id__": 191 + "__id__": 201 } ], "_interactable": true, @@ -4453,7 +4701,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 180 + "__id__": 190 }, "_id": "" }, @@ -4477,11 +4725,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 203 }, "_alignFlags": 10, "_target": null, @@ -4526,11 +4774,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 147 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 206 }, "_contentSize": { "__type__": "cc.Size", @@ -4554,11 +4802,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 147 + "__id__": 157 }, "_enabled": false, "__prefab": { - "__id__": 198 + "__id__": 208 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4599,11 +4847,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 147 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 210 }, "_alignFlags": 41, "_target": null, @@ -4652,7 +4900,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -4680,7 +4928,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4725,7 +4973,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 217 }, "_alignFlags": 45, "_target": null, @@ -4774,7 +5022,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 220 }, "_contentSize": { "__type__": "cc.Size", @@ -4802,7 +5050,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 222 }, "_alignFlags": 45, "_target": null, @@ -4838,7 +5086,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 224 }, "m_rootNode": null, "_id": "" @@ -4857,7 +5105,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 226 }, "_id": "" }, @@ -4874,6 +5122,7 @@ "__id__": 0 }, "fileId": "50O8GAOyNKI4WyeNDAmUoh", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/NavigationPanel.prefab b/assets/bundles/Chat18x/NavigationPanel.prefab index d913806c..f327ca7e 100644 --- a/assets/bundles/Chat18x/NavigationPanel.prefab +++ b/assets/bundles/Chat18x/NavigationPanel.prefab @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.Node", - "_name": "girlDetailBtn", + "_name": "rankBtn", "_objFlags": 0, "__editorExtras__": {}, "_parent": { diff --git a/assets/bundles/Chat18x/PersonalPanel.prefab b/assets/bundles/Chat18x/PersonalPanel.prefab index f1caf514..54aabe98 100644 --- a/assets/bundles/Chat18x/PersonalPanel.prefab +++ b/assets/bundles/Chat18x/PersonalPanel.prefab @@ -28,26 +28,26 @@ "__id__": 18 }, { - "__id__": 142 + "__id__": 156 } ], "_active": true, "_components": [ { - "__id__": 170 + "__id__": 184 }, { - "__id__": 172 + "__id__": 186 }, { - "__id__": 174 + "__id__": 188 }, { - "__id__": 176 + "__id__": 190 } ], "_prefab": { - "__id__": 178 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -476,20 +476,23 @@ "__id__": 67 }, { - "__id__": 131 + "__id__": 111 + }, + { + "__id__": 145 } ], "_active": true, "_components": [ { - "__id__": 137 + "__id__": 151 }, { - "__id__": 139 + "__id__": 153 } ], "_prefab": { - "__id__": 141 + "__id__": 155 }, "_lpos": { "__type__": "cc.Vec3", @@ -550,7 +553,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -279.383, + "x": -252.07999999999998, "y": 53.294999999999845, "z": 0 }, @@ -823,7 +826,7 @@ }, { "__type__": "cc.Node", - "_name": "AvatarFrame", + "_name": "AvatarFrame-noneVip", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -844,7 +847,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -279.383, + "x": -252.07999999999998, "y": 52.799999999999955, "z": 0 }, @@ -980,7 +983,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -279.383, + "x": -252.07999999999998, "y": 60.156999999999925, "z": 0 }, @@ -1120,8 +1123,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -186.67, - "y": 89.13699999999994, + "x": -151.246, + "y": 95.67799999999988, "z": 0 }, "_lrot": { @@ -1396,7 +1399,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 132.3046875, - "height": 69.3 + "height": 54.306000000000004 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1437,7 +1440,7 @@ "_actualFontSize": 40, "_fontSize": 40, "_fontFamily": "Arial", - "_lineHeight": 55, + "_lineHeight": 43.1, "_overflow": 0, "_enableWrapText": true, "_font": { @@ -1516,8 +1519,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -186.777, - "y": 55.2679999999998, + "x": -151.246, + "y": 59.29299999999989, "z": 0 }, "_lrot": { @@ -1557,7 +1560,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 322.4, + "width": 306.4, "height": 35.7 }, "_anchorPoint": { @@ -1654,7 +1657,7 @@ }, { "__type__": "cc.Node", - "_name": "balance", + "_name": "WD_UI_VIPDK", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -1665,20 +1668,1099 @@ "__id__": 68 }, { - "__id__": 86 + "__id__": 74 }, { - "__id__": 98 + "__id__": 82 + }, + { + "__id__": 88 } ], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 106 + }, + { + "__id__": 108 } ], "_prefab": { - "__id__": 130 + "__id__": 110 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -151.246, + "y": 10.163000000000011, + "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": "vipIconnone", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 67 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 69 + }, + { + "__id__": 71 + } + ], + "_prefab": { + "__id__": 73 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 44.875, + "y": 10.58199999999988, + "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__": 68 + }, + "_enabled": true, + "__prefab": { + "__id__": 70 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 70, + "height": 70 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0eyQ0mHwBNcbbArYkHaOTO" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 68 + }, + "_enabled": true, + "__prefab": { + "__id__": 72 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "fccf35e5-d12a-485b-9036-4c99961bca9e@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": "f3+0m8aoJPdL95tU3r8V7s" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "87gRSwrKpMWIA26ZfNu774", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "vipIcon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 67 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 75 + }, + { + "__id__": 77 + }, + { + "__id__": 79 + } + ], + "_prefab": { + "__id__": 81 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 44.875, + "y": 10.58199999999988, + "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__": 74 + }, + "_enabled": true, + "__prefab": { + "__id__": 76 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 70, + "height": 70 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2q6HUtQZAo48hDGHfjijx" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 74 + }, + "_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__": "7509ae19-4969-447a-bd69-cb97a8475f32@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": "c4RVEsHCxGsp/t3UnsWxRA" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 74 + }, + "_enabled": true, + "__prefab": { + "__id__": 80 + }, + "_alignFlags": 8, + "_target": null, + "_left": 9.875, + "_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": "edIWBT5V1BPI+MGmLT9u+O" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a9s4si8DtM/aPAMkftfIal", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "notVip", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 67 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + } + ], + "_prefab": { + "__id__": 87 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 125.405, + "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__": 82 + }, + "_enabled": true, + "__prefab": { + "__id__": 84 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 115.5, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "62IgIkZdlEHoOv8YKPzZbY" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 82 + }, + "_enabled": true, + "__prefab": { + "__id__": 86 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 254, + "g": 108, + "b": 108, + "a": 255 + }, + "_string": "已过期", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 31, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "2d833118-c040-441c-a2f2-8e56390acb70", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_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": "79IJ1UgcdAiJwmfRhnOi5a" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f0ZDIcnD9MX7Z7CEzGMqS0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "vipTimes", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 67 + }, + "_children": [ + { + "__id__": 89 + }, + { + "__id__": 95 + } + ], + "_active": true, + "_components": [ + { + "__id__": 101 + }, + { + "__id__": 103 + } + ], + "_prefab": { + "__id__": 105 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 125.19399999999999, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "time", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 88 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 90 + }, + { + "__id__": 92 + } + ], + "_prefab": { + "__id__": 94 + }, + "_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__": 89 + }, + "_enabled": true, + "__prefab": { + "__id__": 91 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 119.4, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "faGutJ0NhNtYHsujFokXeR" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 89 + }, + "_enabled": true, + "__prefab": { + "__id__": 93 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 218, + "b": 104, + "a": 255 + }, + "_string": "299", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 31, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "2d833118-c040-441c-a2f2-8e56390acb70", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_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": "15xSWOqpJM7qESbA0jlZz/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "daXR6sEldDop1yOzlNDCeZ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "time-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 88 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 96 + }, + { + "__id__": 98 + } + ], + "_prefab": { + "__id__": 100 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 29.85, + "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__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 97 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 59.7, + "height": 43.1 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4ac7zdVpBEYZQtlgoebT11" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 99 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "days", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 27, + "_fontSize": 28, + "_fontFamily": "Arial", + "_lineHeight": 33.9, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "2d833118-c040-441c-a2f2-8e56390acb70", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_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": "2f7ldaGM5JNrMcFT0+IOG8" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a5WzOrEfNNz5RV5aKzSelL", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 88 + }, + "_enabled": true, + "__prefab": { + "__id__": 102 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 119.4, + "height": 47.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8eWb48jOZCo4vgimfOgVAk" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 88 + }, + "_enabled": true, + "__prefab": { + "__id__": 104 + }, + "_resizeMode": 2, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 0, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "53LrIVY+lCob3AJRmq5Ubx" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c8DZuE39tBS6yWN31mwDye", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 67 + }, + "_enabled": true, + "__prefab": { + "__id__": 107 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 204, + "height": 44 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "394XB6I7hLK4cjJxGrZcX/" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 67 + }, + "_enabled": true, + "__prefab": { + "__id__": 109 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f1ca693c-4534-436d-a10a-112b894dd86a@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": "61qaPMKlREfLQxHJKvoYcR" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d4Phq2S1ZKNJSmci8nhFsK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "balance", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 18 + }, + "_children": [ + { + "__id__": 112 + }, + { + "__id__": 130 + } + ], + "_active": true, + "_components": [ + { + "__id__": 142 + } + ], + "_prefab": { + "__id__": 144 }, "_lpos": { "__type__": "cc.Vec3", @@ -1715,27 +2797,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 111 }, "_children": [ { - "__id__": 69 + "__id__": 113 }, { - "__id__": 75 + "__id__": 119 } ], "_active": true, "_components": [ { - "__id__": 81 + "__id__": 125 }, { - "__id__": 83 + "__id__": 127 } ], "_prefab": { - "__id__": 85 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -1772,20 +2854,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 114 }, { - "__id__": 72 + "__id__": 116 } ], "_prefab": { - "__id__": 74 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", @@ -1822,11 +2904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", @@ -1850,11 +2932,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 117 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1908,20 +2990,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 120 }, { - "__id__": 78 + "__id__": 122 } ], "_prefab": { - "__id__": 80 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -1958,11 +3040,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -1986,11 +3068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2067,11 +3149,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 126 }, "_contentSize": { "__type__": "cc.Size", @@ -2095,11 +3177,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 128 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2149,28 +3231,28 @@ }, { "__type__": "cc.Node", - "_name": "WD_AN_CZAN", + "_name": "WalletBtn", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 111 }, "_children": [ { - "__id__": 87 + "__id__": 131 } ], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 137 }, { - "__id__": 95 + "__id__": 139 } ], "_prefab": { - "__id__": 97 + "__id__": 141 }, "_lpos": { "__type__": "cc.Vec3", @@ -2207,20 +3289,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 86 + "__id__": 130 }, "_children": [], "_active": true, "_components": [ { - "__id__": 88 + "__id__": 132 }, { - "__id__": 90 + "__id__": 134 } ], "_prefab": { - "__id__": 92 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -2257,11 +3339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 133 }, "_contentSize": { "__type__": "cc.Size", @@ -2285,11 +3367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 135 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2369,11 +3451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 138 }, "_contentSize": { "__type__": "cc.Size", @@ -2397,11 +3479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 140 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2449,391 +3531,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "WD_UI_VIPDK", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 67 - }, - "_children": [ - { - "__id__": 99 - }, - { - "__id__": 105 - }, - { - "__id__": 111 - }, - { - "__id__": 117 - } - ], - "_active": true, - "_components": [ - { - "__id__": 123 - }, - { - "__id__": 125 - } - ], - "_prefab": { - "__id__": 127 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -86.41999999999996, - "y": 100.529, - "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": "WD_ICON_VIP2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 98 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 100 - }, - { - "__id__": 102 - } - ], - "_prefab": { - "__id__": 104 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -77.60200000000003, - "y": 10.58199999999988, - "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__": 99 - }, - "_enabled": true, - "__prefab": { - "__id__": 101 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 70, - "height": 70 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0eyQ0mHwBNcbbArYkHaOTO" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 99 - }, - "_enabled": true, - "__prefab": { - "__id__": 103 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "fccf35e5-d12a-485b-9036-4c99961bca9e@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": "f3+0m8aoJPdL95tU3r8V7s" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "87gRSwrKpMWIA26ZfNu774", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "WD_ICON_VIP1", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 98 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 106 - }, - { - "__id__": 108 - } - ], - "_prefab": { - "__id__": 110 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -77.60200000000003, - "y": 10.58199999999988, - "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__": 105 - }, - "_enabled": true, - "__prefab": { - "__id__": 107 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 70, - "height": 70 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e2q6HUtQZAo48hDGHfjijx" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 105 - }, - "_enabled": true, - "__prefab": { - "__id__": 109 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "7509ae19-4969-447a-bd69-cb97a8475f32@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": "c4RVEsHCxGsp/t3UnsWxRA" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a9s4si8DtM/aPAMkftfIal", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "time", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 98 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 112 - }, - { - "__id__": 114 - } - ], - "_prefab": { - "__id__": 116 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -26.844000000000023, - "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": "", @@ -2844,367 +3541,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 35.185546875, - "height": 50.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "faGutJ0NhNtYHsujFokXeR" - }, - { - "__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": 255, - "g": 218, - "b": 104, - "a": 255 - }, - "_string": "29", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": { - "__uuid__": "2d833118-c040-441c-a2f2-8e56390acb70", - "__expectedType__": "cc.TTFFont" - }, - "_isSystemFontUsed": false, - "_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": "15xSWOqpJM7qESbA0jlZz/" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "daXR6sEldDop1yOzlNDCeZ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "time-001", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 98 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 118 - }, - { - "__id__": 120 - } - ], - "_prefab": { - "__id__": 122 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 43.79699999999997, - "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__": 117 - }, - "_enabled": true, - "__prefab": { - "__id__": 119 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 70.90234375, - "height": 50.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4ac7zdVpBEYZQtlgoebT11" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 117 - }, - "_enabled": true, - "__prefab": { - "__id__": 121 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "DAYS", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 28, - "_fontSize": 28, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": { - "__uuid__": "2d833118-c040-441c-a2f2-8e56390acb70", - "__expectedType__": "cc.TTFFont" - }, - "_isSystemFontUsed": false, - "_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": "2f7ldaGM5JNrMcFT0+IOG8" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a5WzOrEfNNz5RV5aKzSelL", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 98 - }, - "_enabled": true, - "__prefab": { - "__id__": 124 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 204, - "height": 44 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "394XB6I7hLK4cjJxGrZcX/" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 98 - }, - "_enabled": true, - "__prefab": { - "__id__": 126 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f1ca693c-4534-436d-a10a-112b894dd86a@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": "61qaPMKlREfLQxHJKvoYcR" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d4Phq2S1ZKNJSmci8nhFsK", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 67 - }, - "_enabled": true, - "__prefab": { - "__id__": 129 + "__id__": 143 }, "_contentSize": { "__type__": "cc.Size", @@ -3247,14 +3584,14 @@ "_active": true, "_components": [ { - "__id__": 132 + "__id__": 146 }, { - "__id__": 134 + "__id__": 148 } ], "_prefab": { - "__id__": 136 + "__id__": 150 }, "_lpos": { "__type__": "cc.Vec3", @@ -3291,11 +3628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -3319,11 +3656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3381,7 +3718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 152 }, "_contentSize": { "__type__": "cc.Size", @@ -3409,7 +3746,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 154 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3467,23 +3804,23 @@ }, "_children": [ { - "__id__": 143 + "__id__": 157 }, { - "__id__": 149 + "__id__": 163 } ], "_active": true, "_components": [ { - "__id__": 165 + "__id__": 179 }, { - "__id__": 167 + "__id__": 181 } ], "_prefab": { - "__id__": 169 + "__id__": 183 }, "_lpos": { "__type__": "cc.Vec3", @@ -3520,20 +3857,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 156 }, "_children": [], "_active": true, "_components": [ { - "__id__": 144 + "__id__": 158 }, { - "__id__": 146 + "__id__": 160 } ], "_prefab": { - "__id__": 148 + "__id__": 162 }, "_lpos": { "__type__": "cc.Vec3", @@ -3570,11 +3907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 159 }, "_contentSize": { "__type__": "cc.Size", @@ -3598,11 +3935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 161 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3678,28 +4015,28 @@ }, { "__type__": "cc.Node", - "_name": "Node", + "_name": "favoritesBtn", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 156 }, "_children": [ { - "__id__": 150 + "__id__": 164 }, { - "__id__": 156 + "__id__": 170 } ], "_active": true, "_components": [ { - "__id__": 162 + "__id__": 176 } ], "_prefab": { - "__id__": 164 + "__id__": 178 }, "_lpos": { "__type__": "cc.Vec3", @@ -3736,20 +4073,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 149 + "__id__": 163 }, "_children": [], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 165 }, { - "__id__": 153 + "__id__": 167 } ], "_prefab": { - "__id__": 155 + "__id__": 169 }, "_lpos": { "__type__": "cc.Vec3", @@ -3786,11 +4123,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 166 }, "_contentSize": { "__type__": "cc.Size", @@ -3814,11 +4151,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 168 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3872,20 +4209,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 149 + "__id__": 163 }, "_children": [], "_active": true, "_components": [ { - "__id__": 157 + "__id__": 171 }, { - "__id__": 159 + "__id__": 173 } ], "_prefab": { - "__id__": 161 + "__id__": 175 }, "_lpos": { "__type__": "cc.Vec3", @@ -3922,11 +4259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 172 }, "_contentSize": { "__type__": "cc.Size", @@ -3950,11 +4287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 174 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4031,11 +4368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -4072,11 +4409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 180 }, "_contentSize": { "__type__": "cc.Size", @@ -4100,11 +4437,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 182 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4162,7 +4499,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 185 }, "_contentSize": { "__type__": "cc.Size", @@ -4190,7 +4527,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 187 }, "m_rootNode": null, "userNameLabel": { @@ -4200,12 +4537,36 @@ "__id__": 64 }, "balanceLabel": { - "__id__": 78 + "__id__": 122 + }, + "vipStatusLabel": { + "__id__": 92 }, - "vipStatusLabel": null, "avatarSprite": { "__id__": 23 }, + "vipStuff": [ + { + "__id__": 39 + }, + { + "__id__": 74 + }, + { + "__id__": 88 + } + ], + "notVipStuff": [ + { + "__id__": 33 + }, + { + "__id__": 68 + }, + { + "__id__": 82 + } + ], "_id": "" }, { @@ -4222,7 +4583,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 189 }, "_alignFlags": 45, "_target": null, @@ -4258,7 +4619,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, diff --git a/assets/bundles/Chat18x/PurchasePanel.prefab b/assets/bundles/Chat18x/PurchasePanel.prefab index 646a65c1..fce7e67a 100644 --- a/assets/bundles/Chat18x/PurchasePanel.prefab +++ b/assets/bundles/Chat18x/PurchasePanel.prefab @@ -666,7 +666,7 @@ "__id__": 54 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 62 @@ -2938,7 +2938,7 @@ }, { "__type__": "cc.Node", - "_name": "vipPrice30", + "_name": "vipPrice7", "_objFlags": 512, "__editorExtras__": {}, "_parent": { @@ -4092,7 +4092,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -160, + "x": -80, "y": 0, "z": 0 }, @@ -4722,7 +4722,7 @@ }, { "__type__": "cc.Node", - "_name": "cashBtn-001", + "_name": "web3Btn", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -4756,7 +4756,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": 80, "y": 0, "z": 0 }, @@ -5019,7 +5019,7 @@ "b": 255, "a": 255 }, - "_string": "Cash", + "_string": "WEB3", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, @@ -5403,7 +5403,7 @@ "__id__": 231 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 237 @@ -6062,7 +6062,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 480, + "width": 320, "height": 60 }, "_anchorPoint": { @@ -6102,9 +6102,9 @@ "__uuid__": "b9864876-395d-4422-930a-35a2a111ec7f@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index 4082c9fc..0c7f6756 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 420 + "__id__": 426 }, { - "__id__": 422 + "__id__": 428 }, { - "__id__": 424 + "__id__": 430 } ], "_prefab": { - "__id__": 426 + "__id__": 432 }, "_lpos": { "__type__": "cc.Vec3", @@ -88,17 +88,17 @@ "_active": true, "_components": [ { - "__id__": 413 + "__id__": 419 }, { - "__id__": 415 + "__id__": 421 }, { - "__id__": 417 + "__id__": 423 } ], "_prefab": { - "__id__": 419 + "__id__": 425 }, "_lpos": { "__type__": "cc.Vec3", @@ -285,7 +285,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -57, + "x": -73.45, "y": 5.299999999999997, "z": 0 }, @@ -335,8 +335,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 43.11200000000008, - "y": -7.061999999999898, + "x": 59.07300000000009, + "y": -7.0620000000001255, "z": 0 }, "_lrot": { @@ -376,8 +376,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 46.785547, - "height": 49.478 + "width": 72.885547, + "height": 31.978 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -413,12 +413,12 @@ "a": 255 }, "_string": "29", - "_horizontalAlign": 2, + "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 31, "_fontSize": 30, "_fontFamily": "NotoSans-Regular", - "_lineHeight": 40.3, + "_lineHeight": 26.3, "_overflow": 2, "_enableWrapText": true, "_font": { @@ -488,8 +488,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 114, - "height": 70 + "width": 146.9, + "height": 69 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -528,7 +528,7 @@ "__uuid__": "96531352-08bd-4ea0-93d9-3e582c16c927@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, "_sizeMode": 0, "_fillCenter": { @@ -564,7 +564,7 @@ "_left": 194.1, "_right": 0, "_top": 0, - "_bottom": 15, + "_bottom": 15.5, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -629,7 +629,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -228.29999999999995, + "x": -261.2, "y": -0.4650000000001029, "z": 0 }, @@ -1081,7 +1081,7 @@ "_alignFlags": 36, "_target": null, "_left": 194.1, - "_right": 123.29999999999995, + "_right": 156.2, "_top": 0, "_bottom": 17.2349999999999, "_horizontalCenter": 0, @@ -1129,7 +1129,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 333.3, + "width": 366.2, "height": 89.4 }, "_anchorPoint": { @@ -6626,23 +6626,23 @@ "__id__": 292 }, { - "__id__": 380 + "__id__": 386 } ], "_active": true, "_components": [ { - "__id__": 406 + "__id__": 412 }, { - "__id__": 408 + "__id__": 414 }, { - "__id__": 410 + "__id__": 416 } ], "_prefab": { - "__id__": 412 + "__id__": 418 }, "_lpos": { "__type__": "cc.Vec3", @@ -6701,20 +6701,20 @@ "__id__": 363 }, { - "__id__": 369 + "__id__": 373 } ], "_active": true, "_components": [ { - "__id__": 375 + "__id__": 381 }, { - "__id__": 377 + "__id__": 383 } ], "_prefab": { - "__id__": 379 + "__id__": 385 }, "_lpos": { "__type__": "cc.Vec3", @@ -8395,10 +8395,16 @@ }, { "__id__": 366 + }, + { + "__id__": 368 + }, + { + "__id__": 370 } ], "_prefab": { - "__id__": 368 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -8493,6 +8499,104 @@ "__type__": "cc.CompPrefabInfo", "fileId": "72LPwbGp5JYoYzkvi2bdgJ" }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 363 + }, + "_enabled": true, + "__prefab": { + "__id__": 369 + }, + "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": "99aqdm1whEWqSb4J7c3j6i" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 363 + }, + "_enabled": true, + "__prefab": { + "__id__": 371 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_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": "0boSxJVt9GQ53UqVC891h7" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -8518,14 +8622,17 @@ "_active": true, "_components": [ { - "__id__": 370 + "__id__": 374 }, { - "__id__": 372 + "__id__": 376 + }, + { + "__id__": 378 } ], "_prefab": { - "__id__": 374 + "__id__": 380 }, "_lpos": { "__type__": "cc.Vec3", @@ -8562,11 +8669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", @@ -8590,11 +8697,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 377 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8629,6 +8736,62 @@ "__type__": "cc.CompPrefabInfo", "fileId": "d3ak5O+f1K+JPb1MFMmQCa" }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 373 + }, + "_enabled": true, + "__prefab": { + "__id__": 379 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 3, + "_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": 0.9, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "eePaFMhZpK7aVzmZydYZ9u" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -8652,7 +8815,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 382 }, "_contentSize": { "__type__": "cc.Size", @@ -8680,7 +8843,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 384 }, "_id": "" }, @@ -8697,6 +8860,8 @@ "__id__": 0 }, "fileId": "95e7AkM3hGAYNTgNhafYd/", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -8709,26 +8874,26 @@ }, "_children": [ { - "__id__": 381 + "__id__": 387 } ], "_active": true, "_components": [ - { - "__id__": 397 - }, - { - "__id__": 399 - }, - { - "__id__": 401 - }, { "__id__": 403 + }, + { + "__id__": 405 + }, + { + "__id__": 407 + }, + { + "__id__": 409 } ], "_prefab": { - "__id__": 405 + "__id__": 411 }, "_lpos": { "__type__": "cc.Vec3", @@ -8765,30 +8930,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 380 + "__id__": 386 }, "_children": [ { - "__id__": 382 + "__id__": 388 } ], "_active": true, "_components": [ - { - "__id__": 388 - }, - { - "__id__": 390 - }, - { - "__id__": 392 - }, { "__id__": 394 + }, + { + "__id__": 396 + }, + { + "__id__": 398 + }, + { + "__id__": 400 } ], "_prefab": { - "__id__": 396 + "__id__": 402 }, "_lpos": { "__type__": "cc.Vec3", @@ -8825,25 +8990,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 381 + "__id__": 387 }, "_children": [], "_active": true, "_components": [ { - "__id__": 383 + "__id__": 389 }, { - "__id__": 385 + "__id__": 391 } ], "_prefab": { - "__id__": 387 + "__id__": 393 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 99.14200000000005, + "y": 593.2980000000001, "z": 0 }, "_lrot": { @@ -8875,11 +9040,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 390 }, "_contentSize": { "__type__": "cc.Size", @@ -8903,11 +9068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 392 }, "_resizeMode": 1, "_layoutType": 2, @@ -8954,11 +9119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 395 }, "_contentSize": { "__type__": "cc.Size", @@ -8982,11 +9147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 397 }, "_type": 0, "_inverted": false, @@ -9004,11 +9169,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 399 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9050,11 +9215,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 395 + "__id__": 401 }, "_alignFlags": 45, "_target": null, @@ -9089,6 +9254,8 @@ "__id__": 0 }, "fileId": "885+b7zBZOQqOqN8VildHp", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -9097,11 +9264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 404 }, "_contentSize": { "__type__": "cc.Size", @@ -9125,11 +9292,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 386 }, "_enabled": false, "__prefab": { - "__id__": 400 + "__id__": 406 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9170,11 +9337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 408 }, "bounceDuration": 0.23, "brake": 0.75, @@ -9185,7 +9352,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 382 + "__id__": 388 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -9201,11 +9368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 410 }, "_alignFlags": 45, "_target": null, @@ -9254,7 +9421,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 413 }, "_contentSize": { "__type__": "cc.Size", @@ -9282,7 +9449,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 409 + "__id__": 415 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9327,7 +9494,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 417 }, "_alignFlags": 45, "_target": null, @@ -9362,6 +9529,8 @@ "__id__": 0 }, "fileId": "3ac3ofAUBNQqBqbnLH/FfL", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -9374,7 +9543,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 414 + "__id__": 420 }, "_contentSize": { "__type__": "cc.Size", @@ -9402,7 +9571,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 416 + "__id__": 422 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9447,7 +9616,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 418 + "__id__": 424 }, "_alignFlags": 45, "_target": null, @@ -9496,7 +9665,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 427 }, "_contentSize": { "__type__": "cc.Size", @@ -9524,7 +9693,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 423 + "__id__": 429 }, "_alignFlags": 45, "_target": null, @@ -9560,7 +9729,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 431 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/Chat18x/TipsPanel.prefab b/assets/bundles/Chat18x/TipsPanel.prefab index bf6a127b..35a73ea5 100644 --- a/assets/bundles/Chat18x/TipsPanel.prefab +++ b/assets/bundles/Chat18x/TipsPanel.prefab @@ -139,7 +139,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, + "width": 750, "height": 700 }, "_anchorPoint": { @@ -314,7 +314,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, + "width": 750, "height": 119 }, "_anchorPoint": { @@ -486,7 +486,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1009.279688, + "width": 698.579688, "height": 112.7 }, "_anchorPoint": { @@ -525,8 +525,8 @@ "_string": "Insufficient balance, need to purchase", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 49, - "_fontSize": 48, + "_actualFontSize": 37, + "_fontSize": 36, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 2, @@ -595,7 +595,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, + "width": 750, "height": 119 }, "_anchorPoint": { diff --git a/assets/resources/ui/shop/SHOP_AN_XZK.png.meta b/assets/resources/ui/shop/SHOP_AN_XZK.png.meta index d525241b..6cdd9251 100644 --- a/assets/resources/ui/shop/SHOP_AN_XZK.png.meta +++ b/assets/resources/ui/shop/SHOP_AN_XZK.png.meta @@ -52,8 +52,8 @@ "rawHeight": 60, "borderTop": 0, "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderLeft": 75, + "borderRight": 75, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/resources/ui/theme/fenye/ZY_UI_VIP.png.meta b/assets/resources/ui/theme/fenye/ZY_UI_VIP.png.meta index 9a0e6016..f8c775ef 100644 --- a/assets/resources/ui/theme/fenye/ZY_UI_VIP.png.meta +++ b/assets/resources/ui/theme/fenye/ZY_UI_VIP.png.meta @@ -52,8 +52,8 @@ "rawHeight": 70, "borderTop": 0, "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderLeft": 78, + "borderRight": 25, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/proto_cs b/proto_cs index 233ba3fd..ac9f5df0 160000 --- a/proto_cs +++ b/proto_cs @@ -1 +1 @@ -Subproject commit 233ba3fdaed212b7a423ec57a141dc5342ef3bf7 +Subproject commit ac9f5df0b33b88ddd9a929eb0e4766624937b249