diff --git a/assets/Scripts/Main/Manager/ResManager.ts b/assets/Scripts/Main/Manager/ResManager.ts index 9afa0f05..11d33f55 100644 --- a/assets/Scripts/Main/Manager/ResManager.ts +++ b/assets/Scripts/Main/Manager/ResManager.ts @@ -1,566 +1,493 @@ -import { - _decorator, - AssetManager, - assetManager, - Component, - Node, - director, - Prefab, - resources, - Sprite, - SpriteFrame, - Texture2D, - v2, - SpriteAtlas, - ImageAsset, - instantiate, - AudioClip, - Asset, - JsonAsset, - Material, - VideoPlayer, - VideoClip, -} from "cc"; +import { _decorator, AssetManager, assetManager, Component, Node, director, Prefab, resources, Sprite, SpriteFrame, Texture2D, v2, SpriteAtlas, ImageAsset, instantiate, AudioClip, Asset, JsonAsset, Material, VideoPlayer, VideoClip } from 'cc'; const { ccclass, property } = _decorator; -@ccclass("ResManager") +@ccclass('ResManager') export default class ResManager { - private static _I: ResManager = null; - public static get I(): ResManager { - if (!ResManager._I) { - ResManager._I = new ResManager(); + private static _I: ResManager = null; + public static get I(): ResManager { + if (!ResManager._I) { + ResManager._I = new ResManager(); + } + return ResManager._I; } - return ResManager._I; - } - /**切换场景 */ - enterScene(i_sceneName: string) { - director.loadScene(i_sceneName, () => {}); - } - /** 场景-跳转到主界面场景*/ - goMainScene() { - this.enterScene("MainScene"); - } - - /** 场景-跳转到游戏场景*/ - goGameScene() { - this.enterScene("GameScene"); - } - - /** 场景-跳转到自定义场景*/ - goCustomScene(sceneName: string) { - this.enterScene(sceneName); - } - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // /**加载bundle */ - // loadBundle(bundleName, cb?) { - // let bundle = assetManager.getBundle(bundleName) - // if (bundle) { cb && cb(bundle); return; } - // assetManager.loadBundle(bundleName, (err: Error, _bundle: AssetManager.Bundle) => { - // if (!err) { - // cb && cb(_bundle); - // } - // }); - // } - /**移除bundle */ - removeBundle(bundleName) { - let bundle = assetManager.getBundle(bundleName); - if (bundle) { - bundle.releaseAll(); - assetManager.removeBundle(bundle); + /**切换场景 */ + enterScene(i_sceneName: string) { + director.loadScene(i_sceneName, () => { }); } - } - /**预加载bundle中的PB*/ - preLoadSubpackagePrefab(url: string, cb) { - let bundle = assetManager.getBundle("PB"); - if (bundle) { - bundle.preload(url, Prefab, (err, res) => { - if (err) { - console.log(err); - return; - } - cb && cb(); - }); - } else { - assetManager.loadBundle( - "PB", - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.preLoadSubpackagePrefab(url, cb); - } - ); + + + /** 场景-跳转到主界面场景*/ + goMainScene() { + this.enterScene('MainScene'); } - } - /**预加载bundle中的文件*/ - preLoadSubpackageFile(url: string, pkgName: string, ftype, succCB, failCB) { - let bundle = assetManager.getBundle(pkgName); - if (bundle) { - bundle.preload(url, ftype, (err, res) => { - if (err) { - console.log(err); - failCB && failCB(err); - return; - } - succCB && succCB(); - }); - } else { - assetManager.loadBundle( - pkgName, - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - failCB && failCB(err); - return; - } - this.preLoadSubpackageFile(url, pkgName, ftype, succCB, failCB); - } - ); + + /** 场景-跳转到游戏场景*/ + goGameScene() { + this.enterScene('GameScene'); } - } - /** 加载bundle中的PB*/ - loadSubpackagePrefab(url: string, cb) { - let bundle = assetManager.getBundle("Chat18x"); - if (bundle) { - bundle.load(url, Prefab, (err, res: Prefab) => { - if (err) { - console.log(err); - return; - } - let cc_N = instantiate(res); - cb && cb(cc_N); - }); - } else { - assetManager.loadBundle( - "PB", - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.loadSubpackagePrefab(url, cb); - } - ); + + /** 场景-跳转到自定义场景*/ + goCustomScene(sceneName:string) { + this.enterScene(sceneName); } - } - /**获取pb节点 */ - getPrefab(path: string, cb: Function, target: Node) { - this.loadSubpackagePrefab(path, (pb: Prefab) => { - if (target && !target.isValid) { - pb.destroy(); - return; - } - pb["path"] = path; - cb && cb(pb); - }); - } - /** 加载bundle中的PB*/ - loadSubpackage3DModel(url: string, cb) { - let bundle = assetManager.getBundle("Model3D"); - if (bundle) { - bundle.load(url, Prefab, (err, res: Prefab) => { - if (err) { - console.log(err); - return; + + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // /**加载bundle */ + // loadBundle(bundleName, cb?) { + // let bundle = assetManager.getBundle(bundleName) + // if (bundle) { cb && cb(bundle); return; } + // assetManager.loadBundle(bundleName, (err: Error, _bundle: AssetManager.Bundle) => { + // if (!err) { + // cb && cb(_bundle); + // } + // }); + // } + /**移除bundle */ + removeBundle(bundleName) { + let bundle = assetManager.getBundle(bundleName); + if (bundle) { + bundle.releaseAll(); + assetManager.removeBundle(bundle); } - let cc_N = instantiate(res); - cb && cb(cc_N); - }); - } else { - assetManager.loadBundle( - "Model3D", - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.loadSubpackage3DModel(url, cb); - } - ); } - } - - /** 改变图片--bundle资源 sprite-frame类型的图片*/ - changeBundleVideo( - spt: VideoPlayer, - url: string, - packageName: string, - cb: Function = null - ) { - if (!spt || !url) return; - let spttemp: any = spt; - spttemp.frameUrl = url; - let bundle = assetManager.getBundle(packageName); - if (bundle) { - bundle.load(url, VideoClip, (err, res: VideoClip) => { - if (err) { - console.log(err); - return; + /**预加载bundle中的PB*/ + preLoadSubpackagePrefab(url: string, cb) { + let bundle = assetManager.getBundle("PB"); + if (bundle){ + bundle.preload(url, Prefab, (err, res) => { + if (err) { + console.log(err); + return + } + cb && cb(); + }); + } else { + assetManager.loadBundle("PB", (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.preLoadSubpackagePrefab(url, cb); + }); } - if (!spt.isValid) { - return; - } - if (spttemp.frameUrl != url) { - return; - } - spt.clip = res; - //spt.spriteFrame = res; - cb && cb(res); - }); - } else { - assetManager.loadBundle( - packageName, - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.changeBundleVideo(spt, url, packageName, cb); - } - ); } - } - /** 改变图片--bundle资源 sprite-frame类型的图片*/ - changeBundleSpriteFrame( - spt: Sprite, - url: string, - packageName: string, - cb: Function = null, - fail: Function = null - ) { - if (!spt || !url) return; - let spttemp: any = spt; - spttemp.frameUrl = url; - let bundle = assetManager.getBundle(packageName); - if (bundle) { - bundle.load( - url + "/spriteFrame", - SpriteFrame, - (err, res: SpriteFrame) => { - if (err) { - console.log(err); - return; - } - if (!spt.isValid) { - return; - } - if (spttemp.frameUrl != url) { - return; - } - spt.spriteFrame = res; - cb && cb(res); + /**预加载bundle中的文件*/ + preLoadSubpackageFile(url: string, pkgName: string, ftype, succCB, failCB) { + let bundle = assetManager.getBundle(pkgName); + if (bundle){ + bundle.preload(url, ftype, (err, res) => { + if (err) { + console.log(err); + failCB && failCB(err); + return + } + succCB && succCB(); + }); + } else { + assetManager.loadBundle(pkgName, (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + failCB && failCB(err); + return + } + this.preLoadSubpackageFile(url, pkgName, ftype, succCB, failCB); + }); } - ); - } else { - assetManager.loadBundle( - packageName, - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.changeBundleSpriteFrame(spt, url, packageName, cb); - } - ); } - } - /** 改变图片--bundle资源 texture类型的图片*/ - changeBundleTexture( - spt: Sprite, - url: string, - packageName: string, - cb: Function = null - ) { - if (!spt || !url) return; - let bundle = assetManager.getBundle(packageName); - if (bundle) { - bundle.load(url + "/texture", Texture2D, (err, res: Texture2D) => { - if (err) { - console.log(err); - return; + /** 加载bundle中的PB*/ + loadSubpackagePrefab(url: string, cb) { + let bundle = assetManager.getBundle("Chat18x"); + if (bundle){ + bundle.load(url, Prefab, (err, res: Prefab) => { + if (err) { + console.log(err); + return + } + let cc_N = instantiate(res); + cb && cb(cc_N); + }); + }else{ + assetManager.loadBundle("PB", (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.loadSubpackagePrefab(url, cb); + }); } - if (!spt.isValid) { - return; - } - let spriteFrame = new SpriteFrame(); - spriteFrame.texture = res; - spt.spriteFrame = spriteFrame; - cb && cb(res); - }); - } else { - assetManager.loadBundle( - packageName, - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.changeBundleTexture(spt, url, packageName, cb); - } - ); } - } - - /** 加载bundle中的音频文件*/ - getBundleAudio(url: string, cb) { - let bundle = assetManager.getBundle("Audio"); - if (bundle) { - bundle.load(url, AudioClip, (err, res: AudioClip) => { - if (err) { - console.log(err); - return; - } - cb && cb(res); - }); - } else { - assetManager.loadBundle( - "Audio", - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.getBundleAudio(url, cb); - } - ); - } - } - - /** 加载bundle中的配置表*/ - loadSubpackageDataTable(url: string, cb) { - let bundle = assetManager.getBundle("DataTable"); - if (bundle) { - bundle.load(url, JsonAsset, (err, res: JsonAsset) => { - if (err) { - console.log(err); - return; - } - cb && cb(res); - }); - } else { - assetManager.loadBundle( - "DataTable", - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.loadSubpackagePrefab(url, cb); - } - ); - } - } - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - //region 加载远程音频 - /** 加载远程资源*/ - loadRemoteAudio(url: string, cb: Function = null) { - assetManager.loadRemote(url, (err, res: AudioClip) => { - if (err) { - console.error(err); - return; - } - cb && cb(res); - }); - } - - /** 加载远程资源*/ - // private loadRemoteRes1(url1: string, suffix: string = 'png', cb) { - // let tempStrArr: Array = url1.split("."); - // let aimStr = url1; - // if (tempStrArr.length > 1) { - // aimStr = tempStrArr[0]; - // } - // let url: string = `http://tk3h5.hgwl710.com/Fish/DEV/TS/Res/`; - // url += aimStr + '.' + suffix; - // if (url1.includes("://")) { url = url1 } - // assetManager.loadRemote(url, { cacheEnabled: true }, (err, res: ImageAsset) => { - // if (!err) { - // const spriteFrame = new SpriteFrame(); - // const texture = new Texture2D(); - // texture.image = res; - // spriteFrame.texture = texture; - // cb && cb(spriteFrame); - // } - // }) - // } - - //region 加载远程图片 - /** - * 获取远程图片资源并设置 - * @param spt 要设置的节点 - * @param url url地址 - * @param suffix 图片后缀名 - * @param cb 回调函数 - */ - changeRemoteSpriteFrame( - spt: Sprite, - url: string, - suffix: string = "png", - cb: Function = null - ) { - if (!spt || !url) return; - assetManager.loadRemote( - url, - { ext: "." + suffix }, - (err, res: ImageAsset) => { - if (err) { - console.log(err); - return; - } - if (!spt.isValid) { - return; - } - - const spriteFrame = new SpriteFrame(); - const texture = new Texture2D(); - texture.image = res; - spriteFrame.texture = texture; - - spt.spriteFrame = spriteFrame; - cb && cb(res); - } - ); - } - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - /** 加载resources里的PB path:不带后缀*/ - private loadResourcePrefab(path: string, cb) { - resources.load(path, Prefab, (err, res: Prefab) => { - if (!err) { - cb && cb(res); - } else { - // loader.rlease(path); - } - }); - } - /** 加载resources里的图片*/ - private loadResourceRes(path: string, cb) { - resources.load(path, ImageAsset, (err, res: ImageAsset) => { - if (err) { - console.log(err); - return; - } - cb && cb(res); - }); - } - /** 加载resources里图集里的图片*/ - // 加载 SpriteAtlas（图集），并且获取其中的一个 SpriteFrame - // 注意 atlas 资源文件（plist）通常会和一个同名的图片文件（png）放在一个目录下, 所以需要在第二个参数指定资源类型 - private loadResourceAtlas(sptName: string, path: string, cb) { - resources.load(path, SpriteAtlas, (err, res: SpriteAtlas) => { - const frame = res.getSpriteFrame(sptName); - if (!err) { - cb && cb(frame); - } else { - // loader.release(path); - } - }); - } - /** 改变图片--resources里sprite-frame类型的图片*/ - changeResourceSpriteFrame(spt: Sprite, path: string, cb: Function = null) { - if (!spt || !path) return; - resources.load( - path + "/spriteFrame", - SpriteFrame, - (err, res: SpriteFrame) => { - if (err) { - console.log(err); - return; - } - if (!spt.isValid) { - return; - } - - spt.spriteFrame = res; - cb && cb(res); - } - ); - } - /** 改变图片--resources里texture类型的图片*/ - changeResourceTexture(spt: Sprite, path: string, cb: Function = null) { - if (!spt || !path) return; - resources.load(path + "/texture", Texture2D, (err, res: Texture2D) => { - if (err) { - console.log(err); - return; - } - if (!spt.isValid) { - return; - } - - let spriteFrame = new SpriteFrame(); - spriteFrame.texture = res; - spt.spriteFrame = spriteFrame; - cb && cb(res); - }); - } - - //设置图片置灰 - SetGray(spt: Sprite, isGray: boolean) { - //cc.assetManager.builtins.getBuiltin("material", "builtin-" + name) - if (isGray) { - let bundle = assetManager.getBundle("Materials"); - if (bundle) { - bundle.load("ui_sprite_gray", Material, (err, res: Material) => { - if (err) { - console.log(err); - return; - } - // spt.setSharedMaterial(res, 0) - spt.customMaterial = res; - }); - } else { - assetManager.loadBundle( - "Materials", - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; + /**获取pb节点 */ + getPrefab(path: string, cb: Function, target: Node) { + this.loadSubpackagePrefab(path, (pb: Prefab) => { + if (target && !target.isValid) { + pb.destroy() + return; } - this.SetGray(spt, isGray); - } - ); - } - } else { - // spt.setSharedMaterial(null, 0) - spt.customMaterial = null; - } - } - - /**设置图片模糊*/ - SetBlur(spt: Sprite, isBule: boolean) { - if (isBule) { - let bundle = assetManager.getBundle("Materials"); - if (bundle) { - bundle.load("mohu", Material, (err, res: Material) => { - if (err) { - console.log(err); - return; - } - // spt.setSharedMaterial(res, 0) - spt.customMaterial = res; + pb['path'] = path; + cb && cb(pb); }); - } else { - assetManager.loadBundle( - "Materials", - (err: Error, _bundle: AssetManager.Bundle) => { - if (err) { - console.log(err); - return; - } - this.SetBlur(spt, isBule); - } - ); - } - } else { - // spt.setSharedMaterial(null, 0) - spt.customMaterial = null; } - } + + + /** 加载bundle中的PB*/ + loadSubpackage3DModel(url: string, cb) { + let bundle = assetManager.getBundle("Model3D"); + if (bundle){ + bundle.load(url, Prefab, (err, res: Prefab) => { + if (err) { + console.log(err); + return + } + let cc_N = instantiate(res); + cb && cb(cc_N); + }); + }else{ + assetManager.loadBundle("Model3D", (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.loadSubpackage3DModel(url, cb); + }); + } + } + + /** 改变图片--bundle资源 sprite-frame类型的图片*/ + changeBundleVideo(spt: VideoPlayer, url: string, packageName: string, cb: Function = null) { + if (!spt || !url) return; + let spttemp:any = spt + spttemp.frameUrl = url + let bundle = assetManager.getBundle(packageName); + if (bundle){ + bundle.load(url, VideoClip, (err, res: VideoClip) => { + if (err) { + console.log(err); + return + } + if (!spt.isValid) { + return; + } + if (spttemp.frameUrl != url) { + return; + } + spt.clip = res; + //spt.spriteFrame = res; + cb && cb(res); + }); + }else{ + assetManager.loadBundle(packageName, (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.changeBundleVideo(spt, url, packageName, cb); + }); + } + } + /** 改变图片--bundle资源 sprite-frame类型的图片*/ + changeBundleSpriteFrame(spt: Sprite, url: string, packageName: string, cb: Function = null) { + if (!spt || !url) return; + let spttemp:any = spt + spttemp.frameUrl = url + let bundle = assetManager.getBundle(packageName); + if (bundle){ + bundle.load(url + "/spriteFrame", SpriteFrame, (err, res: SpriteFrame) => { + if (err) { + console.log(err); + return + } + if (!spt.isValid) { + return; + } + if (spttemp.frameUrl != url) { + return; + } + spt.spriteFrame = res; + cb && cb(res); + }); + }else{ + assetManager.loadBundle(packageName, (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.changeBundleSpriteFrame(spt, url, packageName, cb); + }); + } + } + /** 改变图片--bundle资源 texture类型的图片*/ + changeBundleTexture(spt: Sprite, url: string, packageName: string, cb: Function = null) { + if (!spt || !url) return; + let bundle = assetManager.getBundle(packageName); + if (bundle){ + bundle.load(url + "/texture", Texture2D, (err, res: Texture2D) => { + if (err) { + console.log(err); + return + } + if (!spt.isValid) { + return; + } + let spriteFrame = new SpriteFrame() + spriteFrame.texture = res + spt.spriteFrame = spriteFrame; + cb && cb(res); + }); + }else{ + assetManager.loadBundle(packageName, (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.changeBundleTexture(spt, url, packageName, cb); + }); + } + } + + + /** 加载bundle中的音频文件*/ + getBundleAudio(url: string, cb) { + let bundle = assetManager.getBundle("Audio"); + if (bundle){ + bundle.load(url, AudioClip, (err, res: AudioClip) => { + if (err) { + console.log(err); + return + } + cb && cb(res); + }); + }else{ + assetManager.loadBundle("Audio", (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.getBundleAudio(url, cb); + }); + } + } + + + /** 加载bundle中的配置表*/ + loadSubpackageDataTable(url: string, cb) { + let bundle = assetManager.getBundle("DataTable"); + if (bundle){ + bundle.load(url, JsonAsset, (err, res: JsonAsset) => { + if (err) { + console.log(err); + return + } + cb && cb(res); + }); + }else{ + assetManager.loadBundle("DataTable", (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.loadSubpackagePrefab(url, cb); + }); + } + } + + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + //region 加载远程音频 + /** 加载远程资源*/ + loadRemoteAudio(url: string, cb: Function = null) { + assetManager.loadRemote(url, (err, res: AudioClip) => { + if (err) { + console.error(err); + return + } + cb && cb(res); + }) + } + + /** 加载远程资源*/ + // private loadRemoteRes1(url1: string, suffix: string = 'png', cb) { + // let tempStrArr: Array = url1.split("."); + // let aimStr = url1; + // if (tempStrArr.length > 1) { + // aimStr = tempStrArr[0]; + // } + // let url: string = `http://tk3h5.hgwl710.com/Fish/DEV/TS/Res/`; + // url += aimStr + '.' + suffix; + // if (url1.includes("://")) { url = url1 } + // assetManager.loadRemote(url, { cacheEnabled: true }, (err, res: ImageAsset) => { + // if (!err) { + // const spriteFrame = new SpriteFrame(); + // const texture = new Texture2D(); + // texture.image = res; + // spriteFrame.texture = texture; + // cb && cb(spriteFrame); + // } + // }) + // } + + //region 加载远程图片 + /** + * 获取远程图片资源并设置 + * @param spt 要设置的节点 + * @param url url地址 + * @param suffix 图片后缀名 + * @param cb 回调函数 + */ + changeRemoteSpriteFrame(spt: Sprite, url: string, suffix: string = 'png', cb: Function = null) { + if (!spt || !url) return; + assetManager.loadRemote(url, {ext: '.'+suffix}, (err, res: ImageAsset) => { + if (err) { + console.log(err); + return + } + if (!spt.isValid) { + return; + } + + const spriteFrame = new SpriteFrame(); + const texture = new Texture2D(); + texture.image = res; + spriteFrame.texture = texture; + + spt.spriteFrame = spriteFrame; + cb && cb(res); + }) + } + + + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + /** 加载resources里的PB path:不带后缀*/ + private loadResourcePrefab(path: string, cb) { + resources.load(path, Prefab, (err, res: Prefab) => { + if (!err) { + cb && cb(res); + } else { + // loader.rlease(path); + } + }) + } + /** 加载resources里的图片*/ + private loadResourceRes(path: string, cb) { + resources.load(path, ImageAsset, (err, res: ImageAsset) => { + if (err) { + console.log(err); + return + } + cb && cb(res); + }) + } + /** 加载resources里图集里的图片*/ + // 加载 SpriteAtlas（图集），并且获取其中的一个 SpriteFrame + // 注意 atlas 资源文件（plist）通常会和一个同名的图片文件（png）放在一个目录下, 所以需要在第二个参数指定资源类型 + private loadResourceAtlas(sptName: string, path: string, cb) { + resources.load(path, SpriteAtlas, (err, res: SpriteAtlas) => { + const frame = res.getSpriteFrame(sptName); + if (!err) { + cb && cb(frame); + } else { + // loader.release(path); + } + }); + } + /** 改变图片--resources里sprite-frame类型的图片*/ + changeResourceSpriteFrame(spt: Sprite, path: string, cb: Function = null) { + if (!spt || !path) return; + resources.load(path + "/spriteFrame", SpriteFrame, (err, res: SpriteFrame) => { + if (err) { + console.log(err); + return + } + if (!spt.isValid) { + return; + } + + spt.spriteFrame = res; + cb && cb(res); + }) + } + /** 改变图片--resources里texture类型的图片*/ + changeResourceTexture(spt: Sprite, path: string, cb: Function = null) { + if (!spt || !path) return; + resources.load(path + "/texture", Texture2D, (err, res: Texture2D) => { + if (err) { + console.log(err); + return + } + if (!spt.isValid) { + return; + } + + let spriteFrame = new SpriteFrame() + spriteFrame.texture = res + spt.spriteFrame = spriteFrame; + cb && cb(res); + }) + } + + + //设置图片置灰 + SetGray(spt: Sprite, isGray: boolean) { + //cc.assetManager.builtins.getBuiltin("material", "builtin-" + name) + if (isGray) { + let bundle = assetManager.getBundle("Materials"); + if (bundle){ + bundle.load("ui_sprite_gray", Material, (err, res: Material) => { + if (err) { + console.log(err); + return + } + // spt.setSharedMaterial(res, 0) + spt.customMaterial = res + }); + }else{ + assetManager.loadBundle("Materials", (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.SetGray(spt, isGray); + }); + } + } else { + // spt.setSharedMaterial(null, 0) + spt.customMaterial = null + } + } + + + /**设置图片模糊*/ + SetBlur(spt: Sprite, isBule: boolean) { + if (isBule) { + let bundle = assetManager.getBundle("Materials"); + if (bundle){ + bundle.load("mohu", Material, (err, res: Material) => { + if (err) { + console.log(err); + return + } + // spt.setSharedMaterial(res, 0) + spt.customMaterial = res + }); + }else{ + assetManager.loadBundle("Materials", (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + return + } + this.SetBlur(spt, isBule); + }); + } + } else { + // spt.setSharedMaterial(null, 0) + spt.customMaterial = null + } + } + } + + diff --git a/assets/Scripts/Sub/MainScene.ts b/assets/Scripts/Sub/MainScene.ts index ddef099f..6b2fdfe1 100644 --- a/assets/Scripts/Sub/MainScene.ts +++ b/assets/Scripts/Sub/MainScene.ts @@ -4,22 +4,23 @@ import GameRootUI from "../Main/Common/GameRootUI"; const { ccclass, property } = _decorator; //主界面场景 -@ccclass("MainScene") +@ccclass('MainScene') export class MainScene extends Component { - @property(Node) - UIRoot: Node = null; - @property(Node) - UILayerMod: Node = null; - @property(Camera) - MainCamera: Camera = null; - start() { - //每个场景必须添加的 - let gameRootUI = this.node.getComponent(GameRootUI); - if (!gameRootUI) { - gameRootUI = this.node.addComponent(GameRootUI); - gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "MainPanel"); + @property(Node) + UIRoot: Node = null + @property(Node) + UILayerMod: Node = null + @property(Camera) + MainCamera: Camera = null + + start() { + //每个场景必须添加的 + let gameRootUI = this.node.getComponent(GameRootUI) + if (!gameRootUI){ + gameRootUI = this.node.addComponent(GameRootUI) + gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "ThemePanel"); + } + GameRootUI.MainCamera = this.MainCamera } - GameRootUI.MainCamera = this.MainCamera; - } -} +} \ No newline at end of file diff --git a/assets/Scripts/chat18x/ui/panels/MainPanel.ts b/assets/Scripts/chat18x/ui/panels/MainPanel.ts deleted file mode 100644 index abe9360b..00000000 --- a/assets/Scripts/chat18x/ui/panels/MainPanel.ts +++ /dev/null @@ -1,228 +0,0 @@ -import { - _decorator, - Component, - Node, - instantiate, - Label, - Sprite, - UITransform, -} from "cc"; -import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView"; -import Utils from "db://assets/Scripts/Main/Common/Utils"; -import { GButton } from "db://assets/Scripts/Main/Common/GButton"; -import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; -import { ThemeItem } from "../../uiitems/ThemeItem"; -import { NavigationManager } from "../../manager/NavigationManager"; -import { GirlListItem } from "../../uiitems/GirlListItem"; -import LanguageUtils from "../../../Main/Common/LanguageUtils"; -import { ViewManager } from "../../../Main/Manager/ViewManager"; -import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; -import { ThemeService } from "db://assets/Scripts/chat18x/network/services/ThemeService"; -import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService"; -import { ShopService } from "db://assets/Scripts/chat18x/network/services/ShopService"; -import { DataManager, DataId } from "../../data/DataManager"; -import { ThemeData } from "../../data/ThemeData"; -import { GirlData } from "../../data/GirlData"; -import { WalletData } from "../../data/WalletData"; -import { AccountData } from "../../data/AccountData"; - -import { ShopData } from "../../data/ShopData"; -import proto from "db://assets/Scripts/proto/proto.pb.js"; -import GameRootUI from "../../../Main/Common/GameRootUI"; - -const { ccclass, property } = _decorator; - -@ccclass("MainPanel") -export class MainPanel extends li_BaseView { - private _nodeTab: any = {}; - - coinNum: Label; - uid: Label; - itemInst: GirlListItem; - content: Node; - private vipLeftTime: Label; - recId: number; - recName: Label; - recSprite: Sprite; - - cache: ThemeItem[] = []; - - onLoadCT() { - Utils.parseNode(this.node, this._nodeTab); - - this.coinNum = this._nodeTab.coinNum.getComponent(Label); - this.uid = this._nodeTab.uid.getComponent(Label); - this.recName = this._nodeTab.characterNameText.getComponent(Label); - this.recSprite = this._nodeTab.recPicSlot.getComponent(Sprite); - this.vipLeftTime = this._nodeTab.vipText.getComponent(Label); - - this.registerListener(); - this.itemInst = this._nodeTab.ThemeItem.getComponent(ThemeItem); - this.itemInst.node.active = false; - this.content = this._nodeTab.allThemecontent; - - this.Show(); - } - - rectNameKey: string; - async Show() { - //some temp data - this.refreshCoinNum(); - this.refreshVipExpire(); - const accountData = DataManager.I.getDataById(DataId.Account); - this.uid.string = "uid: " + accountData.accId; - this.recId = 1; - if (this.cache) { - for (let i = this.cache.length - 1; i >= 0; i--) { - this.cache[i].node.destroy(); - } - } - this._nodeTab.loadingRec.active = true; - // 请求主题数据 - const reqData = {}; - let res = await ThemeService.I.reqHallTheme(reqData); - if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { - // 保存数据 - const themeData = DataManager.I.getDataById(DataId.Theme); - themeData.themes = res.data; - // 根据数据，刷新界面 - const themeIds = themeData.themeIds; - for (let id of themeIds) { - let newNode = instantiate(this.itemInst.node); - let item = newNode.getComponent(ThemeItem); - item.refresh(id); - newNode.active = true; - this.cache.push(item); - this.content.addChild(newNode); - } - } - - // 请求每日推荐 - const reqData2 = {}; - let res2 = await GirlService.I.reqDailyRecommend(reqData2); - if (res2 && res2.code === proto.cs.EnmRetCode.SUCCESS) { - const girlData = DataManager.I.getDataById(DataId.Girl); - girlData.setDailyRecommend(res2.data); - // 根据数据，刷新界面 - this.recId = girlData.getRecommendGirlId(); - this.rectNameKey = girlData.getRecommendGrilName(); - let avatarPath = girlData.getRecommendGrilAvatar(); - this.recName.string = LanguageUtils.getText(this.rectNameKey); - ResManager.I.changeBundleSpriteFrame( - this.recSprite, - avatarPath, - "Girls", - () => { - let sizeTran = this.recSprite.node.parent.getComponent(UITransform); - Utils.adjustBgPixelRatioToSize( - sizeTran.contentSize, - this.recSprite.node, - 1 - ); - this._nodeTab.loadingRec.active = false; - }, - () => { - this._nodeTab.loadingRec.active = false; - } - ); - } - - // 获取商品列表，提前把数据拿下来 - this.reqShopList(); - } - - private registerListener() { - GButton.BandClick(this._nodeTab.settingBtn, this.openSetting, this); - GButton.BandClick(this._nodeTab.msgBoxBtn, this.openMsgBox, this); - - GButton.BandClick(this._nodeTab.ChatWithRecBtn, this.chatWithRec, this); - - GButton.BandClick(this._nodeTab.ShopPanelEntry, this.enterShop, this); - - Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => { - this.recName.string = LanguageUtils.getText(this.rectNameKey); - }); - Utils.addInnerEL(InnerMsgCode.BalanceChange, this, () => { - this.refreshCoinNum(); - }); - Utils.addInnerEL(InnerMsgCode.VipExpireChange, this, () => { - this.refreshVipExpire(); - }); - } - - enterShop() { - ViewManager.I.openBundlesView("PurchasePanel"); - } - - chatWithRec() { - const girlData = DataManager.I.getDataById(DataId.Girl); - - // 是否已经解锁 - const isRelease = girlData.getIsRelease( - girlData.getGrilCategoryById(this.recId).toString(), - this.recId - ); - const isFree = - girlData.getGrilPrice( - girlData.getGrilCategoryById(this.recId).toString(), - this.recId - ) == 0; - if (isRelease || isFree) { - NavigationManager.Instance.navigateToGirlDetail(this.recId); - GameRootUI.I.hideDefaultView(); - } else { - //未解锁 - ViewManager.I.openBundlesPopupView("GirlListPopupPanel", { - base: this, - category: girlData.getGrilCategoryById(this.recId), - id: this.recId, - }); - } - } - - openSetting() { - ViewManager.I.openBundlesView("SettingPanel"); - } - - openMsgBox() { - console.log("打开信箱"); - } - - // 刷新余额 - private refreshCoinNum() { - const walletData = DataManager.I.getDataById(DataId.Wallet); - const balance = walletData.getOriginalBalance(); - this.coinNum.string = balance.toString(); - } - - // 刷新 vip失效时间戳 - private refreshVipExpire() { - const walletData = DataManager.I.getDataById(DataId.Wallet); - const vipExpire = walletData.vipExpire; - const leftTime = Utils.formatVipLeftTime(vipExpire); - this.vipLeftTime.string = LanguageUtils.getText( - "purchasepanel.vip_left" - ).replace("${leftTime}", leftTime); - } - - // 获取商品列表 - async reqShopList() { - // 请求购买商品 - const reqData = {}; - let res = await ShopService.I.reqShopList(reqData); - if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { - const resData = res.data; - // 保存数据 - const shopData = DataManager.I.getDataById(DataId.Shop); - shopData.goods = res.data; - } - } - - onDestroy(): void { - Utils.removeInnerEL(InnerMsgCode.LanguageChange, this, () => { - this.recName.string = LanguageUtils.getText(this.rectNameKey); - }); - Utils.removeInnerEL(InnerMsgCode.BalanceChange, this, () => {}); - Utils.removeInnerEL(InnerMsgCode.VipExpireChange, this, () => {}); - } -} diff --git a/assets/Scripts/chat18x/ui/panels/MainPanel.ts.meta b/assets/Scripts/chat18x/ui/panels/MainPanel.ts.meta deleted file mode 100644 index 1f480355..00000000 --- a/assets/Scripts/chat18x/ui/panels/MainPanel.ts.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "4.0.24", - "importer": "typescript", - "imported": true, - "uuid": "07c2bbbb-c191-4393-87d2-5c233eb8f756", - "files": [], - "subMetas": {}, - "userData": {} -} diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 4560df76..a74d7419 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -77,7 +77,6 @@ export class ThemePanel extends li_BaseView { this.cache[i].node.destroy(); } } - this._nodeTab.loadingRec.active = true; // 请求主题数据 const reqData = {}; let res = await ThemeService.I.reqHallTheme(reqData); @@ -119,10 +118,6 @@ export class ThemePanel extends li_BaseView { this.recSprite.node, 1 ); - this._nodeTab.loadingRec.active = false; - }, - () => { - this._nodeTab.loadingRec.active = false; } ); } diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index a74c6ba5..0af5575e 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -37,9 +37,6 @@ export class DetailImageItem extends Component { @property(Label) videoPrice: Label; - @property(Node) - loading: Node; - base: GirlDetailPanel; url: string; isImage: boolean; @@ -149,8 +146,6 @@ export class DetailImageItem extends Component { this.test_resID = this.node.getChildByName("resID"); - this.loading.active = true; - this.test_resID.getComponent(Label).string = this.girlId.toString() + this.resId; @@ -216,7 +211,6 @@ export class DetailImageItem extends Component { ResManager.I.changeBundleSpriteFrame(this.img, imgPath, "Girls", () => { this.question.active = false; // 图片加载成功后隐藏问号 this.scaleToFillItem(); - this.loading.active = false; }); } diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index 0a7f022e..dd672990 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -39,9 +39,6 @@ export class GirlListItem extends Component { @property(Node) chatIcon: Node; - @property(Node) - loading: Node; - @property(Node) starParent: Node; @@ -140,7 +137,7 @@ export class GirlListItem extends Component { this.category.toString(), this.id ); - this.loading.active = true; + //listAvatarPath = listAvatarPath.replace("Avatar", "avatar"); //临时 ResManager.I.changeBundleSpriteFrame( this.avatar, @@ -153,7 +150,6 @@ export class GirlListItem extends Component { this.avatar.node, 2 ); - this.loading.active = false; } ); diff --git a/assets/Scripts/chat18x/uiitems/ThemeItem.ts b/assets/Scripts/chat18x/uiitems/ThemeItem.ts index be99af62..97cbfac2 100644 --- a/assets/Scripts/chat18x/uiitems/ThemeItem.ts +++ b/assets/Scripts/chat18x/uiitems/ThemeItem.ts @@ -19,9 +19,6 @@ export class ThemeItem extends Component { @property(Label) titleName: Label; - @property(Node) - loading: Node; - @property(Sprite) img: Sprite; @@ -42,16 +39,13 @@ export class ThemeItem extends Component { } refresh(themeId: number) { - this.loading.active = true; // 主题数据 const themeData = DataManager.I.getDataById(DataId.Theme); this.lockImg.node.active = this.lockCover.node.active = !themeData.getIsReleaseById(themeId); this.isLocked = !themeData.getIsReleaseById(themeId); this.key = themeData.getLanKeyById(themeId); - this.titleName.string = LanguageUtils.getText( - themeData.getLanKeyById(themeId) - ); + this.titleName.string = LanguageUtils.getText(themeData.getLanKeyById(themeId)); this.category = themeData.getCategoryById(themeId); ResManager.I.changeBundleSpriteFrame( this.img, @@ -60,7 +54,6 @@ export class ThemeItem extends Component { () => { let sizeTran = this.img.node.parent.getComponent(UITransform); Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.img.node, 3); - this.loading.active = false; } ); GButton.RemoveAndBandClick(this.node, this.OnClickThis, this); diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index 14bfa8dc..cee8a044 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -25,20 +25,20 @@ "_active": true, "_components": [ { - "__id__": 401 + "__id__": 389 }, { - "__id__": 403 + "__id__": 391 }, { - "__id__": 405 + "__id__": 393 }, { - "__id__": 407 + "__id__": 395 } ], "_prefab": { - "__id__": 409 + "__id__": 397 }, "_lpos": { "__type__": "cc.Vec3", @@ -82,23 +82,23 @@ "__id__": 3 }, { - "__id__": 383 + "__id__": 371 } ], "_active": true, "_components": [ { - "__id__": 394 + "__id__": 382 }, { - "__id__": 396 + "__id__": 384 }, { - "__id__": 398 + "__id__": 386 } ], "_prefab": { - "__id__": 400 + "__id__": 388 }, "_lpos": { "__type__": "cc.Vec3", @@ -148,17 +148,17 @@ "_active": true, "_components": [ { - "__id__": 376 + "__id__": 364 }, { - "__id__": 378 + "__id__": 366 }, { - "__id__": 380 + "__id__": 368 } ], "_prefab": { - "__id__": 382 + "__id__": 370 }, "_lpos": { "__type__": "cc.Vec3", @@ -7107,39 +7107,36 @@ { "__id__": 315 }, + { + "__id__": 321 + }, { "__id__": 327 }, { - "__id__": 333 - }, - { - "__id__": 339 - }, - { - "__id__": 359 + "__id__": 347 } ], "_active": true, "_components": [ { - "__id__": 365 + "__id__": 353 }, { - "__id__": 367 + "__id__": 355 }, { - "__id__": 369 + "__id__": 357 }, { - "__id__": 371 + "__id__": 359 }, { - "__id__": 373 + "__id__": 361 } ], "_prefab": { - "__id__": 375 + "__id__": 363 }, "_lpos": { "__type__": "cc.Vec3", @@ -7303,164 +7300,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 308 - }, - "_prefab": { - "__id__": 316 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 315 - }, - "asset": { - "__uuid__": "bf652567-4b2f-4169-937f-6d12f0d9c354", - "__expectedType__": "cc.Prefab" - }, - "fileId": "63H2+Zfo9PcI21HLgBNY8H", - "instance": { - "__id__": 317 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "5aq5NQVTtNVprrUtYeMaUN", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 318 - }, - { - "__id__": 320 - }, - { - "__id__": 321 - }, - { - "__id__": 322 - }, - { - "__id__": 323 - }, - { - "__id__": 325 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 319 - }, - "propertyPath": [ - "_name" - ], - "value": "loadingItem" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63H2+Zfo9PcI21HLgBNY8H" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 319 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 319 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 319 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 324 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 341, - "height": 438 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "73fdjB38ZHe5MjwXKxuB5t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 326 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 341, - "height": 438 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "856w1D9j5E44Lcq2R0y9vO" - ] - }, { "__type__": "cc.Node", "_name": "question", @@ -7473,14 +7312,14 @@ "_active": true, "_components": [ { - "__id__": 328 + "__id__": 316 }, { - "__id__": 330 + "__id__": 318 } ], "_prefab": { - "__id__": 332 + "__id__": 320 }, "_lpos": { "__type__": "cc.Vec3", @@ -7517,11 +7356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 317 }, "_contentSize": { "__type__": "cc.Size", @@ -7545,11 +7384,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 319 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7609,14 +7448,14 @@ "_active": true, "_components": [ { - "__id__": 334 + "__id__": 322 }, { - "__id__": 336 + "__id__": 324 } ], "_prefab": { - "__id__": 338 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", @@ -7653,11 +7492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -7681,11 +7520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 337 + "__id__": 325 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7743,26 +7582,26 @@ }, "_children": [ { - "__id__": 340 + "__id__": 328 }, { - "__id__": 346 + "__id__": 334 } ], "_active": true, "_components": [ { - "__id__": 352 + "__id__": 340 }, { - "__id__": 354 + "__id__": 342 }, { - "__id__": 356 + "__id__": 344 } ], "_prefab": { - "__id__": 358 + "__id__": 346 }, "_lpos": { "__type__": "cc.Vec3", @@ -7799,20 +7638,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 327 }, "_children": [], "_active": true, "_components": [ { - "__id__": 341 + "__id__": 329 }, { - "__id__": 343 + "__id__": 331 } ], "_prefab": { - "__id__": 345 + "__id__": 333 }, "_lpos": { "__type__": "cc.Vec3", @@ -7849,11 +7688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 330 }, "_contentSize": { "__type__": "cc.Size", @@ -7877,11 +7716,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 332 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7958,20 +7797,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 327 }, "_children": [], "_active": true, "_components": [ { - "__id__": 347 + "__id__": 335 }, { - "__id__": 349 + "__id__": 337 } ], "_prefab": { - "__id__": 351 + "__id__": 339 }, "_lpos": { "__type__": "cc.Vec3", @@ -8008,11 +7847,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 336 }, "_contentSize": { "__type__": "cc.Size", @@ -8036,11 +7875,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 338 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8094,11 +7933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 341 }, "_contentSize": { "__type__": "cc.Size", @@ -8122,11 +7961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 355 + "__id__": 343 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8167,11 +8006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 345 }, "_alignFlags": 9, "_target": null, @@ -8222,14 +8061,14 @@ "_active": true, "_components": [ { - "__id__": 360 + "__id__": 348 }, { - "__id__": 362 + "__id__": 350 } ], "_prefab": { - "__id__": 364 + "__id__": 352 }, "_lpos": { "__type__": "cc.Vec3", @@ -8266,11 +8105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 359 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 349 }, "_contentSize": { "__type__": "cc.Size", @@ -8294,11 +8133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 359 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 351 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8379,7 +8218,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 354 }, "_contentSize": { "__type__": "cc.Size", @@ -8407,7 +8246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 356 }, "clickEvents": [], "_interactable": true, @@ -8465,25 +8304,22 @@ }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 358 }, "img": { "__id__": 312 }, "question": { - "__id__": 327 + "__id__": 315 }, "video": { - "__id__": 336 + "__id__": 324 }, "priceFrame": { - "__id__": 339 + "__id__": 327 }, "videoPrice": { - "__id__": 343 - }, - "loading": { - "__id__": 315 + "__id__": 331 }, "_id": "" }, @@ -8501,7 +8337,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 360 }, "_type": 0, "_inverted": false, @@ -8523,7 +8359,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 362 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8582,7 +8418,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -8610,7 +8446,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 379 + "__id__": 367 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8655,7 +8491,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 369 }, "_alignFlags": 45, "_target": null, @@ -8706,20 +8542,20 @@ "_active": true, "_components": [ { - "__id__": 384 + "__id__": 372 }, { - "__id__": 386 + "__id__": 374 }, { - "__id__": 388 + "__id__": 376 }, { - "__id__": 391 + "__id__": 379 } ], "_prefab": { - "__id__": 393 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -8756,11 +8592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 383 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 373 }, "_contentSize": { "__type__": "cc.Size", @@ -8784,11 +8620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 383 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 375 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8829,15 +8665,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 383 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 377 }, "clickEvents": [ { - "__id__": 390 + "__id__": 378 } ], "_interactable": true, @@ -8877,7 +8713,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 383 + "__id__": 371 }, "_id": "" }, @@ -8901,11 +8737,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 383 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 380 }, "_alignFlags": 9, "_target": null, @@ -8954,7 +8790,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 395 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", @@ -8982,7 +8818,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 397 + "__id__": 385 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9027,7 +8863,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 387 }, "_alignFlags": 45, "_target": null, @@ -9076,7 +8912,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 390 }, "_contentSize": { "__type__": "cc.Size", @@ -9104,7 +8940,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 392 }, "_alignFlags": 45, "_target": null, @@ -9140,7 +8976,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 406 + "__id__": 394 }, "_id": "" }, @@ -9158,7 +8994,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 408 + "__id__": 396 }, "m_rootNode": null, "videoArea": { @@ -9189,7 +9025,7 @@ "__id__": 102 }, "imgItemInst": { - "__id__": 369 + "__id__": 357 }, "imgsLayout": { "__id__": 275 @@ -9210,11 +9046,6 @@ }, "fileId": "24mSBg+Z9OS5KNS5Yscqr0", "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": [ - { - "__id__": 315 - } - ] + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/GirlListPanel.prefab b/assets/bundles/Chat18x/GirlListPanel.prefab index de4a91d7..222b2847 100644 --- a/assets/bundles/Chat18x/GirlListPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPanel.prefab @@ -25,20 +25,20 @@ "_active": true, "_components": [ { - "__id__": 240 + "__id__": 226 }, { - "__id__": 242 + "__id__": 228 }, { - "__id__": 244 + "__id__": 230 }, { - "__id__": 246 + "__id__": 232 } ], "_prefab": { - "__id__": 248 + "__id__": 234 }, "_lpos": { "__type__": "cc.Vec3", @@ -82,23 +82,23 @@ "__id__": 3 }, { - "__id__": 204 + "__id__": 190 } ], "_active": true, "_components": [ { - "__id__": 233 + "__id__": 219 }, { - "__id__": 235 + "__id__": 221 }, { - "__id__": 237 + "__id__": 223 } ], "_prefab": { - "__id__": 239 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -145,20 +145,20 @@ "_active": true, "_components": [ { - "__id__": 195 + "__id__": 181 }, { - "__id__": 197 + "__id__": 183 }, { - "__id__": 199 + "__id__": 185 }, { - "__id__": 201 + "__id__": 187 } ], "_prefab": { - "__id__": 203 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", @@ -205,20 +205,20 @@ "_active": true, "_components": [ { - "__id__": 186 + "__id__": 172 }, { - "__id__": 188 + "__id__": 174 }, { - "__id__": 190 + "__id__": 176 }, { - "__id__": 192 + "__id__": 178 } ], "_prefab": { - "__id__": 194 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -262,26 +262,26 @@ "__id__": 6 }, { - "__id__": 169 + "__id__": 155 } ], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 163 }, { - "__id__": 179 + "__id__": 165 }, { - "__id__": 181 + "__id__": 167 }, { - "__id__": 183 + "__id__": 169 } ], "_prefab": { - "__id__": 185 + "__id__": 171 }, "_lpos": { "__type__": "cc.Vec3", @@ -327,42 +327,42 @@ { "__id__": 15 }, + { + "__id__": 31 + }, { "__id__": 45 }, { - "__id__": 59 + "__id__": 51 }, { - "__id__": 65 - }, - { - "__id__": 139 + "__id__": 125 } ], "_active": true, "_components": [ { - "__id__": 155 + "__id__": 141 }, { - "__id__": 157 + "__id__": 143 }, { - "__id__": 159 + "__id__": 145 }, { - "__id__": 161 + "__id__": 147 }, { - "__id__": 163 + "__id__": 149 }, { - "__id__": 165 + "__id__": 151 } ], "_prefab": { - "__id__": 168 + "__id__": 154 }, "_lpos": { "__type__": "cc.Vec3", @@ -579,28 +579,25 @@ "_children": [ { "__id__": 16 - }, - { - "__id__": 22 } ], "_active": true, "_components": [ { - "__id__": 36 + "__id__": 22 }, { - "__id__": 38 + "__id__": 24 }, { - "__id__": 40 + "__id__": 26 }, { - "__id__": 42 + "__id__": 28 } ], "_prefab": { - "__id__": 44 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -767,187 +764,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 15 - }, - "_prefab": { - "__id__": 23 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 22 - }, - "asset": { - "__uuid__": "bf652567-4b2f-4169-937f-6d12f0d9c354", - "__expectedType__": "cc.Prefab" - }, - "fileId": "63H2+Zfo9PcI21HLgBNY8H", - "instance": { - "__id__": 24 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "823lwzTh9NR4AoIK+CnMrC", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 25 - }, - { - "__id__": 27 - }, - { - "__id__": 28 - }, - { - "__id__": 29 - }, - { - "__id__": 30 - }, - { - "__id__": 32 - }, - { - "__id__": 34 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_name" - ], - "value": "loadingItem" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63H2+Zfo9PcI21HLgBNY8H" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 31 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 300, - "height": 300 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "73fdjB38ZHe5MjwXKxuB5t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 300, - "height": 300 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "856w1D9j5E44Lcq2R0y9vO" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 35 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 64, - "height": 64 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f6+h9tVn5FiZ3Az+4KT4+7" - ] - }, { "__type__": "cc.UITransform", "_name": "", @@ -958,7 +774,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 23 }, "_contentSize": { "__type__": "cc.Size", @@ -986,7 +802,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 25 }, "_type": 0, "_inverted": false, @@ -1008,7 +824,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1054,7 +870,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 29 }, "_alignFlags": 13, "_target": null, @@ -1103,23 +919,23 @@ }, "_children": [ { - "__id__": 46 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 38 }, { - "__id__": 54 + "__id__": 40 }, { - "__id__": 56 + "__id__": 42 } ], "_prefab": { - "__id__": 58 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -1156,20 +972,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 45 + "__id__": 31 }, "_children": [], "_active": true, "_components": [ { - "__id__": 47 + "__id__": 33 }, { - "__id__": 49 + "__id__": 35 } ], "_prefab": { - "__id__": 51 + "__id__": 37 }, "_lpos": { "__type__": "cc.Vec3", @@ -1206,11 +1022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -1234,11 +1050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 36 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1292,11 +1108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -1320,11 +1136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 41 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1365,11 +1181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 43 }, "_alignFlags": 45, "_target": null, @@ -1420,14 +1236,14 @@ "_active": true, "_components": [ { - "__id__": 60 + "__id__": 46 }, { - "__id__": 62 + "__id__": 48 } ], "_prefab": { - "__id__": 64 + "__id__": 50 }, "_lpos": { "__type__": "cc.Vec3", @@ -1464,11 +1280,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -1492,11 +1308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1554,32 +1370,32 @@ }, "_children": [ { - "__id__": 66 + "__id__": 52 }, { - "__id__": 74 + "__id__": 60 }, { - "__id__": 82 + "__id__": 68 }, { - "__id__": 120 + "__id__": 106 } ], "_active": true, "_components": [ { - "__id__": 132 + "__id__": 118 }, { - "__id__": 134 + "__id__": 120 }, { - "__id__": 136 + "__id__": 122 } ], "_prefab": { - "__id__": 138 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -1616,23 +1432,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 51 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 53 }, { - "__id__": 69 + "__id__": 55 }, { - "__id__": 71 + "__id__": 57 } ], "_prefab": { - "__id__": 73 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -1669,11 +1485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 54 }, "_contentSize": { "__type__": "cc.Size", @@ -1697,11 +1513,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 56 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1768,11 +1584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 58 }, "_alignFlags": 8, "_target": null, @@ -1817,23 +1633,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 51 }, "_children": [], "_active": true, "_components": [ { - "__id__": 75 + "__id__": 61 }, { - "__id__": 77 + "__id__": 63 }, { - "__id__": 79 + "__id__": 65 } ], "_prefab": { - "__id__": 81 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -1870,11 +1686,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", @@ -1898,11 +1714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 64 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1966,11 +1782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 66 }, "_alignFlags": 13, "_target": null, @@ -2015,39 +1831,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 51 }, "_children": [ { - "__id__": 83 + "__id__": 69 }, { - "__id__": 89 + "__id__": 75 }, { - "__id__": 95 + "__id__": 81 }, { - "__id__": 101 + "__id__": 87 }, { - "__id__": 107 + "__id__": 93 } ], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 99 }, { - "__id__": 115 + "__id__": 101 }, { - "__id__": 117 + "__id__": 103 } ], "_prefab": { - "__id__": 119 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -2084,20 +1900,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 82 + "__id__": 68 }, "_children": [], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 70 }, { - "__id__": 86 + "__id__": 72 } ], "_prefab": { - "__id__": 88 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -2134,11 +1950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -2162,11 +1978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 73 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2220,20 +2036,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 82 + "__id__": 68 }, "_children": [], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 76 }, { - "__id__": 92 + "__id__": 78 } ], "_prefab": { - "__id__": 94 + "__id__": 80 }, "_lpos": { "__type__": "cc.Vec3", @@ -2270,11 +2086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", @@ -2298,11 +2114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2356,20 +2172,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 82 + "__id__": 68 }, "_children": [], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 82 }, { - "__id__": 98 + "__id__": 84 } ], "_prefab": { - "__id__": 100 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -2406,11 +2222,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 83 }, "_contentSize": { "__type__": "cc.Size", @@ -2434,11 +2250,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 81 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 85 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2492,20 +2308,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 82 + "__id__": 68 }, "_children": [], "_active": true, "_components": [ { - "__id__": 102 + "__id__": 88 }, { - "__id__": 104 + "__id__": 90 } ], "_prefab": { - "__id__": 106 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -2542,11 +2358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 89 }, "_contentSize": { "__type__": "cc.Size", @@ -2570,11 +2386,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 91 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2628,20 +2444,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 82 + "__id__": 68 }, "_children": [], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 94 }, { - "__id__": 110 + "__id__": 96 } ], "_prefab": { - "__id__": 112 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -2678,11 +2494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -2706,11 +2522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 97 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2764,11 +2580,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 100 }, "_contentSize": { "__type__": "cc.Size", @@ -2792,11 +2608,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 102 }, "_alignFlags": 12, "_target": null, @@ -2828,11 +2644,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 68 }, "_enabled": false, "__prefab": { - "__id__": 118 + "__id__": 104 }, "_resizeMode": 1, "_layoutType": 1, @@ -2879,24 +2695,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 51 }, "_children": [ { - "__id__": 121 + "__id__": 107 } ], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 113 }, { - "__id__": 129 + "__id__": 115 } ], "_prefab": { - "__id__": 131 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", @@ -2933,20 +2749,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 120 + "__id__": 106 }, "_children": [], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 108 }, { - "__id__": 124 + "__id__": 110 } ], "_prefab": { - "__id__": 126 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", @@ -2983,11 +2799,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 109 }, "_contentSize": { "__type__": "cc.Size", @@ -3011,11 +2827,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 111 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3069,11 +2885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 114 }, "_contentSize": { "__type__": "cc.Size", @@ -3097,11 +2913,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3181,11 +2997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -3209,11 +3025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 121 }, "_alignFlags": 13, "_target": null, @@ -3245,11 +3061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 51 }, "_enabled": false, "__prefab": { - "__id__": 137 + "__id__": 123 }, "_resizeMode": 0, "_layoutType": 2, @@ -3300,23 +3116,23 @@ }, "_children": [ { - "__id__": 140 + "__id__": 126 } ], "_active": true, "_components": [ { - "__id__": 148 + "__id__": 134 }, { - "__id__": 150 + "__id__": 136 }, { - "__id__": 152 + "__id__": 138 } ], "_prefab": { - "__id__": 154 + "__id__": 140 }, "_lpos": { "__type__": "cc.Vec3", @@ -3353,23 +3169,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 125 }, "_children": [], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 127 }, { - "__id__": 143 + "__id__": 129 }, { - "__id__": 145 + "__id__": 131 } ], "_prefab": { - "__id__": 147 + "__id__": 133 }, "_lpos": { "__type__": "cc.Vec3", @@ -3406,11 +3222,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 128 }, "_contentSize": { "__type__": "cc.Size", @@ -3434,11 +3250,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 126 }, "_enabled": false, "__prefab": { - "__id__": 144 + "__id__": 130 }, "_alignFlags": 18, "_target": null, @@ -3470,11 +3286,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 132 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3528,11 +3344,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 135 }, "_contentSize": { "__type__": "cc.Size", @@ -3556,11 +3372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 125 }, "_enabled": false, "__prefab": { - "__id__": 151 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3601,11 +3417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 139 }, "_alignFlags": 37, "_target": null, @@ -3654,7 +3470,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 142 }, "_contentSize": { "__type__": "cc.Size", @@ -3682,7 +3498,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 144 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3727,7 +3543,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 146 }, "_alignFlags": 16, "_target": null, @@ -3763,34 +3579,31 @@ }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 148 }, "avatar": { "__id__": 19 }, "girlName": { - "__id__": 69 + "__id__": 55 }, "tags": { - "__id__": 77 + "__id__": 63 }, "price": { - "__id__": 129 + "__id__": 115 }, "freeNode": { - "__id__": 140 + "__id__": 126 }, "unreleaseCover": { - "__id__": 45 + "__id__": 31 }, "chatIcon": { - "__id__": 59 - }, - "loading": { - "__id__": 22 + "__id__": 45 }, "starParent": { - "__id__": 82 + "__id__": 68 }, "_id": "" }, @@ -3808,7 +3621,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 150 }, "_type": 3, "_inverted": false, @@ -3830,11 +3643,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 152 }, "clickEvents": [ { - "__id__": 167 + "__id__": 153 } ], "_interactable": true, @@ -3915,17 +3728,17 @@ "_active": true, "_components": [ { - "__id__": 170 + "__id__": 156 }, { - "__id__": 172 + "__id__": 158 }, { - "__id__": 174 + "__id__": 160 } ], "_prefab": { - "__id__": 176 + "__id__": 162 }, "_lpos": { "__type__": "cc.Vec3", @@ -3962,11 +3775,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 157 }, "_contentSize": { "__type__": "cc.Size", @@ -3990,11 +3803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 159 }, "_resizeMode": 1, "_layoutType": 2, @@ -4028,11 +3841,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 161 }, "_alignFlags": 40, "_target": null, @@ -4081,7 +3894,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 164 }, "_contentSize": { "__type__": "cc.Size", @@ -4109,7 +3922,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 166 }, "_type": 0, "_inverted": false, @@ -4131,7 +3944,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 168 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4177,7 +3990,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 170 }, "_alignFlags": 45, "_target": null, @@ -4226,7 +4039,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", @@ -4254,7 +4067,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 189 + "__id__": 175 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4299,7 +4112,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 177 }, "bounceDuration": 0.23, "brake": 0.75, @@ -4310,7 +4123,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 169 + "__id__": 155 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -4330,7 +4143,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 179 }, "_alignFlags": 45, "_target": null, @@ -4379,7 +4192,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 182 }, "_contentSize": { "__type__": "cc.Size", @@ -4407,7 +4220,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 184 }, "_alignFlags": 45, "_target": null, @@ -4443,7 +4256,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 186 }, "_type": 0, "_inverted": false, @@ -4465,7 +4278,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 188 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4524,26 +4337,26 @@ }, "_children": [ { - "__id__": 205 + "__id__": 191 }, { - "__id__": 216 + "__id__": 202 } ], "_active": true, "_components": [ { - "__id__": 226 + "__id__": 212 }, { - "__id__": 228 + "__id__": 214 }, { - "__id__": 230 + "__id__": 216 } ], "_prefab": { - "__id__": 232 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -4580,26 +4393,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 190 }, "_children": [], "_active": true, "_components": [ { - "__id__": 206 + "__id__": 192 }, { - "__id__": 208 + "__id__": 194 }, { - "__id__": 210 + "__id__": 196 }, { - "__id__": 213 + "__id__": 199 } ], "_prefab": { - "__id__": 215 + "__id__": 201 }, "_lpos": { "__type__": "cc.Vec3", @@ -4636,11 +4449,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 193 }, "_contentSize": { "__type__": "cc.Size", @@ -4664,11 +4477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 195 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4709,15 +4522,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 197 }, "clickEvents": [ { - "__id__": 212 + "__id__": 198 } ], "_interactable": true, @@ -4757,7 +4570,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 205 + "__id__": 191 }, "_id": "" }, @@ -4781,11 +4594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 200 }, "_alignFlags": 10, "_target": null, @@ -4830,26 +4643,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 190 }, "_children": [], "_active": true, "_components": [ { - "__id__": 217 + "__id__": 203 }, { - "__id__": 219 + "__id__": 205 }, { - "__id__": 221 + "__id__": 207 }, { - "__id__": 223 + "__id__": 209 } ], "_prefab": { - "__id__": 225 + "__id__": 211 }, "_lpos": { "__type__": "cc.Vec3", @@ -4886,11 +4699,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", @@ -4914,11 +4727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 206 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4985,11 +4798,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 208 }, "_alignFlags": 18, "_target": null, @@ -5021,11 +4834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 210 }, "languageKey": "girllistpanel.title", "defaultText": "", @@ -5055,11 +4868,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -5083,11 +4896,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5128,11 +4941,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 217 }, "_alignFlags": 41, "_target": null, @@ -5181,7 +4994,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 220 }, "_contentSize": { "__type__": "cc.Size", @@ -5209,7 +5022,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 222 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5254,7 +5067,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 224 }, "_alignFlags": 45, "_target": null, @@ -5303,7 +5116,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -5331,7 +5144,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 229 }, "_alignFlags": 45, "_target": null, @@ -5367,7 +5180,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 231 }, "m_rootNode": null, "_id": "" @@ -5386,7 +5199,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 233 }, "_id": "" }, @@ -5404,11 +5217,6 @@ }, "fileId": "50O8GAOyNKI4WyeNDAmUoh", "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": [ - { - "__id__": 22 - } - ] + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/MainPanel.prefab.meta b/assets/bundles/Chat18x/MainPanel.prefab.meta deleted file mode 100644 index 0d88cba0..00000000 --- a/assets/bundles/Chat18x/MainPanel.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "a2ea15da-490b-4cbe-8f31-2790a134459b", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "MainPanel" - } -} diff --git a/assets/bundles/Chat18x/ShowPanel.prefab b/assets/bundles/Chat18x/ShowPanel.prefab index 9ec26a3b..922b7bf6 100644 --- a/assets/bundles/Chat18x/ShowPanel.prefab +++ b/assets/bundles/Chat18x/ShowPanel.prefab @@ -22,29 +22,26 @@ "__id__": 2 }, { - "__id__": 10 + "__id__": 12 }, { - "__id__": 16 - }, - { - "__id__": 26 + "__id__": 18 } ], "_active": true, "_components": [ { - "__id__": 36 + "__id__": 28 }, { - "__id__": 38 + "__id__": 30 }, { - "__id__": 40 + "__id__": 32 } ], "_prefab": { - "__id__": 42 + "__id__": 34 }, "_lpos": { "__type__": "cc.Vec3", @@ -77,7 +74,7 @@ }, { "__type__": "cc.Node", - "_name": "SpriteSplash-001", + "_name": "SpriteSplash", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -94,10 +91,13 @@ }, { "__id__": 7 + }, + { + "__id__": 9 } ], "_prefab": { - "__id__": 9 + "__id__": 11 }, "_lpos": { "__type__": "cc.Vec3", @@ -154,7 +154,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "29w+tG7ExGh4i60/SATtE8" + "fileId": "110iG9EytA1YAB0wVNQw+A" }, { "__type__": "cc.Sprite", @@ -199,7 +199,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e7KGuNOqZErKofvq3f46aX" + "fileId": "f0CR2UEFFOF6PU6TRY202K" }, { "__type__": "cc.Widget", @@ -235,7 +235,63 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "01/NlVd3NNZ6qKuftPetJ8" + "fileId": "f6j/k9YUFHCaZUOQEfX2Wf" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 0, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "74vW3BgyFGHKbowSkSx8rg" }, { "__type__": "cc.PrefabInfo", @@ -245,7 +301,7 @@ "asset": { "__id__": 0 }, - "fileId": "e8ky/PljxPv6194X3qOOaf", + "fileId": "847WtxRnVLRZqyVBgRKHkS", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -262,14 +318,14 @@ "_active": true, "_components": [ { - "__id__": 11 + "__id__": 13 }, { - "__id__": 13 + "__id__": 15 } ], "_prefab": { - "__id__": 15 + "__id__": 17 }, "_lpos": { "__type__": "cc.Vec3", @@ -306,11 +362,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 14 }, "_contentSize": { "__type__": "cc.Size", @@ -334,11 +390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -393,17 +449,17 @@ }, "_children": [ { - "__id__": 17 + "__id__": 19 } ], "_active": true, "_components": [ { - "__id__": 23 + "__id__": 25 } ], "_prefab": { - "__id__": 25 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", @@ -440,20 +496,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 16 + "__id__": 18 }, "_children": [], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 20 }, { - "__id__": 20 + "__id__": 22 } ], "_prefab": { - "__id__": 22 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -490,11 +546,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -518,11 +574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 23 }, "_resourceType": 1, "_remoteURL": "", @@ -561,11 +617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 18 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 26 }, "_contentSize": { "__type__": "cc.Size", @@ -596,240 +652,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "SpriteSplash", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 27 - }, - { - "__id__": 29 - }, - { - "__id__": 31 - }, - { - "__id__": 33 - } - ], - "_prefab": { - "__id__": 35 - }, - "_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__": 26 - }, - "_enabled": true, - "__prefab": { - "__id__": 28 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 2340 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "110iG9EytA1YAB0wVNQw+A" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 26 - }, - "_enabled": true, - "__prefab": { - "__id__": 30 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 0 - }, - "_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": "f0CR2UEFFOF6PU6TRY202K" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 26 - }, - "_enabled": true, - "__prefab": { - "__id__": 32 - }, - "_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": "f6j/k9YUFHCaZUOQEfX2Wf" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 26 - }, - "_enabled": true, - "__prefab": { - "__id__": 34 - }, - "clickEvents": [], - "_interactable": true, - "_transition": 0, - "_normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_normalSprite": null, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 1.2, - "_target": { - "__id__": 26 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "74vW3BgyFGHKbowSkSx8rg" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "847WtxRnVLRZqyVBgRKHkS", - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.UITransform", "_name": "", @@ -840,7 +662,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -868,7 +690,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 31 }, "_alignFlags": 45, "_target": null, @@ -904,20 +726,20 @@ }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 33 }, "m_rootNode": null, "image": { - "__id__": 13 + "__id__": 15 }, "splash": { - "__id__": 29 + "__id__": 5 }, "videoArea": { - "__id__": 23 + "__id__": 25 }, "videoPlayer": { - "__id__": 20 + "__id__": 22 }, "_id": "" }, @@ -934,6 +756,7 @@ "__id__": 0 }, "fileId": "18xipwdnNNI6CKhTGcIHEq", - "instance": null + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index c92803f3..167660db 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 396 + "__id__": 376 }, { - "__id__": 398 + "__id__": 378 }, { - "__id__": 400 + "__id__": 380 } ], "_prefab": { - "__id__": 402 + "__id__": 382 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,17 +85,17 @@ "_active": true, "_components": [ { - "__id__": 389 + "__id__": 369 }, { - "__id__": 391 + "__id__": 371 }, { - "__id__": 393 + "__id__": 373 } ], "_prefab": { - "__id__": 395 + "__id__": 375 }, "_lpos": { "__type__": "cc.Vec3", @@ -2871,23 +2871,23 @@ "__id__": 192 }, { - "__id__": 266 + "__id__": 254 } ], "_active": true, "_components": [ { - "__id__": 382 + "__id__": 362 }, { - "__id__": 384 + "__id__": 364 }, { - "__id__": 386 + "__id__": 366 } ], "_prefab": { - "__id__": 388 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", @@ -4539,32 +4539,32 @@ "__id__": 193 }, { - "__id__": 221 + "__id__": 209 }, { - "__id__": 237 + "__id__": 225 }, { - "__id__": 245 + "__id__": 233 }, { - "__id__": 251 + "__id__": 239 } ], "_active": true, "_components": [ { - "__id__": 259 + "__id__": 247 }, { - "__id__": 261 + "__id__": 249 }, { - "__id__": 263 + "__id__": 251 } ], "_prefab": { - "__id__": 265 + "__id__": 253 }, "_lpos": { "__type__": "cc.Vec3", @@ -4606,28 +4606,25 @@ "_children": [ { "__id__": 194 - }, - { - "__id__": 200 } ], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 200 }, { - "__id__": 214 + "__id__": 202 }, { - "__id__": 216 + "__id__": 204 }, { - "__id__": 218 + "__id__": 206 } ], "_prefab": { - "__id__": 220 + "__id__": 208 }, "_lpos": { "__type__": "cc.Vec3", @@ -4794,164 +4791,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 193 - }, - "_prefab": { - "__id__": 201 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 200 - }, - "asset": { - "__uuid__": "bf652567-4b2f-4169-937f-6d12f0d9c354", - "__expectedType__": "cc.Prefab" - }, - "fileId": "63H2+Zfo9PcI21HLgBNY8H", - "instance": { - "__id__": 202 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "2cRLKDVGhDLJ9BcAGpGv0u", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 203 - }, - { - "__id__": 205 - }, - { - "__id__": 206 - }, - { - "__id__": 207 - }, - { - "__id__": 208 - }, - { - "__id__": 210 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 204 - }, - "propertyPath": [ - "_name" - ], - "value": "loadingItem" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63H2+Zfo9PcI21HLgBNY8H" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 204 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 204 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 204 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 209 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 461, - "height": 461 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "73fdjB38ZHe5MjwXKxuB5t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 211 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 461, - "height": 461 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "856w1D9j5E44Lcq2R0y9vO" - ] - }, { "__type__": "cc.UITransform", "_name": "", @@ -4962,7 +4801,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -4990,7 +4829,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 203 }, "_alignFlags": 45, "_target": null, @@ -5026,7 +4865,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 205 }, "_type": 3, "_inverted": false, @@ -5048,7 +4887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 207 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5106,23 +4945,23 @@ }, "_children": [ { - "__id__": 222 + "__id__": 210 } ], "_active": true, "_components": [ { - "__id__": 230 + "__id__": 218 }, { - "__id__": 232 + "__id__": 220 }, { - "__id__": 234 + "__id__": 222 } ], "_prefab": { - "__id__": 236 + "__id__": 224 }, "_lpos": { "__type__": "cc.Vec3", @@ -5159,23 +4998,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 221 + "__id__": 209 }, "_children": [], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 211 }, { - "__id__": 225 + "__id__": 213 }, { - "__id__": 227 + "__id__": 215 } ], "_prefab": { - "__id__": 229 + "__id__": 217 }, "_lpos": { "__type__": "cc.Vec3", @@ -5212,11 +5051,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 212 }, "_contentSize": { "__type__": "cc.Size", @@ -5240,11 +5079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 214 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5311,11 +5150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 216 }, "_alignFlags": 40, "_target": null, @@ -5360,11 +5199,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 219 }, "_contentSize": { "__type__": "cc.Size", @@ -5388,11 +5227,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 221 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5433,11 +5272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 223 }, "_alignFlags": 12, "_target": null, @@ -5488,17 +5327,17 @@ "_active": true, "_components": [ { - "__id__": 238 + "__id__": 226 }, { - "__id__": 240 + "__id__": 228 }, { - "__id__": 242 + "__id__": 230 } ], "_prefab": { - "__id__": 244 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -5535,11 +5374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -5563,11 +5402,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 229 }, "_alignFlags": 45, "_target": null, @@ -5599,11 +5438,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 231 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5663,14 +5502,14 @@ "_active": true, "_components": [ { - "__id__": 246 + "__id__": 234 }, { - "__id__": 248 + "__id__": 236 } ], "_prefab": { - "__id__": 250 + "__id__": 238 }, "_lpos": { "__type__": "cc.Vec3", @@ -5707,11 +5546,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", @@ -5735,11 +5574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 237 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5799,17 +5638,17 @@ "_active": false, "_components": [ { - "__id__": 252 + "__id__": 240 }, { - "__id__": 254 + "__id__": 242 }, { - "__id__": 256 + "__id__": 244 } ], "_prefab": { - "__id__": 258 + "__id__": 246 }, "_lpos": { "__type__": "cc.Vec3", @@ -5846,11 +5685,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 241 }, "_contentSize": { "__type__": "cc.Size", @@ -5874,11 +5713,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 243 }, "_alignFlags": 45, "_target": null, @@ -5910,11 +5749,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 245 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5972,7 +5811,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 248 }, "_contentSize": { "__type__": "cc.Size", @@ -6000,7 +5839,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 250 }, "clickEvents": [], "_interactable": true, @@ -6058,19 +5897,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 252 }, "lockImg": { - "__id__": 248 + "__id__": 236 }, "lockCover": { - "__id__": 242 + "__id__": 230 }, "titleName": { - "__id__": 225 - }, - "loading": { - "__id__": 200 + "__id__": 213 }, "img": { "__id__": 197 @@ -6104,26 +5940,26 @@ }, "_children": [ { - "__id__": 267 + "__id__": 255 } ], "_active": true, "_components": [ { - "__id__": 373 + "__id__": 353 }, { - "__id__": 375 + "__id__": 355 }, { - "__id__": 377 + "__id__": 357 }, { - "__id__": 379 + "__id__": 359 } ], "_prefab": { - "__id__": 381 + "__id__": 361 }, "_lpos": { "__type__": "cc.Vec3", @@ -6160,30 +5996,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 266 + "__id__": 254 }, "_children": [ { - "__id__": 268 + "__id__": 256 } ], "_active": true, "_components": [ { - "__id__": 364 + "__id__": 344 }, { - "__id__": 366 + "__id__": 346 }, { - "__id__": 368 + "__id__": 348 }, { - "__id__": 370 + "__id__": 350 } ], "_prefab": { - "__id__": 372 + "__id__": 352 }, "_lpos": { "__type__": "cc.Vec3", @@ -6220,30 +6056,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 267 + "__id__": 255 }, "_children": [ { - "__id__": 269 + "__id__": 257 }, { - "__id__": 349 + "__id__": 329 } ], "_active": true, "_components": [ { - "__id__": 357 + "__id__": 337 }, { - "__id__": 359 + "__id__": 339 }, { - "__id__": 361 + "__id__": 341 } ], "_prefab": { - "__id__": 363 + "__id__": 343 }, "_lpos": { "__type__": "cc.Vec3", @@ -6280,30 +6116,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 256 }, "_children": [ { - "__id__": 270 + "__id__": 258 }, { - "__id__": 278 + "__id__": 266 }, { - "__id__": 336 + "__id__": 316 } ], "_active": true, "_components": [ { - "__id__": 344 + "__id__": 324 }, { - "__id__": 346 + "__id__": 326 } ], "_prefab": { - "__id__": 348 + "__id__": 328 }, "_lpos": { "__type__": "cc.Vec3", @@ -6340,23 +6176,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 269 + "__id__": 257 }, "_children": [], "_active": true, "_components": [ { - "__id__": 271 + "__id__": 259 }, { - "__id__": 273 + "__id__": 261 }, { - "__id__": 275 + "__id__": 263 } ], "_prefab": { - "__id__": 277 + "__id__": 265 }, "_lpos": { "__type__": "cc.Vec3", @@ -6393,11 +6229,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 260 }, "_contentSize": { "__type__": "cc.Size", @@ -6421,11 +6257,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 262 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6466,11 +6302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 264 }, "_alignFlags": 18, "_target": null, @@ -6515,39 +6351,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 269 + "__id__": 257 }, "_children": [ { - "__id__": 279 + "__id__": 267 }, { - "__id__": 301 + "__id__": 281 }, { - "__id__": 309 + "__id__": 289 }, { - "__id__": 317 + "__id__": 297 } ], "_active": true, "_components": [ { - "__id__": 327 + "__id__": 307 }, { - "__id__": 329 + "__id__": 309 }, { - "__id__": 331 + "__id__": 311 }, { - "__id__": 333 + "__id__": 313 } ], "_prefab": { - "__id__": 335 + "__id__": 315 }, "_lpos": { "__type__": "cc.Vec3", @@ -6584,30 +6420,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 278 + "__id__": 266 }, "_children": [ { - "__id__": 280 - }, - { - "__id__": 286 + "__id__": 268 } ], "_active": true, "_components": [ { - "__id__": 294 + "__id__": 274 }, { - "__id__": 296 + "__id__": 276 }, { - "__id__": 298 + "__id__": 278 } ], "_prefab": { - "__id__": 300 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -6644,20 +6477,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 279 + "__id__": 267 }, "_children": [], "_active": true, "_components": [ { - "__id__": 281 + "__id__": 269 }, { - "__id__": 283 + "__id__": 271 } ], "_prefab": { - "__id__": 285 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -6694,11 +6527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -6722,11 +6555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6774,129 +6607,17 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 279 - }, - "_prefab": { - "__id__": 287 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 286 - }, - "asset": { - "__uuid__": "bf652567-4b2f-4169-937f-6d12f0d9c354", - "__expectedType__": "cc.Prefab" - }, - "fileId": "63H2+Zfo9PcI21HLgBNY8H", - "instance": { - "__id__": 288 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "3agsUc+N5Fm4uCNXHahHnE", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 289 - }, - { - "__id__": 291 - }, - { - "__id__": 292 - }, - { - "__id__": 293 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 290 - }, - "propertyPath": [ - "_name" - ], - "value": "loadingRec" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63H2+Zfo9PcI21HLgBNY8H" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 290 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 231.35, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 290 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 290 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", @@ -6920,11 +6641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 277 }, "_type": 0, "_inverted": false, @@ -6942,11 +6663,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 279 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7001,23 +6722,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 278 + "__id__": 266 }, "_children": [], "_active": true, "_components": [ { - "__id__": 302 + "__id__": 282 }, { - "__id__": 304 + "__id__": 284 }, { - "__id__": 306 + "__id__": 286 } ], "_prefab": { - "__id__": 308 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -7054,11 +6775,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 301 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 283 }, "_contentSize": { "__type__": "cc.Size", @@ -7082,11 +6803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 301 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 285 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7153,11 +6874,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 301 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 287 }, "languageKey": "themepanel.recomandtext", "defaultText": "", @@ -7187,23 +6908,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 278 + "__id__": 266 }, "_children": [], "_active": true, "_components": [ { - "__id__": 310 + "__id__": 290 }, { - "__id__": 312 + "__id__": 292 }, { - "__id__": 314 + "__id__": 294 } ], "_prefab": { - "__id__": 316 + "__id__": 296 }, "_lpos": { "__type__": "cc.Vec3", @@ -7240,11 +6961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 291 }, "_contentSize": { "__type__": "cc.Size", @@ -7268,11 +6989,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 293 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7339,11 +7060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 295 }, "languageKey": "girl_10001_name", "defaultText": "", @@ -7373,26 +7094,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 278 + "__id__": 266 }, "_children": [], "_active": true, "_components": [ { - "__id__": 318 + "__id__": 298 }, { - "__id__": 320 + "__id__": 300 }, { - "__id__": 322 + "__id__": 302 }, { - "__id__": 324 + "__id__": 304 } ], "_prefab": { - "__id__": 326 + "__id__": 306 }, "_lpos": { "__type__": "cc.Vec3", @@ -7429,11 +7150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 297 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 299 }, "_contentSize": { "__type__": "cc.Size", @@ -7457,11 +7178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 297 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 301 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7502,11 +7223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 297 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 303 }, "_alignFlags": 34, "_target": null, @@ -7538,11 +7259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 297 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 305 }, "clickEvents": [], "_interactable": true, @@ -7607,11 +7328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 308 }, "_contentSize": { "__type__": "cc.Size", @@ -7635,11 +7356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 310 }, "_alignFlags": 45, "_target": null, @@ -7671,11 +7392,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 312 }, "_type": 3, "_inverted": false, @@ -7693,11 +7414,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 314 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7751,23 +7472,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 269 + "__id__": 257 }, "_children": [], "_active": false, "_components": [ { - "__id__": 337 + "__id__": 317 }, { - "__id__": 339 + "__id__": 319 }, { - "__id__": 341 + "__id__": 321 } ], "_prefab": { - "__id__": 343 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -7804,11 +7525,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 318 }, "_contentSize": { "__type__": "cc.Size", @@ -7832,11 +7553,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 320 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7877,11 +7598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 322 }, "_alignFlags": 45, "_target": null, @@ -7926,11 +7647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 325 }, "_contentSize": { "__type__": "cc.Size", @@ -7954,11 +7675,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 327 }, "_alignFlags": 41, "_target": null, @@ -8003,23 +7724,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 256 }, "_children": [], "_active": true, "_components": [ { - "__id__": 350 + "__id__": 330 }, { - "__id__": 352 + "__id__": 332 }, { - "__id__": 354 + "__id__": 334 } ], "_prefab": { - "__id__": 356 + "__id__": 336 }, "_lpos": { "__type__": "cc.Vec3", @@ -8056,11 +7777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 331 }, "_contentSize": { "__type__": "cc.Size", @@ -8084,11 +7805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 333 }, "_resizeMode": 1, "_layoutType": 3, @@ -8122,11 +7843,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 355 + "__id__": 335 }, "_alignFlags": 40, "_target": null, @@ -8171,11 +7892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 338 }, "_contentSize": { "__type__": "cc.Size", @@ -8199,11 +7920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 340 }, "_resizeMode": 1, "_layoutType": 2, @@ -8237,11 +7958,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 342 }, "_alignFlags": 1, "_target": null, @@ -8286,11 +8007,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 365 + "__id__": 345 }, "_contentSize": { "__type__": "cc.Size", @@ -8314,11 +8035,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 347 }, "_type": 0, "_inverted": false, @@ -8336,11 +8057,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 349 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8382,11 +8103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 351 }, "_alignFlags": 45, "_target": null, @@ -8431,11 +8152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 354 }, "_contentSize": { "__type__": "cc.Size", @@ -8459,11 +8180,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 254 }, "_enabled": false, "__prefab": { - "__id__": 376 + "__id__": 356 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8504,11 +8225,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 358 }, "bounceDuration": 0.23, "brake": 0.75, @@ -8519,7 +8240,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 268 + "__id__": 256 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -8535,11 +8256,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 360 }, "_alignFlags": 45, "_target": null, @@ -8588,7 +8309,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 363 }, "_contentSize": { "__type__": "cc.Size", @@ -8616,7 +8337,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 385 + "__id__": 365 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8661,7 +8382,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 367 }, "_alignFlags": 45, "_target": null, @@ -8710,7 +8431,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 370 }, "_contentSize": { "__type__": "cc.Size", @@ -8738,7 +8459,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 372 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8783,7 +8504,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 374 }, "_alignFlags": 45, "_target": null, @@ -8832,7 +8553,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 397 + "__id__": 377 }, "_contentSize": { "__type__": "cc.Size", @@ -8860,7 +8581,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 379 }, "_alignFlags": 45, "_target": null, @@ -8896,7 +8617,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 401 + "__id__": 381 }, "m_rootNode": null, "_id": "" @@ -8915,14 +8636,6 @@ }, "fileId": "2a7Z6SAo5FGp7D1Od2evES", "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": [ - { - "__id__": 286 - }, - { - "__id__": 200 - } - ] + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/UI.meta b/assets/bundles/Chat18x/UI.meta new file mode 100644 index 00000000..bc72f411 --- /dev/null +++ b/assets/bundles/Chat18x/UI.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "5055a3d1-756b-4ac3-9e5b-2211d11145a6", + "files": [], + "subMetas": {}, + "userData": {} +}