diff --git a/assets/Scripts/Main/Channel/SDKManager.ts b/assets/Scripts/Main/Channel/SDKManager.ts index 990a6ebc..a30622c7 100644 --- a/assets/Scripts/Main/Channel/SDKManager.ts +++ b/assets/Scripts/Main/Channel/SDKManager.ts @@ -6,6 +6,7 @@ import { WebSDK } from "./webSDK"; import { KSSDK } from "./ksSDK"; import AudioManager from "../Manager/AudioManager"; import GlobalValue, { VideoRoleType } from "../Common/GlobalValue"; +import { luffaSDK } from "./luffaSDK"; const { ccclass, property } = _decorator; @@ -94,7 +95,7 @@ export class SDKManager { //extends Component this.sdk = new KSSDK() //快手 }else if (sys.platform === sys.Platform.WECHAT_GAME && typeof window["wx"] !== 'undefined') { this.sdk_channel = E_SDK_Channel.WX - this.sdk = new WXSDK() //微信 + this.sdk = new luffaSDK() //微信 } else if (sys.platform === sys.Platform.BYTEDANCE_MINI_GAME && typeof window["tt"] !== 'undefined') { this.sdk_channel = E_SDK_Channel.BD this.sdk = new ByteDanceSDK() //抖音(头条) diff --git a/assets/Scripts/Main/Channel/luffaSDK.ts b/assets/Scripts/Main/Channel/luffaSDK.ts new file mode 100644 index 00000000..20179ea8 --- /dev/null +++ b/assets/Scripts/Main/Channel/luffaSDK.ts @@ -0,0 +1,964 @@ +import { randomRange, view } from "cc"; +import GlobalValue, { VideoRoleType } from "../Common/GlobalValue"; +import SubManager from "../../Sub/SubManager"; +import { I_SDK_UserInfo_Callback, SDKManager } from "./SDKManager"; +import Utils from "../Common/Utils"; +import uma from "../../../utils/uma.wx.min.js"; +import { InnerMsgCode } from "../Config/InnerMsgCode"; + +//广告ID +const wx_banner_ad_unit_id = "test"; +const wx_splash_ad_unit_id = "test"; +const wx_video_ad_unit_id = "adunit-a79e037dfaac7bae"; + +export class luffaSDK { + static g_InGameScene = null; //游戏场景值 + + private wx_video: any = null; + private wx_splash: any = null; + private wx_banner: any = null; + private wx_video_callback: Function = null; + private wx_video_tag: number = null; + private wx_gameClub: any = null; //游戏圈按钮 + + private ShareSTime: any; + private ShareCb: any; //分享回调 + private shareTxt = [ + "分享失败", + "请分享到一个群", + "请分享给一位好友", + "分享过于频繁", + ]; + + //初始化 + init(cb: Function = null) { + // 保持屏幕常亮 + window["wx"].setKeepScreenOn({ keepScreenOn: true }); + luffaSDK.g_InGameScene = window["wx"].getLaunchOptionsSync().scene; + console.log("init luffa - 进入游戏的场景值", luffaSDK.g_InGameScene); + + //this.init_video(); //初始化视频广告 + //this.init_splash(); //初始化插屏广告 + //this.init_banner(); //初始化Banner广告 横幅广告 + this.qiangzhiUpdata(); //检测更新 + cb && cb(); + } + + /**获取用户授权状态 + * @param autoKey string 授权类型 userInfo=用户信息，对应接口wx.getUserInfo + */ + checkAutoSetting(autoKey: string, cb: Function = null) { + window["wx"].getSetting({ + success(res: any) { + console.log("微信 - 检测权限状态 succ:", JSON.stringify(res)); + if (autoKey == "userInfo" && res.authSetting["scope.userInfo"]) { + cb && cb(true); + } else { + cb && cb(false); + } + }, + fail(res: any) { + console.log("微信 - 检测权限状态 fail:", JSON.stringify(res)); + cb && cb(false); + }, + }); + } + + /** + * 获取个人信息 + */ + getUserInfo(cb: I_SDK_UserInfo_Callback = null) { + console.log("微信 - 正在获取用户信息..."); + var self = this; + window["wx"].getUserInfo({ + success: (res) => { + console.log("微信 - 获取用户信息成功：", res); + cb && + cb({ + avatarUrl: res.userInfo.avatarUrl, + nickName: res.userInfo.nickName, + }); + }, + fail: (err) => { + console.log("微信 - 获取用户信息失败：", err); + self.openUserAuthorize(cb); + }, + }); + } + //申请用户信息授权 + openUserAuthorize(cb: any) { + var self = this; + window["wx"].getSetting({ + scope: "scope.userInfo", + success(res: any) { + console.log("微信 authorize succ:", JSON.stringify(res)); + + if (res.authSetting["scope.userInfo"]) { + self.getUserInfo(cb); + } else { + let systemInfo = window["wx"].getSystemInfoSync(); + let button = window["wx"].createUserInfoButton({ + type: "text", + text: "", + // @ts-ignore + style: { + left: 0, + top: 0, + width: systemInfo.screenWidth, + height: systemInfo.screenHeight, + backgroundColor: "#00000000", //最后两位为透明度 + textAlign: "center", + }, + }); + console.log("微信 点击开始游戏授权用户信息"); + button.onTap((res) => { + button.destroy(); + // if (res.userInfo) { + // console.log(res.userInfo) + // //此时可进行登录操作 + // cb && cb(res.userInfo) + // } + console.log("微信 点击Tap", res); + self.getUserInfo(cb); + }); + } + }, + fail(err) { + console.log("微信 - authorize fail", err); + }, + }); + } + + //region 微信登录 + login(cb: Function = null) { + window["wx"].login({ + success: (res) => { + if (res.code) { + console.log("微信 - 登录成功", res.code); + cb && cb({ platform: 1, code: res.code }); + } else { + console.log("微信 - 登录失败", res.errMsg); + cb && cb({ platform: 1, code: null }); + } + }, + fail(res: any) { + console.log(`微信 login 调用失败`); + console.log(res.anonymousCode); + cb && cb({ platform: 1, code: null }); + }, + }); + } + + //初始化视频广告 + private init_video() { + if ((wx_video_ad_unit_id as any) == "test") { + console.log("微信 激励广告id未配置，跳过此类型初始化"); + return; + } + + this.wx_video = window["wx"].createRewardedVideoAd({ + adUnitId: wx_video_ad_unit_id, + disableFallbackSharePage: true, // 是否禁用分享页，默认为false + }); + this.wx_video.onLoad(() => { + console.log("onLoad event emit"); + }); + this.wx_video.onError((err) => { + console.log("onError event emit", err); + }); + this.wx_video.onClose((res) => { + console.log("onClose event emit", res); + // 用户点击了【关闭广告】按钮 + // 小于 2.1.0 的基础库版本，res 是一个 undefined + if ((res && res.isEnded) || res === undefined) { + // 正常播放结束，可以下发游戏奖励 + if (this.wx_video_callback) { + this.wx_video_callback(this.wx_video_tag); + } + } else { + // 播放中途退出，不下发游戏奖励 + //wx_video_callback(-1); + } + SDKManager.video_ad_back(); + }); + } + + //初始化插屏广告 + private init_splash() { + if ((wx_splash_ad_unit_id as any) == "test") { + console.log("微信 插屏广告id未配置，跳过此类型初始化"); + return; + } + // 创建插屏广告实例，提前初始化 + if (window["wx"].createInterstitialAd) { + this.wx_splash = window["wx"].createInterstitialAd({ + adUnitId: wx_splash_ad_unit_id, + }); + this.wx_splash.onLoad(() => { + console.log("splash onLoad event emit"); + }); + this.wx_splash.onError((err) => { + console.log("splash onError event emit", err); + }); + this.wx_splash.onClose((res) => { + console.log("splash onClose event emit", res); + }); + } + } + + //初始化Banner + private init_banner() { + if ((wx_banner_ad_unit_id as any) == "test") { + console.log("微信 横幅广告id未配置，跳过此类型初始化"); + return; + } + let winSize = window["wx"].getSystemInfoSync(); + let bannerHeight = 80; + let bannerWidth = 300; + this.wx_banner = window["wx"].createBannerAd({ + adUnitId: wx_banner_ad_unit_id, + adIntervals: 30, + style: { + left: (winSize.windowWidth - bannerWidth) / 2, + top: winSize.windowHeight - bannerHeight, + width: bannerWidth, + }, + }); + //微信缩放后得到banner的真实高度，从新设置banner的top 属性 + this.wx_banner.onResize((res) => { + this.wx_banner.style.top = + winSize.windowHeight - this.wx_banner.style.realHeight; + }); + + this.wx_banner.onError((res) => {}); + } + + //region 广告 + //显示视频广告 + show_video(callback: Function, tag: number) { + if ((wx_video_ad_unit_id as any) == "test") { + console.log("未接入广告ID，视频广告请求直接返回"); + callback && callback(); + SDKManager.video_ad_back(); + return; + } + if (this.wx_video) { + this.wx_video_callback = callback; + this.wx_video_tag = tag; + this.wx_video.load().then(() => { + this.wx_video.show().catch((err) => { + this.wx_video.load().then(() => this.wx_video.show()); + }); + }); + } + } + + //显示插屏 + show_splash() { + // 在适合的场景显示插屏广告 + // if (this.wx_splash) { + // this.wx_splash.show().catch((err) => { + // this.wx_splash.load().then(()=>{ + + // }) + // }) + // } + + if (this.wx_splash) { + this.wx_splash + .load() + .then(() => { + this.wx_splash.show(); + }) + .catch((err) => { + console.log(err); + }); + } + } + + //显示Banner + show_banner() { + if (this.wx_banner) { + this.wx_banner.show(); //banner 默认隐藏(hide) 要打开 + } + } + + //隐藏Banner + hide_banner() { + if (this.wx_banner) { + this.wx_banner.hide(); //banner 默认隐藏(hide) 要打开 + } + } + + //region 分享 + /**分享图片*/ + private SharePicAry = [ + { + id: "7wUnG0FFQry/nCdxI9kKYQ==", + url: "https://mmocgame.qpic.cn/wechatgame/W9Az4zfwkAvic2MPaoBEdYEMVht0VwJv6eQF2myMU8IIFbQAZ92Fg73Qp9MUdPMj8/0", + }, + { + id: "NCa1cR9YSWinaozMovG6kQ==", + url: "https://mmocgame.qpic.cn/wechatgame/uRnpa1JW3rTyYxQHVUI2OaUmHZStMSWfoXPpx7AgceIN2EuqE2DRicDNjcBTA7arK/0", + }, + { + id: "adU43/q3Te+86ThFH+8R+g==", + url: "https://mmocgame.qpic.cn/wechatgame/fVu8XV4rOQv0iaLzIr4m67DZAOgN1NDe7jSCDoT2ibHuqRkacaeHCdCopIgLzrlBibR/0", + }, + { + id: "k93MB1OQQzGuHDv6LhlJ4g==", + url: "https://mmocgame.qpic.cn/wechatgame/rrYFeia8mywog7QfGagj9Uiad5Sicu3qNhV6IQcgVkZbUjibaWe70SUsvp9vNESBpje7/0", + }, + { + id: "/ry07TA6SXea+AoABH1D+w==", + url: "https://mmocgame.qpic.cn/wechatgame/f0cXVicm8xoT33Txqf2o2CRyreAicOiaHh8JFlbxHaDibYWZoBulHTF9v1s3EaUWfaMk/0", + }, + { + id: "hYrwZorvQaOP3XbbC77PZw==", + url: "https://mmocgame.qpic.cn/wechatgame/HEsiaI4wLnb2SVCthB5pZeBULvWsk71EdlK1WUXic23cPuzeWribbjibjlebOPyNy1wL/0", + }, + { + id: "nzn7R/iLQoerxHhYbEM6AQ==", + url: "https://mmocgame.qpic.cn/wechatgame/fxaAdTaO5GvRicwozj7sfUiat1ef3XLgjicLLZpeJYWtjyBjIhfh7TP2aZzOItwlpff/0", + }, + { + id: "RvJk1ZZzR1iwqKvI39Rt8w==", + url: "https://mmocgame.qpic.cn/wechatgame/WibiboKxDQsGxnVMhxebwvouMGnn5MKJibF18lS1iaibo1yrWnoTJgPAIgVX3dZEkV0Ta/0", + }, + { + id: "6OgcDWd5SI2R2SmnOxs3Gw==", + url: "https://mmocgame.qpic.cn/wechatgame/bpd6RQyPEB7xsoqyzribiaGnibELo6xARRPSLsgtickwcMHtSv920nweBbxIG7OiaJXFo/0", + }, + { + id: "6qb2SmFBRgi3pv+pUIbulA==", + url: "https://mmocgame.qpic.cn/wechatgame/LXCSUXdVagducqPcChicS5yQWqna7oduKCnzwlG11a7W1Lx6Rwv4Y1tBsMVWqP4Fs/0", + }, + { + id: "rdrtaMpJTd6CtMI3dJikHg==", + url: "https://mmocgame.qpic.cn/wechatgame/Zzc9s1q36erWTkUxLDjqOus62PTTysBW4PGUaDO5Pr67kT3g9W3HlMakBSiaicxGdH/0", + }, + { + id: "sflrnBurRxC2dow0iuQNEg==", + url: "https://mmocgame.qpic.cn/wechatgame/YiacDpfxzCGbXUHmtMmcfr8gIF7DicDib6q0pJaiaWXbTWOBGkCbpeuMic1SMgr91v43K/0", + }, + { + id: "GkB88GpmR6KvjrV3yMxeWA==", + url: "https://mmocgame.qpic.cn/wechatgame/f4fzfIKfgFIBFWxjsFibMUHKQA72JutALOXbuM3vaS0W9ZSUjC2rysb5Tic23lQb95/0", + }, + { + id: "UxAhraIxTayr/3Mdhi0Uzg==", + url: "https://mmocgame.qpic.cn/wechatgame/qDv24VqH6NBBP0IXNJ2EbSScIic6WsX0KcLJSNs1ThibYJx6QnDnKIT59CcIQSnZvD/0", + }, + { + id: "ISSkaxiBRhyn3yZh2AS0eQ==", + url: "https://mmocgame.qpic.cn/wechatgame/22HxqYDEUu1yelwdMR30ntjn6rzaYf8QJgrOkFlteicoqbacSptHiaNgK7cygteg99/0", + }, + { + id: "m0GQ8b4YTU2u1So1Wr9Rjg==", + url: "https://mmocgame.qpic.cn/wechatgame/D8nvAYkIticAEYwTBb3uC83TVferTkpqU5Akj8XGwPCYfNZibTeunZVd5ticqHxvgHC/0", + }, + { + id: "F6j57H82QyyiD1i0MaS+0g==", + url: "https://mmocgame.qpic.cn/wechatgame/FtniagLR3ueTRx3ibhy98G6pGdC69A38n9jUrVFHEhL9gqceaUnaTpmQHkiaPU1JE4h/0", + }, + { + id: "dqd9Gfx2QGKilvChFwoc7Q==", + url: "https://mmocgame.qpic.cn/wechatgame/yauvGchcicTl0zx4dYqfhAxl40k7ZbVM59VbPjDPcouesWbPrpsFQzNvfsSUYwUkb/0", + }, + ]; + + //分享文本 + private ShareTextAry = [ + "话术策略大挑战：十句话让 AI 二次元少女心动！", + "心动话术挑战，60 位 AI 女友候选等你 Pick！", + "二次元话术相亲模拟！60 位 AI 对象等你攻略！", + "全 AI 聊天互动！收集二次元少女的心动信号！", + "首款 AI 话术策略游戏，攻略个性 AI 二次元女友！", + "锻炼你的话术策略，挑战 AI 女友最速结婚路线！", + "直男 or 情话海王？60 位 AI 女友检测话术段位！", + "高能话术挑战 60 位 AI 少女，解锁专属甜蜜结局！", + ]; + + //分享信息 + shareInfo() { + let rand1 = Utils.getRandomInt(0, this.SharePicAry.length - 1); + let picmap = this.SharePicAry[rand1]; + let rand2 = Utils.getRandomInt(0, this.ShareTextAry.length - 1); + let text = this.ShareTextAry[rand2]; + console.log("分享:", rand1, rand2); + return { + title: text, + query: "ShareCode=" + "user_default", //ModelPlayer.I.getPlayerId(), + imageUrl: picmap.url, + imageUrlId: picmap.id, + }; + } + //主动拉起分享 + show_share(rewardCB?: Function) { + console.log("主动拉起分享"); + let info: any = this.shareInfo(); + info.succ = rewardCB; + info.fail = null; + this.ShareCb = info; + window["wx"].shareAppMessage(info); + } + + //获取设备分辨率 + getWindowSize() { + let windowinfo = window["wx"].getWindowInfo(); + return { width: windowinfo.screenWidth, height: windowinfo.screenHeight }; + } + + //显示游戏圈 + show_gameClub(leftRatio, topRatio, widthRatio, heightRatio) { + console.log("显示游戏圈"); + if (this.wx_gameClub) { + this.wx_gameClub.show(); + } else { + let windowinfo = window["wx"].getWindowInfo(); + let x = windowinfo.screenWidth * leftRatio; + let y = windowinfo.screenHeight * topRatio; + let w = windowinfo.screenWidth * widthRatio; //按钮宽高 + let h = windowinfo.screenHeight * heightRatio; + + console.log( + "游戏圈按钮配置:", + windowinfo, + leftRatio, + topRatio, + widthRatio, + heightRatio, + x, + y, + w, + h + ); + this.wx_gameClub = window["wx"].createGameClubButton({ + type: "string", + text: "", + // type: 'image', + icon: "green", + style: { + left: x, //这个坐标对应UI上的按钮时，按钮要勾选适配 + top: y, + width: w, + height: h, + }, + }); + } + } + //隐藏游戏圈 + hide_gameClub() { + console.log("隐藏游戏圈"); + if (this.wx_gameClub) { + this.wx_gameClub.hide(); + } + } + + //region base64音频播放 + //检查是否支持base64音频播放 + checkSupportBase64Audio() { + return true; + } + //播放base64音频 + private _innerAudioContext: any = null; + private _iacIdx = 0; //音频播放索引 + playBase64Audio(base64, loop) { + if (!this.checkSupportBase64Audio()) { + console.log("微信平台不支持base64音频播放"); + return; + } + + let substring = base64; + let qianzhui = "data:audio/x-wav;base64,"; + if (base64.startsWith(qianzhui)) { + substring = base64.substring(qianzhui.length, base64.length); + } + + let self = this; + const fs = window["wx"].getFileSystemManager(); + //1.删除上一个音频 + const lastPath = + window["wx"].env.USER_DATA_PATH + `/ordernew${self._iacIdx}.mp3`; + console.log("微信 正在删除上一个音频 ->", lastPath); + fs.removeSavedFile({ + filePath: lastPath, + success(res) { + console.log("微信 删除上一个音频成功", res); + }, + fail(err) { + console.log("微信 删除上一个音频失败", err); + }, + complete(res) { + console.log("微信 删除上一个音频完成", res); + + //2.保存当前音频 + //这里需要每次保存时换一下名字的原因是：innerAudioContext设置路径时如果路径相同，会认为还是同一个音频，不会重新加载，所以需要每次保存时换一下名字 + self._iacIdx++; + const audioPath = + window["wx"].env.USER_DATA_PATH + `/ordernew${self._iacIdx}.mp3`; + console.log("微信 正在保存本次音频 ->", audioPath); + fs.writeFile({ + filePath: audioPath, + data: substring, + encoding: "base64", + success(res) { + if (self._innerAudioContext == null) { + self._innerAudioContext = window["wx"].createInnerAudioContext(); + // 添加播放结束的回调 + self._innerAudioContext.onEnded(() => { + console.log("微信 AI语音播放结束"); + self._innerAudioContext.stop(); // 使用 stop 方法停止音频并重置播放状态 + self._innerAudioContext.destroy(); // 销毁音频实例 + self._innerAudioContext = null; + }); + } + console.log("微信 播放base64音频", audioPath); + self._innerAudioContext.src = audioPath; + self._innerAudioContext.play(); // 开始播放音频 + }, + fail(err) { + console.log("微信 保存本次音频失败", err); + }, + }); + }, + }); + } + + //region版本更新检测 + //微信开发者工具上可以通过「编译模式」下的「下次编译模拟更新」开关来调试 + qiangzhiUpdata() { + const updateManager = window["wx"].getUpdateManager(); + + //监听向微信后台请求检查更新结果事件。微信在小程序每次启动（包括热启动）时自动检查更新，不需由开发者主动触发。 + updateManager.onCheckForUpdate((res) => { + // 请求完新版本信息的回调 + console.log("微信 检查是否有新版本：", res.hasUpdate); + }); + + //监听小程序有版本更新事件。客户端主动触发下载（无需开发者触发），下载成功后回调 + updateManager.onUpdateReady(function () { + window["wx"].showModal({ + title: "更新提示", + content: "新版本已经准备好，是否重启应用？", + success: function (res) { + if (res.confirm) { + // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 + updateManager.applyUpdate(); + } + }, + }); + }); + + //监听小程序更新失败事件。小程序有新版本，客户端主动触发下载（无需开发者触发），下载失败（可能是网络原因等）时回调 + updateManager.onUpdateFailed(function (err) { + console.log("微信 新版本下载失败", err); + }); + } + + //客服功能是否支持 + kefuSupport() { + if (window["wx"].openCustomerServiceConversation) { + return true; + } + console.log("微信 不支持联系客服"); + return false; + } + //进入联系客服 + openKefu() { + let wx = window["wx"]; + if (wx) { + if (!wx.openCustomerServiceConversation) { + return; + } + wx.openCustomerServiceConversation({ + success: (res) => { + const { path, query } = res; + console.log("微信 进入客服成功", path, query); + }, + fail: (res) => { + console.log("微信 进入客服失败", res); + }, + }); + } + } + + //region 播放背景视频 + private _bgVideo: any = null; //正式播放的视频组件 + private _bgShow: boolean = false; + private curPlayType: VideoRoleType = VideoRoleType.None; //当前播放的视频的类型 + playBgAudio( + remoteUrl: string, + vtype: VideoRoleType, + loop: boolean = false, + extra: any = {} + ) { + if (this._bgVideo && this._bgShow) { + this.playBgAudioNext(remoteUrl, vtype, loop, extra); + return; + } + let self = this; + console.log("微信 播放背景视频组件1", remoteUrl); + this.curPlayType = vtype; + if (!this._bgVideo) { + this._bgVideo = this.createVideoHandle(); + // this._bgVideo.onPlay(() => { + // console.log("微信 背景视频播放开始"); + // }) + this._bgVideo.onTimeUpdate((_tinfo: any) => { + // console.log("微信 背景视频播放进度", self._bgShow, _tinfo); + if (!self._bgShow) { + if (_tinfo && _tinfo.position > 0.01) { + console.log("微信 背景视频1进入视野"); + self.videoMoveIn(self._bgVideo); + self._bgShow = true; + self.removeBgAudioNext(); + Utils.sendInnerMsg(InnerMsgCode.BgVideo_Ready, {}); + } + } + }); + this._bgVideo.onEnded(() => { + if (self.doPlayEmoReadyAudio()) { + self.setBgAudioPause(self._bgVideo); + } + Utils.sendInnerMsg(InnerMsgCode.BgVideo_End, {}); + }); + } + this._bgVideo.src = remoteUrl; //视频的地址 + this._bgVideo.loop = loop; //循环播放 + this._bgVideo.play(); + } + removeBgAudio() { + this._bgShow = false; + if (this._bgVideo) { + this._bgVideo.stop(); + this.videoMoveOut(this._bgVideo); + } + } + //播放下一个视频，先加载，播放后再转到正式组件上 + private _bgTempVideo: any = null; //临时视频组件，等加载完成 + private _bgTempShow: boolean = false; + playBgAudioNext( + remoteUrl: string, + vtype: VideoRoleType, + loop: boolean = false, + extra: any = {} + ) { + this.removeBgAudioNext(); + console.log("微信 创建背景视频组件2--->", remoteUrl); + this.curPlayType = vtype; + let self = this; + if (!this._bgTempVideo) { + this._bgTempVideo = this.createVideoHandle(); + // this._bgTempVideo.onPlay(() => { + // console.log("微信 临时背景视频播放开始"); + // }) + this._bgTempVideo.onTimeUpdate((_tinfo: any) => { + // console.log("微信 临时背景视频播放进度", self._bgTempShow, _tinfo); + if (!self._bgTempShow) { + if (_tinfo && _tinfo.position > 0.01) { + console.log("微信 背景视频2进入视野"); + self._bgTempShow = true; + self.videoMoveIn(self._bgTempVideo); + self.removeBgAudio(); + Utils.sendInnerMsg(InnerMsgCode.BgVideo_Ready, {}); + } + } + }); + this._bgTempVideo.onEnded(() => { + if (self.doPlayEmoReadyAudio()) { + self.setBgAudioPause(self._bgTempVideo); + } + Utils.sendInnerMsg(InnerMsgCode.BgVideo_End, {}); + }); + } + this._bgTempVideo.src = remoteUrl; //视频的地址 + this._bgTempVideo.loop = loop; //循环播放 + this._bgTempVideo.play(); + } + removeBgAudioNext() { + this._bgTempShow = false; + if (this._bgTempVideo) { + this._bgTempVideo.stop(); + this.videoMoveOut(this._bgTempVideo); + } + } + + //region 播放emo视频 + private _emoVideo: any = null; //正式播放的视频组件 + private _emoShow: boolean = false; + addEmoAudio( + remoteUrl: string, + vtype: VideoRoleType, + loop: boolean = false, + extra: any = {} + ) { + if (this._emoVideo && this._emoShow) { + this.playEmoAudioNext(remoteUrl, vtype, loop, extra); + return; + } + let self = this; + console.log("微信 播放emo视频1", remoteUrl); + this.curPlayType = vtype; + if (!this._emoVideo) { + this._emoVideo = this.createVideoHandle(); + // this._emoVideo.onPlay(() => { + // console.log("微信 背景视频播放开始"); + // }) + this._emoVideo.onTimeUpdate((_tinfo: any) => { + // console.log("微信 背景视频播放进度", self._emoShow, _tinfo); + if (!self._emoShow) { + if (_tinfo && _tinfo.position > 0.01) { + console.log("微信 emo视频1准备好了"); + self._emoShow = true; + self.removeEmoAudioNext(); + self.setEmoReadyAudio(self._emoVideo); + if (self.curPlayType == VideoRoleType.emo) { + self.doPlayEmoReadyAudio(); + } + } + } + }); + this._emoVideo.onEnded(() => { + self.doEmoFinish(); + }); + } + this._emoVideo.src = remoteUrl; //视频的地址 + this._emoVideo.loop = loop; //循环播放 + this._emoVideo.play(); + } + removeEmoAudio() { + this._emoShow = false; + if (this._emoVideo) { + this._emoVideo.stop(); + this.videoMoveOut(this._emoVideo); + } + } + //播放下一个视频，先加载，播放后再转到正式组件上 + private _emoTempVideo: any = null; //临时视频组件，等加载完成 + private _emoTempShow: boolean = false; + playEmoAudioNext( + remoteUrl: string, + vtype: VideoRoleType, + loop: boolean = false, + extra: any = {} + ) { + this.removeEmoAudioNext(); + console.log("微信 播放emo视频2--->", remoteUrl); + this.curPlayType = vtype; + let self = this; + if (!this._emoTempVideo) { + this._emoTempVideo = this.createVideoHandle(); + // this._emoTempVideo.onPlay(() => { + // console.log("微信 临时背景视频播放开始"); + // }) + this._emoTempVideo.onTimeUpdate((_tinfo: any) => { + // console.log("微信 临时背景视频播放进度", self._emoTempShow, _tinfo); + if (!self._emoTempShow) { + if (_tinfo && _tinfo.position > 0.01) { + console.log("微信 emo视频2已准备好"); + self._emoTempShow = true; + self.removeEmoAudio(); + self.setEmoReadyAudio(self._emoTempVideo); + if (self.curPlayType == VideoRoleType.emo) { + self.doPlayEmoReadyAudio(); + } + } + } + }); + this._emoTempVideo.onEnded(() => { + self.doEmoFinish(); + }); + } + this._emoTempVideo.src = remoteUrl; //视频的地址 + this._emoTempVideo.loop = loop; //循环播放 + this._emoTempVideo.play(); + } + removeEmoAudioNext() { + this._emoTempShow = false; + if (this._emoTempVideo) { + this._emoTempVideo.stop(); + this.videoMoveOut(this._emoTempVideo); + } + } + + //视频移入屏幕 + private videoMoveIn(video: any) { + let adainfo = this.getVideoAdaInfo(); + video.x = adainfo.x; + video.y = adainfo.y; + } + //视频移出屏幕 + private videoMoveOut(video: any) { + video.x = 10000; + video.y = 10000; + } + /**创建一个视频播放器 */ + private createVideoHandle() { + let size = this.getWindowSize(); + let adainfo = this.getVideoAdaInfo(); + let bgVideo = window["wx"].createVideo({ + // src: remoteUrl, //视频的地址 + x: size.width, //先在屏幕外创建，等加载完成后再移动到屏幕上 + y: size.height, + width: this.videoWidth * adainfo.scale, //视频的宽度 + height: this.videoHeight * adainfo.scale, //视频的高度 + autoplay: true, //自动播放 + // loop: loop, //循环播放 + controls: false, //是否显示控件 + showProgress: false, //显示进度条 + showProgressInControlMode: false, //在控制模式下显示进度条 + enableProgressGesture: false, //是否启用进度手势 + showCenterPlayBtn: false, //是否显示中间的播放按钮 + underGameView: true, //视频是否显示在游戏画布之下。需要设置Camera的Clear Color为透明色 + // backgroundColor: "#00000000", //视频背景颜色 + objectFit: "fill", //视频的填充模式 + }); + return bgVideo; + } + //获取视频适配信息 + private videoWidth = 720; + private videoHeight = 1280; + private videoAdaInfo = null; + private getVideoAdaInfo() { + if (this.videoAdaInfo) return this.videoAdaInfo; + this.videoAdaInfo = { + x: 0, + y: 0, + scale: 1, + }; + let size = this.getWindowSize(); + let ratiow = size.width / this.videoWidth; //屏幕和视频的宽高比，谁大用谁 + let ratioh = size.height / this.videoHeight; + if (ratiow > ratioh) { + this.videoAdaInfo.scale = ratiow; + this.videoAdaInfo.x = 0; + this.videoAdaInfo.y = -(this.videoHeight * ratiow - size.height) / 2; + } else { + this.videoAdaInfo.scale = ratioh; + this.videoAdaInfo.x = -(this.videoWidth * ratioh - size.width) / 2; + this.videoAdaInfo.y = 0; + } + console.log("微信 视频适配信息", this.videoAdaInfo, size); + return this.videoAdaInfo; + } + + //设置暂停播放的主视频 + private vpWait: any = null; + setBgAudioPause(wait: any) { + console.log("微信 主视频暂停播放"); + this.vpWait = wait; + this.vpWait.pause(); + } + replayBgAudioPause() { + console.log("微信 主视频继续播放"); + if (this.vpWait) { + this.vpWait.play(); + } + } + + //设置准备好要播放的表情视频 + private emoReady: any = null; + setEmoReadyAudio(au: any) { + console.log("微信 设置emo ready视频"); + if (this.emoReady) { + this.emoReady.stop(); + this.videoMoveOut(this.emoReady); + } + this.emoReady = au; + this.emoReady.pause(); + } + //移除准备好要播放的表情视频 + removeEmoReadyAudio() { + console.log("微信 移除emo ready视频"); + if (this.emoReady) { + this.emoReady.stop(); + this.videoMoveOut(this.emoReady); + } + this.emoReady = null; + } + //播放准备好要播放的表情视频 + doPlayEmoReadyAudio(): boolean { + if (this.emoReady) { + console.log("微信 播放emo ready视频"); + this.emoReady.play(); + this.videoMoveIn(this.emoReady); + return true; + } + return false; + } + //表情视频播放结束 + doEmoFinish() { + console.log("微信emo ready视频播放结束"); + this.removeEmoReadyAudio(); + this.replayBgAudioPause(); + } + + //region 微信同声传译 + // private rrmgr: any = null; + // startRecordRecognition() { + // console.log("微信 同声传译111") + // if (!this.rrmgr) { + // const plugin = requirePlugin("WechatSI"); + // this.rrmgr = plugin.getRecordRecognitionManager(); + // console.log("微信 同声传译222") + + // // 监听识别结果 + // this.rrmgr.onRecognize = (res) => { + // console.log("微信 同声传译识别结果：", res.result); + // }; + + // // 监听录音结束 + // this.rrmgr.onStop = (res) => { + // console.log("微信 同声传译录音结束", res); + // }; + // } + // this.rrmgr.start({ lang: "zh_CN" }); + // console.log("微信 同声传译333") + // } + // stopRecordRecognition() { + // if (this.rrmgr) { + // this.rrmgr.stop(); + // console.log("微信 同声传译444") + // } + // } + + //region 复制到剪贴板 + /**复制文本到剪贴板 */ + copyToClipboard(text: string, cb?: Function) { + console.log("微信 复制到剪贴板：", text); + window["wx"].setClipboardData({ + data: text, + success: () => { + console.log("微信 复制成功"); + cb && cb(true); + }, + fail: (err) => { + console.log("微信 复制失败：", err); + cb && cb(false); + }, + }); + } + + //region 友盟+ + //初始化友盟+ + umaInit() { + // window["wx"].uma.init({ + // appKey: "67c969b99a16fe6dcd5bfec5", + // useOpenid: true, // default true + // autoGetOpenid: true, + // debug: true, + // uploadUserInfo: true, // 上传用户信息，上传后可以看到有用户头像和昵称的分享信息 + // }); + // console.log("微信 uma 初始化"); + } + //友盟统计是否开启 + umaSwt() { + return true; + } + //友盟事件统计 + umaEvent(eventName: string, value: any = {}) { + window["wx"].uma.trackEvent(eventName, value); + console.log("微信 uma 统计：", eventName, value); + } +} diff --git a/assets/Scripts/Main/Channel/luffaSDK.ts.meta b/assets/Scripts/Main/Channel/luffaSDK.ts.meta new file mode 100644 index 00000000..4ba6c5ff --- /dev/null +++ b/assets/Scripts/Main/Channel/luffaSDK.ts.meta @@ -0,0 +1 @@ +{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"0c025735-16d4-4eb8-adc9-5fdfccf35794","files":[],"subMetas":{},"userData":{}} diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts index 9f52d335..6573952b 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts @@ -25,6 +25,7 @@ import LanguageUtils from "../../../Main/Common/LanguageUtils"; import { ViewManager } from "../../../Main/Manager/ViewManager"; import { TipsPanel } from "./TipsPanel"; import ResManager from "../../../Main/Manager/ResManager"; +import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; const { ccclass, property } = _decorator; @ccclass("GirlListPopupPanel") @@ -36,6 +37,7 @@ export class GirlListPopupPanel extends li_BaseView { private girlName: Label; private girlTag: Label; + private balanceCount: Label; base: GirlListItem; img: Sprite; @@ -56,6 +58,7 @@ export class GirlListPopupPanel extends li_BaseView { this.uitransform = this._nodeTab.Img_Frame.getComponent(UITransform); this.girlName = this._nodeTab.Name.getComponent(Label); this.girlTag = this._nodeTab.Tag.getComponent(Label); + this.balanceCount = this._nodeTab.balanceCount.getComponent(Label); const girlData = DataManager.I.getDataById(DataId.Girl); // 价格 this.priceLabel = this._nodeTab.Price.getComponent(Label); @@ -72,11 +75,11 @@ export class GirlListPopupPanel extends li_BaseView { ); const path = girlData.getGrilAvatar(this.category.toString(), this.girlId); - + this.refreshCoinNum(); //console.log(path); // 加载远程资源 const envData = DataManager.I.getDataById(DataId.Env); - let newPath = envData.cdn + "/" + "Girls/" + path + ".png"; + let newPath = envData.cdn + "/" + "Girls/" + path + ".png"; ResManager.I.changeRemoteSpriteFrame(this.img, newPath, () => { this.scaleToFillItem(); }); @@ -84,10 +87,15 @@ export class GirlListPopupPanel extends li_BaseView { registerListener() { GButton.BandClick(this._nodeTab.BuyBtn, this.buyCharacter, this); GButton.BandClick(this._nodeTab.CloseBtn, this.Close, this); + + Utils.addInnerEL(InnerMsgCode.BalanceChange, this, this.onBalanceChange); } Close() { this.close(); } + onDestroy(): void { + Utils.removeInnerEL(InnerMsgCode.BalanceChange, this, this.onBalanceChange); + } async buyCharacter() { // 购买id为girlId的女生 console.log(this.girlId); @@ -116,6 +124,15 @@ export class GirlListPopupPanel extends li_BaseView { // TipsPanel.show("Insufficient balance, need to purchase"); } + // 刷新余额 + private refreshCoinNum() { + const walletData = DataManager.I.getDataById(DataId.Wallet); + const balance = walletData.getOriginalBalance(); + this.balanceCount.string = balance.toString(); + } + onBalanceChange = () => { + this.refreshCoinNum(); + }; scaleToFillItem() { if (!this.img || !this.img.spriteFrame) return; diff --git a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts index d7bbe33d..66465e46 100644 --- a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts @@ -33,6 +33,7 @@ export class PopupGirlDetailPanel extends li_BaseView { private resId: number; private type: proto.cs.EnmResType; private base: DetailImageItem | ImagePopup; + private balanceCount: Label; private desc: Label; @@ -56,6 +57,8 @@ export class PopupGirlDetailPanel extends li_BaseView { this.uitransform = this._nodeTab.Img_Frame.getComponent(UITransform); this.img = this._nodeTab.img.getComponent(Sprite); let descText = LanguageUtils.getText("popupgirldetailpanel.content"); + this.balanceCount = this._nodeTab.balanceCount.getComponent(Label); + this.refreshCoinNum(); const girlData = DataManager.I.getDataById(DataId.Girl); // 价格 @@ -95,7 +98,7 @@ export class PopupGirlDetailPanel extends li_BaseView { // 加载远程资源 const envData = DataManager.I.getDataById(DataId.Env); const path = url + "_thumbnail_blur"; - let newPath = envData.cdn + "/" + "Girls/" + path + ".jpg"; + let newPath = envData.cdn + "/" + "Girls/" + path + ".jpg"; ResManager.I.changeRemoteSpriteFrame(this.img, newPath, () => { this.scaleToFillItem(); }); @@ -147,7 +150,12 @@ export class PopupGirlDetailPanel extends li_BaseView { TipsPanel.show("Insufficient balance, need to purchase"); } } - + // 刷新余额 + private refreshCoinNum() { + const walletData = DataManager.I.getDataById(DataId.Wallet); + const balance = walletData.getOriginalBalance(); + this.balanceCount.string = balance.toString(); + } scaleToFillItem() { if (!this.img || !this.img.spriteFrame) return; diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index 19616457..56818828 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -174,6 +174,7 @@ export class PurchasePanel extends li_BaseView { } createOrRefreshWeb3PayPanel(param: any) { + if (param.payType == proto.cs.EnmPayType.EPT_Cash_INR) return; let data = { orderId: param.orderId, payType: param.payType, diff --git a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts index ef287f93..d35a6634 100644 --- a/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/Web3PopPanel.ts @@ -10,6 +10,7 @@ import { PurchasePanel } from "./PurchasePanel"; import { QRCodeGenerator } from "db://assets/utils/qrcodeGenerator"; import { TipsPanel } from "./TipsPanel"; import { SDKManager } from "../../../Main/Channel/SDKManager"; +import LanguageUtils from "../../../Main/Common/LanguageUtils"; const { ccclass, property } = _decorator; @@ -108,8 +109,11 @@ export class Web3PopPanel extends li_BaseView { const walletUrl = OrderData.getWalletById(this.orderId); const expireTime = OrderData.getExpireById(this.orderId); - const retCode = OrderData.getRetCodeById(this.orderId); - + // const retCode = OrderData.getRetCodeById(this.orderId); + // if (retCode != 0) { + // TipsPanel.show(LanguageUtils.getText("error_code_"+retCode)); + // return; + // } this.expireTimeText.string = expireTime.toString(); this.amount.string = amount; this.address.string = walletUrl; diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index 7db84874..26a2203e 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -24,21 +24,21 @@ ], "_active": true, "_components": [ - { - "__id__": 374 - }, - { - "__id__": 376 - }, - { - "__id__": 378 - }, { "__id__": 380 + }, + { + "__id__": 382 + }, + { + "__id__": 384 + }, + { + "__id__": 386 } ], "_prefab": { - "__id__": 382 + "__id__": 388 }, "_lpos": { "__type__": "cc.Vec3", @@ -88,23 +88,23 @@ "__id__": 15 }, { - "__id__": 356 + "__id__": 362 } ], "_active": true, "_components": [ { - "__id__": 367 + "__id__": 373 }, { - "__id__": 369 + "__id__": 375 }, { - "__id__": 371 + "__id__": 377 } ], "_prefab": { - "__id__": 373 + "__id__": 379 }, "_lpos": { "__type__": "cc.Vec3", @@ -420,23 +420,23 @@ "__id__": 16 }, { - "__id__": 275 + "__id__": 281 } ], "_active": true, "_components": [ { - "__id__": 349 + "__id__": 355 }, { - "__id__": 351 + "__id__": 357 }, { - "__id__": 353 + "__id__": 359 } ], "_prefab": { - "__id__": 355 + "__id__": 361 }, "_lpos": { "__type__": "cc.Vec3", @@ -482,21 +482,21 @@ ], "_active": true, "_components": [ - { - "__id__": 266 - }, - { - "__id__": 268 - }, - { - "__id__": 270 - }, { "__id__": 272 + }, + { + "__id__": 274 + }, + { + "__id__": 276 + }, + { + "__id__": 278 } ], "_prefab": { - "__id__": 274 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -542,21 +542,21 @@ ], "_active": true, "_components": [ - { - "__id__": 257 - }, - { - "__id__": 259 - }, - { - "__id__": 261 - }, { "__id__": 263 + }, + { + "__id__": 265 + }, + { + "__id__": 267 + }, + { + "__id__": 269 } ], "_prefab": { - "__id__": 265 + "__id__": 271 }, "_lpos": { "__type__": "cc.Vec3", @@ -609,23 +609,23 @@ "__id__": 166 }, { - "__id__": 242 + "__id__": 248 } ], "_active": true, "_components": [ { - "__id__": 250 + "__id__": 256 }, { - "__id__": 252 + "__id__": 258 }, { - "__id__": 254 + "__id__": 260 } ], "_prefab": { - "__id__": 256 + "__id__": 262 }, "_lpos": { "__type__": "cc.Vec3", @@ -2798,6 +2798,8 @@ "__id__": 0 }, "fileId": "06jLQq9y1EiYCkIXl0LrXt", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -4083,23 +4085,26 @@ "__id__": 167 }, { - "__id__": 201 + "__id__": 173 + }, + { + "__id__": 207 } ], "_active": true, "_components": [ { - "__id__": 235 + "__id__": 241 }, { - "__id__": 237 + "__id__": 243 }, { - "__id__": 239 + "__id__": 245 } ], "_prefab": { - "__id__": 241 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -4130,6 +4135,140 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 166 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 168 + }, + { + "__id__": 170 + } + ], + "_prefab": { + "__id__": 172 + }, + "_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__": 167 + }, + "_enabled": true, + "__prefab": { + "__id__": 169 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1029, + "height": 114 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35CJodzupKXrqSyw6mUPsX" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 167 + }, + "_enabled": true, + "__prefab": { + "__id__": 171 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "42906726-76e0-4225-9dbf-13c622bfc834@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": "a4CfoW4VFHpL6WF1yMyiOw" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "eaXcMsu9NIZbMyNhSIVgD3", + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "ImgBtn", @@ -4140,29 +4279,29 @@ }, "_children": [ { - "__id__": 168 + "__id__": 174 }, { - "__id__": 180 + "__id__": 186 } ], "_active": true, "_components": [ - { - "__id__": 192 - }, - { - "__id__": 194 - }, - { - "__id__": 196 - }, { "__id__": 198 + }, + { + "__id__": 200 + }, + { + "__id__": 202 + }, + { + "__id__": 204 } ], "_prefab": { - "__id__": 200 + "__id__": 206 }, "_lpos": { "__type__": "cc.Vec3", @@ -4199,24 +4338,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 173 }, "_children": [ { - "__id__": 169 + "__id__": 175 } ], "_active": true, "_components": [ { - "__id__": 175 + "__id__": 181 }, { - "__id__": 177 + "__id__": 183 } ], "_prefab": { - "__id__": 179 + "__id__": 185 }, "_lpos": { "__type__": "cc.Vec3", @@ -4253,20 +4392,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 168 + "__id__": 174 }, "_children": [], "_active": true, "_components": [ { - "__id__": 170 + "__id__": 176 }, { - "__id__": 172 + "__id__": 178 } ], "_prefab": { - "__id__": 174 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -4303,11 +4442,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -4331,11 +4470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4389,11 +4528,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 174 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 182 }, "_contentSize": { "__type__": "cc.Size", @@ -4417,11 +4556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 174 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 184 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4475,24 +4614,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 173 }, "_children": [ { - "__id__": 181 + "__id__": 187 } ], "_active": true, "_components": [ { - "__id__": 187 + "__id__": 193 }, { - "__id__": 189 + "__id__": 195 } ], "_prefab": { - "__id__": 191 + "__id__": 197 }, "_lpos": { "__type__": "cc.Vec3", @@ -4529,20 +4668,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 186 }, "_children": [], "_active": true, "_components": [ { - "__id__": 182 + "__id__": 188 }, { - "__id__": 184 + "__id__": 190 } ], "_prefab": { - "__id__": 186 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -4579,11 +4718,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -4607,11 +4746,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4665,11 +4804,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 194 }, "_contentSize": { "__type__": "cc.Size", @@ -4693,11 +4832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 196 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4751,11 +4890,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 199 }, "_contentSize": { "__type__": "cc.Size", @@ -4779,11 +4918,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 201 }, "_alignFlags": 5, "_target": null, @@ -4815,17 +4954,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 203 }, "selectedSprite": { - "__id__": 189 + "__id__": 195 }, "unSelectedSprite": { - "__id__": 177 + "__id__": 183 }, "_id": "" }, @@ -4839,11 +4978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 205 }, "clickEvents": [], "_interactable": true, @@ -4912,29 +5051,29 @@ }, "_children": [ { - "__id__": 202 + "__id__": 208 }, { - "__id__": 214 + "__id__": 220 } ], "_active": true, "_components": [ - { - "__id__": 226 - }, - { - "__id__": 228 - }, - { - "__id__": 230 - }, { "__id__": 232 + }, + { + "__id__": 234 + }, + { + "__id__": 236 + }, + { + "__id__": 238 } ], "_prefab": { - "__id__": 234 + "__id__": 240 }, "_lpos": { "__type__": "cc.Vec3", @@ -4971,24 +5110,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 203 + "__id__": 209 } ], "_active": true, "_components": [ { - "__id__": 209 + "__id__": 215 }, { - "__id__": 211 + "__id__": 217 } ], "_prefab": { - "__id__": 213 + "__id__": 219 }, "_lpos": { "__type__": "cc.Vec3", @@ -5025,20 +5164,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 204 + "__id__": 210 }, { - "__id__": 206 + "__id__": 212 } ], "_prefab": { - "__id__": 208 + "__id__": 214 }, "_lpos": { "__type__": "cc.Vec3", @@ -5075,11 +5214,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 211 }, "_contentSize": { "__type__": "cc.Size", @@ -5103,11 +5242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 213 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5161,11 +5300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 216 }, "_contentSize": { "__type__": "cc.Size", @@ -5189,11 +5328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 218 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5247,24 +5386,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 215 + "__id__": 221 } ], "_active": false, "_components": [ { - "__id__": 221 + "__id__": 227 }, { - "__id__": 223 + "__id__": 229 } ], "_prefab": { - "__id__": 225 + "__id__": 231 }, "_lpos": { "__type__": "cc.Vec3", @@ -5301,20 +5440,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 220 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 222 }, { - "__id__": 218 + "__id__": 224 } ], "_prefab": { - "__id__": 220 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -5351,11 +5490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", @@ -5379,11 +5518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 225 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5437,11 +5576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", @@ -5465,11 +5604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 230 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5523,11 +5662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 233 }, "_contentSize": { "__type__": "cc.Size", @@ -5551,11 +5690,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 235 }, "_alignFlags": 5, "_target": null, @@ -5587,17 +5726,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 237 }, "selectedSprite": { - "__id__": 223 + "__id__": 229 }, "unSelectedSprite": { - "__id__": 211 + "__id__": 217 }, "_id": "" }, @@ -5611,11 +5750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 239 }, "clickEvents": [], "_interactable": true, @@ -5684,7 +5823,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 242 }, "_contentSize": { "__type__": "cc.Size", @@ -5712,7 +5851,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 244 }, "_alignFlags": 40, "_target": null, @@ -5748,7 +5887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 246 }, "_id": "" }, @@ -5781,17 +5920,17 @@ "_active": true, "_components": [ { - "__id__": 243 + "__id__": 249 }, { - "__id__": 245 + "__id__": 251 }, { - "__id__": 247 + "__id__": 253 } ], "_prefab": { - "__id__": 249 + "__id__": 255 }, "_lpos": { "__type__": "cc.Vec3", @@ -5828,11 +5967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 250 }, "_contentSize": { "__type__": "cc.Size", @@ -5856,11 +5995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 252 }, "_resizeMode": 1, "_layoutType": 3, @@ -5894,11 +6033,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 254 }, "_alignFlags": 40, "_target": null, @@ -5947,7 +6086,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 257 }, "_contentSize": { "__type__": "cc.Size", @@ -5975,7 +6114,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 259 }, "_alignFlags": 41, "_target": null, @@ -6011,7 +6150,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 261 }, "_resizeMode": 1, "_layoutType": 2, @@ -6062,7 +6201,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 264 }, "_contentSize": { "__type__": "cc.Size", @@ -6090,7 +6229,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 266 }, "_type": 0, "_inverted": false, @@ -6112,7 +6251,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 268 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6158,7 +6297,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 270 }, "_alignFlags": 45, "_target": null, @@ -6207,7 +6346,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 273 }, "_contentSize": { "__type__": "cc.Size", @@ -6235,7 +6374,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 269 + "__id__": 275 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6280,7 +6419,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 277 }, "bounceDuration": 0.23, "brake": 0.75, @@ -6311,7 +6450,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 279 }, "_alignFlags": 45, "_target": null, @@ -6359,42 +6498,42 @@ "__id__": 15 }, "_children": [ - { - "__id__": 276 - }, { "__id__": 282 }, { - "__id__": 306 + "__id__": 288 }, { "__id__": 312 }, { "__id__": 318 + }, + { + "__id__": 324 } ], "_active": true, "_components": [ - { - "__id__": 338 - }, - { - "__id__": 340 - }, - { - "__id__": 342 - }, { "__id__": 344 }, { "__id__": 346 + }, + { + "__id__": 348 + }, + { + "__id__": 350 + }, + { + "__id__": 352 } ], "_prefab": { - "__id__": 348 + "__id__": 354 }, "_lpos": { "__type__": "cc.Vec3", @@ -6431,20 +6570,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 275 + "__id__": 281 }, "_children": [], "_active": true, "_components": [ { - "__id__": 277 + "__id__": 283 }, { - "__id__": 279 + "__id__": 285 } ], "_prefab": { - "__id__": 281 + "__id__": 287 }, "_lpos": { "__type__": "cc.Vec3", @@ -6481,11 +6620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 276 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 278 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", @@ -6509,11 +6648,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 276 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 286 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6567,30 +6706,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 275 + "__id__": 281 }, "_children": [ { - "__id__": 283 + "__id__": 289 }, { - "__id__": 291 + "__id__": 297 } ], "_active": true, "_components": [ { - "__id__": 299 + "__id__": 305 }, { - "__id__": 301 + "__id__": 307 }, { - "__id__": 303 + "__id__": 309 } ], "_prefab": { - "__id__": 305 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -6627,23 +6766,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 282 + "__id__": 288 }, "_children": [], "_active": true, "_components": [ { - "__id__": 284 + "__id__": 290 }, { - "__id__": 286 + "__id__": 292 }, { - "__id__": 288 + "__id__": 294 } ], "_prefab": { - "__id__": 290 + "__id__": 296 }, "_lpos": { "__type__": "cc.Vec3", @@ -6680,11 +6819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 291 }, "_contentSize": { "__type__": "cc.Size", @@ -6708,11 +6847,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 293 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6753,11 +6892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 295 }, "_alignFlags": 45, "_target": null, @@ -6802,23 +6941,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 282 + "__id__": 288 }, "_children": [], "_active": true, "_components": [ { - "__id__": 292 + "__id__": 298 }, { - "__id__": 294 + "__id__": 300 }, { - "__id__": 296 + "__id__": 302 } ], "_prefab": { - "__id__": 298 + "__id__": 304 }, "_lpos": { "__type__": "cc.Vec3", @@ -6855,11 +6994,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 297 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 299 }, "_contentSize": { "__type__": "cc.Size", @@ -6883,11 +7022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 297 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 301 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6928,11 +7067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 297 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 303 }, "playOnLoad": true, "_clips": [ @@ -6970,11 +7109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 306 }, "_contentSize": { "__type__": "cc.Size", @@ -6998,11 +7137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 308 }, "_alignFlags": 45, "_target": null, @@ -7034,14 +7173,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 310 }, "animation": { - "__id__": 296 + "__id__": 302 }, "_id": "" }, @@ -7068,143 +7207,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 275 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 307 - }, - { - "__id__": 309 - } - ], - "_prefab": { - "__id__": 311 - }, - "_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__": 306 - }, - "_enabled": true, - "__prefab": { - "__id__": 308 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 87, - "height": 127 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c3AUBBvJ5EILCYbD/7sNee" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 306 - }, - "_enabled": true, - "__prefab": { - "__id__": 310 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "4aec67ca-d8be-465c-bc9e-54535aed70b8@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": "6fOgEWfAdHcqTMLLVn9rkt" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "31ThkJwTdO1bKibNu3m8u0", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "video", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 275 + "__id__": 281 }, "_children": [], "_active": true, @@ -7260,6 +7263,142 @@ "__prefab": { "__id__": 314 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 87, + "height": 127 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c3AUBBvJ5EILCYbD/7sNee" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 312 + }, + "_enabled": true, + "__prefab": { + "__id__": 316 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "4aec67ca-d8be-465c-bc9e-54535aed70b8@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": "6fOgEWfAdHcqTMLLVn9rkt" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "31ThkJwTdO1bKibNu3m8u0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "video", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 281 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 319 + }, + { + "__id__": 321 + } + ], + "_prefab": { + "__id__": 323 + }, + "_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__": 318 + }, + "_enabled": true, + "__prefab": { + "__id__": 320 + }, "_contentSize": { "__type__": "cc.Size", "width": 83, @@ -7282,11 +7421,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 318 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 322 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7340,30 +7479,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 275 + "__id__": 281 }, "_children": [ { - "__id__": 319 + "__id__": 325 }, { - "__id__": 325 + "__id__": 331 } ], "_active": true, "_components": [ { - "__id__": 331 + "__id__": 337 }, { - "__id__": 333 + "__id__": 339 }, { - "__id__": 335 + "__id__": 341 } ], "_prefab": { - "__id__": 337 + "__id__": 343 }, "_lpos": { "__type__": "cc.Vec3", @@ -7400,20 +7539,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 318 + "__id__": 324 }, "_children": [], "_active": true, "_components": [ { - "__id__": 320 + "__id__": 326 }, { - "__id__": 322 + "__id__": 328 } ], "_prefab": { - "__id__": 324 + "__id__": 330 }, "_lpos": { "__type__": "cc.Vec3", @@ -7450,11 +7589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 325 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 327 }, "_contentSize": { "__type__": "cc.Size", @@ -7478,11 +7617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 325 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 329 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7559,20 +7698,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 318 + "__id__": 324 }, "_children": [], "_active": true, "_components": [ { - "__id__": 326 + "__id__": 332 }, { - "__id__": 328 + "__id__": 334 } ], "_prefab": { - "__id__": 330 + "__id__": 336 }, "_lpos": { "__type__": "cc.Vec3", @@ -7609,11 +7748,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 333 }, "_contentSize": { "__type__": "cc.Size", @@ -7637,11 +7776,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 335 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7695,11 +7834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 338 }, "_contentSize": { "__type__": "cc.Size", @@ -7723,11 +7862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 340 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7768,11 +7907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 342 }, "_alignFlags": 9, "_target": null, @@ -7817,11 +7956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 345 }, "_contentSize": { "__type__": "cc.Size", @@ -7845,11 +7984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 347 }, "clickEvents": [], "_interactable": true, @@ -7889,7 +8028,7 @@ "_duration": 0.1, "_zoomScale": 0.95, "_target": { - "__id__": 275 + "__id__": 281 }, "_id": "" }, @@ -7903,29 +8042,29 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 349 }, "img": { - "__id__": 279 + "__id__": 285 }, "question": { - "__id__": 306 + "__id__": 312 }, "video": { - "__id__": 315 + "__id__": 321 }, "priceFrame": { - "__id__": 318 + "__id__": 324 }, "videoPrice": { - "__id__": 322 + "__id__": 328 }, "loading": { - "__id__": 282 + "__id__": 288 }, "_id": "" }, @@ -7939,11 +8078,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 351 }, "_type": 0, "_inverted": false, @@ -7961,11 +8100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 353 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8024,7 +8163,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 356 }, "_contentSize": { "__type__": "cc.Size", @@ -8052,7 +8191,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 352 + "__id__": 358 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8097,7 +8236,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 360 }, "_alignFlags": 40, "_target": null, @@ -8148,20 +8287,20 @@ "_active": true, "_components": [ { - "__id__": 357 + "__id__": 363 }, { - "__id__": 359 + "__id__": 365 }, { - "__id__": 361 + "__id__": 367 }, { - "__id__": 364 + "__id__": 370 } ], "_prefab": { - "__id__": 366 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -8198,11 +8337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 364 }, "_contentSize": { "__type__": "cc.Size", @@ -8226,11 +8365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 366 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8271,15 +8410,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 368 }, "clickEvents": [ { - "__id__": 363 + "__id__": 369 } ], "_interactable": true, @@ -8319,7 +8458,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 356 + "__id__": 362 }, "_id": "" }, @@ -8343,11 +8482,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 365 + "__id__": 371 }, "_alignFlags": 9, "_target": null, @@ -8396,7 +8535,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 374 }, "_contentSize": { "__type__": "cc.Size", @@ -8424,7 +8563,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 370 + "__id__": 376 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8466,7 +8605,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 378 }, "_alignFlags": 45, "_target": null, @@ -8515,7 +8654,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 381 }, "_contentSize": { "__type__": "cc.Size", @@ -8543,7 +8682,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 383 }, "_alignFlags": 45, "_target": null, @@ -8579,7 +8718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 379 + "__id__": 385 }, "_id": "" }, @@ -8597,7 +8736,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 387 }, "m_rootNode": null, "videoArea": { @@ -8607,10 +8746,10 @@ "__id__": 51 }, "imgToggle": { - "__id__": 196 + "__id__": 202 }, "videoToggle": { - "__id__": 230 + "__id__": 236 }, "starParent": { "__id__": 56 @@ -8631,10 +8770,10 @@ "__id__": 15 }, "imgItemInst": { - "__id__": 342 + "__id__": 348 }, "imgsLayout": { - "__id__": 242 + "__id__": 248 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/GirlListPanel.prefab b/assets/bundles/Chat18x/GirlListPanel.prefab index 11ea6f20..7fc1ed41 100644 --- a/assets/bundles/Chat18x/GirlListPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPanel.prefab @@ -661,8 +661,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, + "x": 0.82, + "y": 0.82, "z": 1 }, "_mobility": 0, @@ -1403,8 +1403,6 @@ "__id__": 0 }, "fileId": "84tq+XsAhMD7Pf5ZzCDcs4", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/bundles/Chat18x/GirlListPopupPanel.prefab b/assets/bundles/Chat18x/GirlListPopupPanel.prefab index 75944ae1..c9ea7135 100644 --- a/assets/bundles/Chat18x/GirlListPopupPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPopupPanel.prefab @@ -23,25 +23,28 @@ }, { "__id__": 12 + }, + { + "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 132 + "__id__": 154 }, { - "__id__": 134 + "__id__": 156 }, { - "__id__": 136 + "__id__": 158 }, { - "__id__": 138 + "__id__": 160 } ], "_prefab": { - "__id__": 140 + "__id__": 162 }, "_lpos": { "__type__": "cc.Vec3", @@ -173,10 +176,10 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 0 + "r": 24, + "g": 15, + "b": 32, + "a": 153 }, "_spriteFrame": { "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", @@ -270,7 +273,7 @@ }, { "__type__": "cc.Node", - "_name": "mask", + "_name": "current", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -281,29 +284,584 @@ "__id__": 13 }, { - "__id__": 27 + "__id__": 19 }, { - "__id__": 33 - }, - { - "__id__": 115 + "__id__": 25 } ], "_active": true, "_components": [ { - "__id__": 125 - }, - { - "__id__": 127 - }, - { - "__id__": 129 + "__id__": 31 } ], "_prefab": { - "__id__": 131 + "__id__": 33 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -690.788, + "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": "currentBalanceText", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 12 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -227.00900000000001, + "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__": 13 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 231.234375, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "33DvnT3jFD4I12qzmDlJ4m" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 13 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 162, + "g": 155, + "b": 169, + "a": 255 + }, + "_string": "Current Balance", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 32, + "_fontSize": 32, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "52af39e6-df78-413a-88bb-72dfdca7ec84", + "__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": "0frT7n6VpLqI9J1jkkbtOl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "42px3+NyVEbo4c+A47OIxA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "图层 600", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 12 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 20 + }, + { + "__id__": 22 + } + ], + "_prefab": { + "__id__": 24 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -28.992999999999995, + "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__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 117, + "height": 59 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d9yvwrsW9Bw5eavk7iCwSB" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "e42051cb-525e-48e1-9303-6c85a1b70661@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": "5akbMrazZJWoUMAV5HpCP3" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8cWF4SfDNLeYjqx306Tdun", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "balanceCount", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 12 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 26 + }, + { + "__id__": 28 + } + ], + "_prefab": { + "__id__": 30 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 51.212999999999965, + "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__": 25 + }, + "_enabled": true, + "__prefab": { + "__id__": 27 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 280, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5f8tpdLS1Ay6Byir93wA1G" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 25 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 170, + "g": 194, + "b": 188, + "a": 255 + }, + "_string": "999,99.99", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 42, + "_fontSize": 41, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "08nTNrTcFO2b/GmmalhngU" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ed4GL5cx5BQYH3+duQOT1v", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 32 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1000, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "31FCh/pLJFm5LI9ZFokXDy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "15AarK8ytGcrJaMIz/6Y9W", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "mask", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 35 + }, + { + "__id__": 49 + }, + { + "__id__": 55 + }, + { + "__id__": 137 + } + ], + "_active": true, + "_components": [ + { + "__id__": 147 + }, + { + "__id__": 149 + }, + { + "__id__": 151 + } + ], + "_prefab": { + "__id__": 153 }, "_lpos": { "__type__": "cc.Vec3", @@ -340,24 +898,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 34 }, "_children": [ { - "__id__": 14 + "__id__": 36 } ], "_active": true, "_components": [ { - "__id__": 22 + "__id__": 44 }, { - "__id__": 24 + "__id__": 46 } ], "_prefab": { - "__id__": 26 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -394,23 +952,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 13 + "__id__": 35 }, "_children": [], "_active": true, "_components": [ { - "__id__": 15 + "__id__": 37 }, { - "__id__": 17 + "__id__": 39 }, { - "__id__": 19 + "__id__": 41 } ], "_prefab": { - "__id__": 21 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -447,11 +1005,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 38 }, "_contentSize": { "__type__": "cc.Size", @@ -475,11 +1033,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 40 }, "_alignFlags": 42, "_target": null, @@ -511,11 +1069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 42 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -566,11 +1124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -594,11 +1152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 47 }, "_alignFlags": 1, "_target": null, @@ -643,20 +1201,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 34 }, "_children": [], "_active": true, "_components": [ { - "__id__": 28 + "__id__": 50 }, { - "__id__": 30 + "__id__": 52 } ], "_prefab": { - "__id__": 32 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", @@ -693,11 +1251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -721,11 +1279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 53 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -779,36 +1337,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 34 }, "_children": [ { - "__id__": 34 + "__id__": 56 }, { - "__id__": 42 + "__id__": 64 }, { - "__id__": 50 + "__id__": 72 }, { - "__id__": 88 + "__id__": 110 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 130 }, { - "__id__": 110 + "__id__": 132 }, { - "__id__": 112 + "__id__": 134 } ], "_prefab": { - "__id__": 114 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -845,28 +1403,28 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 55 }, "_children": [], "_active": true, "_components": [ { - "__id__": 35 + "__id__": 57 }, { - "__id__": 37 + "__id__": 59 }, { - "__id__": 39 + "__id__": 61 } ], "_prefab": { - "__id__": 41 + "__id__": 63 }, "_lpos": { "__type__": "cc.Vec3", - "x": -282.803, - "y": 110.03599999999994, + "x": -418.53647650000005, + "y": 159.64, "z": 0 }, "_lrot": { @@ -898,20 +1456,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", - "width": 235.526953, + "width": 413.526953, "height": 91.2 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -926,11 +1484,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -945,8 +1503,8 @@ "_string": "Anaya", "_horizontalAlign": 0, "_verticalAlign": 1, - "_actualFontSize": 79, - "_fontSize": 78, + "_actualFontSize": 61, + "_fontSize": 60, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 2, @@ -997,17 +1555,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 62 }, "_alignFlags": 9, "_target": null, - "_left": 31.933523500000007, + "_left": 13.96352349999998, "_right": 0, - "_top": 54.86400000000006, + "_top": 5.260000000000019, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -1046,23 +1604,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 55 }, "_children": [], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 65 }, { - "__id__": 45 + "__id__": 67 }, { - "__id__": 47 + "__id__": 69 } ], "_prefab": { - "__id__": 49 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -1099,11 +1657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 66 }, "_contentSize": { "__type__": "cc.Size", @@ -1127,11 +1685,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 68 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1198,11 +1756,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 70 }, "_alignFlags": 33, "_target": null, @@ -1237,6 +1795,8 @@ "__id__": 0 }, "fileId": "0b9T5k+FhPU7yu97KcrYjE", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1245,39 +1805,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 55 }, "_children": [ { - "__id__": 51 + "__id__": 73 }, { - "__id__": 57 - }, - { - "__id__": 63 - }, - { - "__id__": 69 - }, - { - "__id__": 75 - } - ], - "_active": false, - "_components": [ - { - "__id__": 81 - }, - { - "__id__": 83 + "__id__": 79 }, { "__id__": 85 + }, + { + "__id__": 91 + }, + { + "__id__": 97 + } + ], + "_active": true, + "_components": [ + { + "__id__": 103 + }, + { + "__id__": 105 + }, + { + "__id__": 107 } ], "_prefab": { - "__id__": 87 + "__id__": 109 }, "_lpos": { "__type__": "cc.Vec3", @@ -1314,20 +1874,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 50 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 74 }, { - "__id__": 54 + "__id__": 76 } ], "_prefab": { - "__id__": 56 + "__id__": 78 }, "_lpos": { "__type__": "cc.Vec3", @@ -1364,11 +1924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 75 }, "_contentSize": { "__type__": "cc.Size", @@ -1392,11 +1952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 77 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1409,7 +1969,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "25c2e519-b325-4d8b-a471-b2dac08ad6a7@f9941", + "__uuid__": "f4e38fe6-4cf2-4f35-9246-f530b0bf4666@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1450,20 +2010,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 50 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 80 }, { - "__id__": 60 + "__id__": 82 } ], "_prefab": { - "__id__": 62 + "__id__": 84 }, "_lpos": { "__type__": "cc.Vec3", @@ -1500,11 +2060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 81 }, "_contentSize": { "__type__": "cc.Size", @@ -1528,11 +2088,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 83 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1545,7 +2105,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "25c2e519-b325-4d8b-a471-b2dac08ad6a7@f9941", + "__uuid__": "f4e38fe6-4cf2-4f35-9246-f530b0bf4666@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1586,20 +2146,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 50 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 86 }, { - "__id__": 66 + "__id__": 88 } ], "_prefab": { - "__id__": 68 + "__id__": 90 }, "_lpos": { "__type__": "cc.Vec3", @@ -1636,11 +2196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 85 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1664,11 +2224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 85 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 89 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1681,7 +2241,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "25c2e519-b325-4d8b-a471-b2dac08ad6a7@f9941", + "__uuid__": "f4e38fe6-4cf2-4f35-9246-f530b0bf4666@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1722,20 +2282,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 50 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 92 }, { - "__id__": 72 + "__id__": 94 } ], "_prefab": { - "__id__": 74 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -1772,11 +2332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 93 }, "_contentSize": { "__type__": "cc.Size", @@ -1800,11 +2360,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 95 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1817,7 +2377,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "25c2e519-b325-4d8b-a471-b2dac08ad6a7@f9941", + "__uuid__": "f4e38fe6-4cf2-4f35-9246-f530b0bf4666@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1858,20 +2418,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 50 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 98 }, { - "__id__": 78 + "__id__": 100 } ], "_prefab": { - "__id__": 80 + "__id__": 102 }, "_lpos": { "__type__": "cc.Vec3", @@ -1908,11 +2468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -1936,11 +2496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 101 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1953,7 +2513,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "25c2e519-b325-4d8b-a471-b2dac08ad6a7@f9941", + "__uuid__": "f4e38fe6-4cf2-4f35-9246-f530b0bf4666@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1994,11 +2554,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 104 }, "_contentSize": { "__type__": "cc.Size", @@ -2022,11 +2582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 106 }, "_alignFlags": 8, "_target": null, @@ -2058,11 +2618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 72 }, "_enabled": false, "__prefab": { - "__id__": 86 + "__id__": 108 }, "_resizeMode": 1, "_layoutType": 1, @@ -2109,24 +2669,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 55 }, "_children": [ { - "__id__": 89 + "__id__": 111 } ], "_active": true, "_components": [ { - "__id__": 103 + "__id__": 125 }, { - "__id__": 105 + "__id__": 127 } ], "_prefab": { - "__id__": 107 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -2163,24 +2723,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 110 }, "_children": [ { - "__id__": 90 + "__id__": 112 } ], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 120 }, { - "__id__": 100 + "__id__": 122 } ], "_prefab": { - "__id__": 102 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -2217,23 +2777,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 89 + "__id__": 111 }, "_children": [], "_active": true, "_components": [ { - "__id__": 91 + "__id__": 113 }, { - "__id__": 93 + "__id__": 115 }, { - "__id__": 95 + "__id__": 117 } ], "_prefab": { - "__id__": 97 + "__id__": 119 }, "_lpos": { "__type__": "cc.Vec3", @@ -2270,11 +2830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 114 }, "_contentSize": { "__type__": "cc.Size", @@ -2298,11 +2858,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2343,11 +2903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 112 }, "_enabled": false, "__prefab": { - "__id__": 96 + "__id__": 118 }, "_alignFlags": 8, "_target": null, @@ -2392,11 +2952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -2420,11 +2980,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2504,11 +3064,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 126 }, "_contentSize": { "__type__": "cc.Size", @@ -2532,11 +3092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 128 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2590,11 +3150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -2618,11 +3178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 133 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2663,11 +3223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 135 }, "_alignFlags": 4, "_target": null, @@ -2712,26 +3272,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 34 }, "_children": [], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 138 }, { - "__id__": 118 + "__id__": 140 }, { - "__id__": 120 + "__id__": 142 }, { - "__id__": 122 + "__id__": 144 } ], "_prefab": { - "__id__": 124 + "__id__": 146 }, "_lpos": { "__type__": "cc.Vec3", @@ -2768,11 +3328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -2796,11 +3356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 141 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2841,11 +3401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 143 }, "clickEvents": [], "_interactable": true, @@ -2897,7 +3457,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 115 + "__id__": 137 }, "_id": "" }, @@ -2911,11 +3471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 145 }, "_alignFlags": 33, "_target": null, @@ -2960,11 +3520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", @@ -2988,11 +3548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 150 }, "_type": 3, "_inverted": false, @@ -3010,11 +3570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 152 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3072,7 +3632,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", @@ -3100,7 +3660,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 135 + "__id__": 157 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3145,7 +3705,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 137 + "__id__": 159 }, "_type": 3, "_inverted": false, @@ -3167,7 +3727,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 161 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab b/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab index cbff7fbd..952eedd4 100644 --- a/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab @@ -22,35 +22,23 @@ "__id__": 2 }, { - "__id__": 14 + "__id__": 12 }, { - "__id__": 22 - }, - { - "__id__": 28 - }, - { - "__id__": 64 + "__id__": 94 } ], "_active": true, "_components": [ { - "__id__": 74 + "__id__": 116 }, { - "__id__": 76 - }, - { - "__id__": 78 - }, - { - "__id__": 80 + "__id__": 118 } ], "_prefab": { - "__id__": 82 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -83,78 +71,30 @@ }, { "__type__": "cc.Node", - "_name": "Img_Frame", + "_name": "blocker", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [ - { - "__id__": 3 - } - ], - "_active": true, - "_components": [ - { - "__id__": 9 - }, - { - "__id__": 11 - } - ], - "_prefab": { - "__id__": 13 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 81.5, - "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": "img", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, "_children": [], "_active": true, "_components": [ { - "__id__": 4 + "__id__": 3 }, { - "__id__": 6 + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 9 } ], "_prefab": { - "__id__": 8 + "__id__": 11 }, "_lpos": { "__type__": "cc.Vec3", @@ -191,11 +131,327 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 5 + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 2340 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "82MZjuGqFOEaSzvrZmEMum" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 24, + "g": 15, + "b": 32, + "a": 153 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "62NqdMtSpGU57Ao+Enl4JV" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_alignFlags": 45, + "_target": null, + "_left": -107.5, + "_right": -107.5, + "_top": -530.5, + "_bottom": -530.5, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 36, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c1AMKortFMuoOawJqgngc+" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1f/+h4gkVDAIr5pVaRvZbC" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3bOeLS1rNBYbsFklSeqNuW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "content", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 13 + }, + { + "__id__": 25 + }, + { + "__id__": 33 + }, + { + "__id__": 39 + }, + { + "__id__": 75 + } + ], + "_active": true, + "_components": [ + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + } + ], + "_prefab": { + "__id__": 93 + }, + "_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.Node", + "_name": "Img_Frame", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 12 + }, + "_children": [ + { + "__id__": 14 + } + ], + "_active": true, + "_components": [ + { + "__id__": 20 + }, + { + "__id__": 22 + } + ], + "_prefab": { + "__id__": 24 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 81.5, + "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": "img", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 13 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 15 + }, + { + "__id__": 17 + } + ], + "_prefab": { + "__id__": 19 + }, + "_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__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 }, "_contentSize": { "__type__": "cc.Size", @@ -219,11 +475,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 7 + "__id__": 18 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -274,11 +530,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -302,11 +558,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 23 }, "_alignFlags": 41, "_target": null, @@ -351,23 +607,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 + "__id__": 12 }, "_children": [], "_active": true, "_components": [ { - "__id__": 15 + "__id__": 26 }, { - "__id__": 17 + "__id__": 28 }, { - "__id__": 19 + "__id__": 30 } ], "_prefab": { - "__id__": 21 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -404,11 +660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 27 }, "_contentSize": { "__type__": "cc.Size", @@ -432,11 +688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 29 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -477,11 +733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 31 }, "_alignFlags": 40, "_target": null, @@ -526,20 +782,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 + "__id__": 12 }, "_children": [], "_active": true, "_components": [ { - "__id__": 23 + "__id__": 34 }, { - "__id__": 25 + "__id__": 36 } ], "_prefab": { - "__id__": 27 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -576,11 +832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -604,11 +860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -662,30 +918,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 + "__id__": 12 }, "_children": [ { - "__id__": 29 + "__id__": 40 }, { - "__id__": 37 + "__id__": 48 } ], "_active": true, "_components": [ { - "__id__": 57 + "__id__": 68 }, { - "__id__": 59 + "__id__": 70 }, { - "__id__": 61 + "__id__": 72 } ], "_prefab": { - "__id__": 63 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -722,23 +978,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 39 }, "_children": [], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 41 }, { - "__id__": 32 + "__id__": 43 }, { - "__id__": 34 + "__id__": 45 } ], "_prefab": { - "__id__": 36 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", @@ -775,11 +1031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", @@ -803,11 +1059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 44 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -874,11 +1130,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 46 }, "_alignFlags": 41, "_target": null, @@ -923,24 +1179,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 39 }, "_children": [ { - "__id__": 38 + "__id__": 49 } ], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 63 }, { - "__id__": 54 + "__id__": 65 } ], "_prefab": { - "__id__": 56 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -977,24 +1233,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 37 + "__id__": 48 }, "_children": [ { - "__id__": 39 + "__id__": 50 } ], "_active": true, "_components": [ { - "__id__": 47 + "__id__": 58 }, { - "__id__": 49 + "__id__": 60 } ], "_prefab": { - "__id__": 51 + "__id__": 62 }, "_lpos": { "__type__": "cc.Vec3", @@ -1031,23 +1287,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 38 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 40 + "__id__": 51 }, { - "__id__": 42 + "__id__": 53 }, { - "__id__": 44 + "__id__": 55 } ], "_prefab": { - "__id__": 46 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -1084,11 +1340,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1112,11 +1368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1157,11 +1413,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 50 }, "_enabled": false, "__prefab": { - "__id__": 45 + "__id__": 56 }, "_alignFlags": 8, "_target": null, @@ -1206,11 +1462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 59 }, "_contentSize": { "__type__": "cc.Size", @@ -1234,11 +1490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 61 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1318,11 +1574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 64 }, "_contentSize": { "__type__": "cc.Size", @@ -1346,11 +1602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 66 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1404,11 +1660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1432,11 +1688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 71 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1477,11 +1733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 73 }, "_alignFlags": 4, "_target": null, @@ -1526,26 +1782,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 + "__id__": 12 }, "_children": [], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 76 }, { - "__id__": 67 + "__id__": 78 }, { - "__id__": 69 + "__id__": 80 }, { - "__id__": 71 + "__id__": 82 } ], "_prefab": { - "__id__": 73 + "__id__": 84 }, "_lpos": { "__type__": "cc.Vec3", @@ -1582,11 +1838,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", @@ -1610,11 +1866,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1655,11 +1911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 81 }, "clickEvents": [], "_interactable": true, @@ -1711,7 +1967,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 64 + "__id__": 75 }, "_id": "" }, @@ -1725,11 +1981,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 83 }, "_alignFlags": 33, "_target": null, @@ -1774,11 +2030,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 86 }, "_contentSize": { "__type__": "cc.Size", @@ -1794,7 +2050,65 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2biOH0smxN94kWAshIFu8u" + "fileId": "6eOegi3gRN/rlDoglr2lyz" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 88 + }, + "_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": "1bajGxpmpBya/uBG+DRTtz" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 90 + }, + "_type": 3, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5don4ov1JMQZZLsseVEBCD" }, { "__type__": "cc.Sprite", @@ -1802,11 +2116,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 92 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1839,10 +2153,578 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "39OkFVsm9A87sPcYk2lIl9" + "fileId": "9dJkBmbEVFoYWm5lNueS6V" }, { - "__type__": "cc.Mask", + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e8LhFkvjhDPoN1mD+2+rik", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "current", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 95 + }, + { + "__id__": 101 + }, + { + "__id__": 107 + } + ], + "_active": true, + "_components": [ + { + "__id__": 113 + } + ], + "_prefab": { + "__id__": 115 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -690.788, + "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": "currentBalanceText", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 94 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 96 + }, + { + "__id__": 98 + } + ], + "_prefab": { + "__id__": 100 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -227.00900000000001, + "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": 231.234375, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "10EBYc065JmLF+gUSKJNST" + }, + { + "__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": 162, + "g": 155, + "b": 169, + "a": 255 + }, + "_string": "Current Balance", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 32, + "_fontSize": 32, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "52af39e6-df78-413a-88bb-72dfdca7ec84", + "__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": "f5378i26NLlL4X6JpfB7wL" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "18fJc2yxhDApSfp7v/xe5d", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "图层 600", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 94 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 102 + }, + { + "__id__": 104 + } + ], + "_prefab": { + "__id__": 106 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -28.992999999999995, + "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__": 101 + }, + "_enabled": true, + "__prefab": { + "__id__": 103 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 117, + "height": 59 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "90CO6E4ndNzJz6h0u1/4f1" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 101 + }, + "_enabled": true, + "__prefab": { + "__id__": 105 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "e42051cb-525e-48e1-9303-6c85a1b70661@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": "551af6dhJBKKnnn1/FyDpO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "43O+KodWFGPqGWksAGEjd2", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "balanceCount", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 94 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 108 + }, + { + "__id__": 110 + } + ], + "_prefab": { + "__id__": 112 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 51.212999999999965, + "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__": 107 + }, + "_enabled": true, + "__prefab": { + "__id__": 109 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 280, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "60e3baPYdOcY2ovZG8Bx4Z" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 107 + }, + "_enabled": true, + "__prefab": { + "__id__": 111 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 170, + "g": 194, + "b": 188, + "a": 255 + }, + "_string": "999,99.99", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 42, + "_fontSize": 41, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ffT6vNV6xJcKz9KvSwdscC" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "72NrPiElFBeLiiIPvm9wpW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 94 + }, + "_enabled": true, + "__prefab": { + "__id__": 114 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1000, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "96bIi9xIpLn4Srs3oSI0qS" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c2+AxYpm9O6JcPxUcphtZr", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -1851,17 +2733,23 @@ }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 117 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 865, + "height": 1279 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 }, - "_type": 3, - "_inverted": false, - "_segments": 64, - "_alphaThreshold": 0.1, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ed8YwALRhB1pi+/dgBbTa2" + "fileId": "2biOH0smxN94kWAshIFu8u" }, { "__type__": "5d78dGcU9VLHrCpY0tCC+NM", @@ -1873,7 +2761,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 119 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/Chat18x/Web3PopPanel.prefab b/assets/bundles/Chat18x/Web3PopPanel.prefab index 8f9f595a..6f205117 100644 --- a/assets/bundles/Chat18x/Web3PopPanel.prefab +++ b/assets/bundles/Chat18x/Web3PopPanel.prefab @@ -5394,7 +5394,7 @@ "b": 245, "a": 255 }, - "_string": "ascascasc", + "_string": "ascascasca", "_horizontalAlign": 0, "_verticalAlign": 0, "_actualFontSize": 37, @@ -5932,7 +5932,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 13.932999999999993, + "x": 5.254000000000019, "y": 336.22800000000007, "z": 0 }, @@ -6230,8 +6230,8 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 255, - "b": 255, + "g": 135, + "b": 247, "a": 255 }, "_string": "label", @@ -6343,7 +6343,7 @@ "b": 247, "a": 255 }, - "_string": "expireTime:", + "_string": "Expire Time:", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 36, diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png new file mode 100644 index 00000000..656b4e32 Binary files /dev/null and b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png differ diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta new file mode 100644 index 00000000..ccc16c85 --- /dev/null +++ b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "42906726-76e0-4225-9dbf-13c622bfc834", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "42906726-76e0-4225-9dbf-13c622bfc834@6c48a", + "displayName": "矩形 3 拷贝 4", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "42906726-76e0-4225-9dbf-13c622bfc834", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "42906726-76e0-4225-9dbf-13c622bfc834@f9941", + "displayName": "矩形 3 拷贝 4", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 1029, + "height": 114, + "rawWidth": 1029, + "rawHeight": 114, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -514.5, + -57, + 0, + 514.5, + -57, + 0, + -514.5, + 57, + 0, + 514.5, + 57, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 114, + 1029, + 114, + 0, + 0, + 1029, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -514.5, + -57, + 0 + ], + "maxPos": [ + 514.5, + 57, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "42906726-76e0-4225-9dbf-13c622bfc834@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "42906726-76e0-4225-9dbf-13c622bfc834@6c48a" + } +}