diff --git a/assets/Scripts/Main/Channel/SDKManager.ts b/assets/Scripts/Main/Channel/SDKManager.ts index a30622c7..e1ad9f55 100644 --- a/assets/Scripts/Main/Channel/SDKManager.ts +++ b/assets/Scripts/Main/Channel/SDKManager.ts @@ -289,8 +289,8 @@ export class SDKManager { //extends Component //region 播放背景视频 cbMap = {cbReady, cbEnded} - static PlayBgAudio(remoteUrl:string, vtype:VideoRoleType, loop:boolean = false, extra:any = {}) { - this.sdk.playBgAudio(remoteUrl, vtype, loop, extra); + static PlayBgAudio(remoteUrl:string, loop:boolean = false, extra:any = {}) { + this.sdk.playBgAudio(remoteUrl, loop, extra); } //添加要播放的表情视频 static AddEmoAudio(remoteUrl:string, vtype:VideoRoleType, loop:boolean = false, extra:any = {}) { diff --git a/assets/Scripts/Main/Channel/wxSDK.ts b/assets/Scripts/Main/Channel/wxSDK.ts index 4ce8d972..79aadd3b 100644 --- a/assets/Scripts/Main/Channel/wxSDK.ts +++ b/assets/Scripts/Main/Channel/wxSDK.ts @@ -643,17 +643,16 @@ export class WXSDK { private curPlayType: VideoRoleType = VideoRoleType.None; //当前播放的视频的类型 playBgAudio( remoteUrl: string, - vtype: VideoRoleType, loop: boolean = false, extra: any = {} ) { if (this._bgVideo && this._bgShow) { - this.playBgAudioNext(remoteUrl, vtype, loop, extra); + this.playBgAudioNext(remoteUrl, loop, extra); return; } let self = this; console.log("微信 播放背景视频组件1", remoteUrl); - this.curPlayType = vtype; + //this.curPlayType = vtype; if (!this._bgVideo) { this._bgVideo = this.createVideoHandle(); // this._bgVideo.onPlay(() => { @@ -694,13 +693,11 @@ export class WXSDK { private _bgTempShow: boolean = false; playBgAudioNext( remoteUrl: string, - vtype: VideoRoleType, loop: boolean = false, extra: any = {} ) { this.removeBgAudioNext(); console.log("微信 创建背景视频组件2--->", remoteUrl); - this.curPlayType = vtype; let self = this; if (!this._bgTempVideo) { this._bgTempVideo = this.createVideoHandle(); diff --git a/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts b/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts index 63ef801f..4a96b003 100644 --- a/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts +++ b/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts @@ -47,7 +47,9 @@ export class SceneBgVideoLayer extends li_BaseView { openUIDataCT(data: any): void { this._data = data; } - + getVideoClone() { + return this.videoPlayer; + } /**初始化视频事件监听 */ private initVideoEvents() { if (!this.videoPlayer) return; @@ -111,7 +113,7 @@ export class SceneBgVideoLayer extends li_BaseView { this.pendingVideoConfig = { size: config.size, position: config.position, - scale: options?.scale + scale: options?.scale, }; const envData = DataManager.I.getDataById(DataId.Env); @@ -199,13 +201,13 @@ export class SceneBgVideoLayer extends li_BaseView { if (this.isPlaying && this.videoPlayer.isPlaying) { this.applyVideoConfiguration({ size: targetSize, - position: position + position: position, }); } else { // 如果视频还未准备好,存储配置等待应用 this.pendingVideoConfig = { size: targetSize, - position: position + position: position, }; console.log("SceneBgVideoLayer: 视频未准备好,配置已存储等待应用"); } @@ -246,17 +248,21 @@ export class SceneBgVideoLayer extends li_BaseView { targetWorldPos = new Vec3(pos.x, pos.y, pos.z || 0); } this.videoPlayer.node.setWorldPosition(targetWorldPos); - console.log(`SceneBgVideoLayer: 设置视频位置 (${targetWorldPos.x}, ${targetWorldPos.y}, ${targetWorldPos.z})`); + console.log( + `SceneBgVideoLayer: 设置视频位置 (${targetWorldPos.x}, ${targetWorldPos.y}, ${targetWorldPos.z})` + ); } // 应用尺寸和缩放设置 if (config.size) { // 获取视频的原始尺寸(此时应该是准确的) const videoSize = uiTransform.contentSize; - + if (videoSize.width > 0 && videoSize.height > 0) { - const targetWidth = config.size instanceof Size ? config.size.width : config.size.width; - const targetHeight = config.size instanceof Size ? config.size.height : config.size.height; + const targetWidth = + config.size instanceof Size ? config.size.width : config.size.width; + const targetHeight = + config.size instanceof Size ? config.size.height : config.size.height; // 计算缩放比例(填满整个区域) const scaleX = targetWidth / videoSize.width; @@ -264,7 +270,9 @@ export class SceneBgVideoLayer extends li_BaseView { const scale = Math.max(scaleX, scaleY); this.videoPlayer.node.setScale(new Vec3(scale, scale, 1)); - console.log(`SceneBgVideoLayer: 设置视频缩放 ${scale} (原始尺寸: ${videoSize.width}x${videoSize.height}, 目标尺寸: ${targetWidth}x${targetHeight})`); + console.log( + `SceneBgVideoLayer: 设置视频缩放 ${scale} (原始尺寸: ${videoSize.width}x${videoSize.height}, 目标尺寸: ${targetWidth}x${targetHeight})` + ); } else { console.warn("SceneBgVideoLayer: 无法获取视频尺寸,跳过缩放设置"); } @@ -275,7 +283,9 @@ export class SceneBgVideoLayer extends li_BaseView { console.log(`SceneBgVideoLayer: 设置显式缩放 ${config.scale}`); } else { this.videoPlayer.node.setScale(config.scale); - console.log(`SceneBgVideoLayer: 设置显式缩放 (${config.scale.x}, ${config.scale.y}, ${config.scale.z})`); + console.log( + `SceneBgVideoLayer: 设置显式缩放 (${config.scale.x}, ${config.scale.y}, ${config.scale.z})` + ); } } else { // 没有指定尺寸或缩放,保持原始缩放 @@ -288,14 +298,14 @@ export class SceneBgVideoLayer extends li_BaseView { private onVideoReadyToPlay = () => { console.log("SceneBgVideoLayer: 视频准备完成"); - + // 应用待处理的视频配置 if (this.pendingVideoConfig) { this.applyVideoConfiguration(this.pendingVideoConfig); // 清空待处理配置 this.pendingVideoConfig = null; } - + this.onVideoReady(); }; diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index 7f84c188..5857a4f5 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -22,32 +22,32 @@ "__id__": 2 }, { - "__id__": 253 + "__id__": 261 }, { - "__id__": 72 + "__id__": 74 }, { - "__id__": 112 + "__id__": 114 }, { - "__id__": 331 + "__id__": 345 } ], "_active": true, "_components": [ { - "__id__": 361 + "__id__": 375 }, { - "__id__": 363 + "__id__": 377 }, { - "__id__": 365 + "__id__": 379 } ], "_prefab": { - "__id__": 367 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -97,29 +97,29 @@ "__id__": 19 }, { - "__id__": 56 + "__id__": 58 }, { - "__id__": 170 + "__id__": 172 }, { - "__id__": 182 + "__id__": 184 } ], "_active": true, "_components": [ { - "__id__": 246 + "__id__": 254 }, { - "__id__": 248 + "__id__": 256 }, { - "__id__": 250 + "__id__": 258 } ], "_prefab": { - "__id__": 252 + "__id__": 260 }, "_lpos": { "__type__": "cc.Vec3", @@ -254,7 +254,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d5aa44e9-a6e4-4570-bfba-238a902ca222@f9941", + "__uuid__": "760237d1-46b3-4c02-8e0b-849a95e36873@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -513,26 +513,26 @@ "__id__": 20 }, { - "__id__": 26 + "__id__": 28 }, { - "__id__": 41 + "__id__": 43 } ], "_active": true, "_components": [ - { - "__id__": 49 - }, { "__id__": 51 }, { "__id__": 53 + }, + { + "__id__": 55 } ], "_prefab": { - "__id__": 55 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -579,10 +579,13 @@ }, { "__id__": 23 + }, + { + "__id__": 25 } ], "_prefab": { - "__id__": 25 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", @@ -628,7 +631,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 150 + "height": 148.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -669,7 +672,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -686,6 +689,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "baCnRGDpRGDo7p1qA5Whn9" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "_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": 512, + "_originalHeight": 71, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "01NTJ5oRdMxY/ZpLlE2+4R" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -709,23 +748,23 @@ }, "_children": [ { - "__id__": 27 + "__id__": 29 } ], "_active": true, "_components": [ - { - "__id__": 33 - }, { "__id__": 35 }, { - "__id__": 38 + "__id__": 37 + }, + { + "__id__": 40 } ], "_prefab": { - "__id__": 40 + "__id__": 42 }, "_lpos": { "__type__": "cc.Vec3", @@ -762,20 +801,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 26 + "__id__": 28 }, "_children": [], "_active": true, "_components": [ { - "__id__": 28 + "__id__": 30 }, { - "__id__": 30 + "__id__": 32 } ], "_prefab": { - "__id__": 32 + "__id__": 34 }, "_lpos": { "__type__": "cc.Vec3", @@ -812,11 +851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 31 }, "_contentSize": { "__type__": "cc.Size", @@ -840,11 +879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 33 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -898,11 +937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 36 }, "_contentSize": { "__type__": "cc.Size", @@ -926,15 +965,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 38 }, "clickEvents": [ { - "__id__": 37 + "__id__": 39 } ], "_interactable": true, @@ -974,7 +1013,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 26 + "__id__": 28 }, "_id": "" }, @@ -998,11 +1037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 41 }, "_alignFlags": 9, "_target": null, @@ -1052,18 +1091,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 42 - }, { "__id__": 44 }, { "__id__": 46 + }, + { + "__id__": 48 } ], "_prefab": { - "__id__": 48 + "__id__": 50 }, "_lpos": { "__type__": "cc.Vec3", @@ -1100,11 +1139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -1128,11 +1167,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 47 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1199,11 +1238,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 49 }, "_alignFlags": 20, "_target": null, @@ -1252,7 +1291,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1280,7 +1319,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 52 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1325,7 +1364,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_alignFlags": 41, "_target": null, @@ -1374,29 +1413,29 @@ }, "_children": [ { - "__id__": 57 + "__id__": 59 }, { - "__id__": 63 + "__id__": 65 } ], "_active": true, "_components": [ - { - "__id__": 163 - }, { "__id__": 165 }, { - "__id__": 151 + "__id__": 167 }, { - "__id__": 167 + "__id__": 153 + }, + { + "__id__": 169 } ], "_prefab": { - "__id__": 169 + "__id__": 171 }, "_lpos": { "__type__": "cc.Vec3", @@ -1433,20 +1472,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 56 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 60 }, { - "__id__": 60 + "__id__": 62 } ], "_prefab": { - "__id__": 62 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1483,11 +1522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1511,11 +1550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 63 }, "_alignFlags": 36, "_target": null, @@ -1560,27 +1599,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 56 + "__id__": 58 }, "_children": [ { - "__id__": 64 + "__id__": 66 } ], "_active": true, "_components": [ - { - "__id__": 156 - }, { "__id__": 158 }, { "__id__": 160 + }, + { + "__id__": 162 } ], "_prefab": { - "__id__": 162 + "__id__": 164 }, "_lpos": { "__type__": "cc.Vec3", @@ -1617,14 +1656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 63 + "__id__": 65 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 65 - }, { "__id__": 67 }, @@ -1632,11 +1668,14 @@ "__id__": 69 }, { - "__id__": 153 + "__id__": 71 + }, + { + "__id__": 155 } ], "_prefab": { - "__id__": 155 + "__id__": 157 }, "_lpos": { "__type__": "cc.Vec3", @@ -1673,11 +1712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 68 }, "_contentSize": { "__type__": "cc.Size", @@ -1701,11 +1740,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 70 }, "_resizeMode": 1, "_layoutType": 2, @@ -1739,20 +1778,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 72 }, "lBubble": { - "__id__": 71 + "__id__": 73 }, "rBubble": { - "__id__": 111 + "__id__": 113 }, "scrollView": { - "__id__": 151 + "__id__": 153 }, "_id": "" }, @@ -1766,23 +1805,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 112 }, "avatar": { - "__id__": 78 + "__id__": 80 }, "bg": { - "__id__": 90 + "__id__": 92 }, "content": { - "__id__": 100 + "__id__": 102 }, "contentT": { - "__id__": 98 + "__id__": 100 }, "_id": "" }, @@ -1796,26 +1835,26 @@ }, "_children": [ { - "__id__": 73 + "__id__": 75 }, { - "__id__": 97 + "__id__": 99 } ], "_active": true, "_components": [ - { - "__id__": 105 - }, { "__id__": 107 }, { - "__id__": 71 + "__id__": 109 + }, + { + "__id__": 73 } ], "_prefab": { - "__id__": 109 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -1852,27 +1891,27 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 72 + "__id__": 74 }, "_children": [ { - "__id__": 74 + "__id__": 76 } ], "_active": true, "_components": [ - { - "__id__": 90 - }, { "__id__": 92 }, { "__id__": 94 + }, + { + "__id__": 96 } ], "_prefab": { - "__id__": 96 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1909,18 +1948,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 73 + "__id__": 75 }, "_children": [ { - "__id__": 75 + "__id__": 77 } ], "_active": true, "_components": [ - { - "__id__": 81 - }, { "__id__": 83 }, @@ -1929,10 +1965,13 @@ }, { "__id__": 87 + }, + { + "__id__": 89 } ], "_prefab": { - "__id__": 89 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1969,20 +2008,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 76 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 78 }, { - "__id__": 78 + "__id__": 80 } ], "_prefab": { - "__id__": 80 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -2019,11 +2058,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 79 }, "_contentSize": { "__type__": "cc.Size", @@ -2047,11 +2086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 81 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2105,11 +2144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -2133,11 +2172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 86 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2178,11 +2217,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 88 }, "_alignFlags": 9, "_target": null, @@ -2214,11 +2253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 90 }, "_type": 3, "_inverted": false, @@ -2249,11 +2288,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 93 }, "_contentSize": { "__type__": "cc.Size", @@ -2277,11 +2316,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 95 }, "_alignFlags": 12, "_target": null, @@ -2313,11 +2352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 97 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2371,23 +2410,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 72 + "__id__": 74 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 98 - }, { "__id__": 100 }, { "__id__": 102 + }, + { + "__id__": 104 } ], "_prefab": { - "__id__": 104 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -2424,11 +2463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -2452,11 +2491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 103 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2520,11 +2559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 105 }, "_alignFlags": 12, "_target": null, @@ -2569,11 +2608,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 108 }, "_contentSize": { "__type__": "cc.Size", @@ -2597,11 +2636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 110 }, "_alignFlags": 40, "_target": null, @@ -2650,23 +2689,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 152 }, "avatar": { - "__id__": 118 + "__id__": 120 }, "bg": { - "__id__": 130 + "__id__": 132 }, "content": { - "__id__": 140 + "__id__": 142 }, "contentT": { - "__id__": 138 + "__id__": 140 }, "_id": "" }, @@ -2680,26 +2719,26 @@ }, "_children": [ { - "__id__": 113 + "__id__": 115 }, { - "__id__": 137 + "__id__": 139 } ], "_active": true, "_components": [ - { - "__id__": 145 - }, { "__id__": 147 }, { - "__id__": 111 + "__id__": 149 + }, + { + "__id__": 113 } ], "_prefab": { - "__id__": 149 + "__id__": 151 }, "_lpos": { "__type__": "cc.Vec3", @@ -2736,27 +2775,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 112 + "__id__": 114 }, "_children": [ { - "__id__": 114 + "__id__": 116 } ], "_active": true, "_components": [ - { - "__id__": 130 - }, { "__id__": 132 }, { "__id__": 134 + }, + { + "__id__": 136 } ], "_prefab": { - "__id__": 136 + "__id__": 138 }, "_lpos": { "__type__": "cc.Vec3", @@ -2793,18 +2832,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 113 + "__id__": 115 }, "_children": [ { - "__id__": 115 + "__id__": 117 } ], "_active": true, "_components": [ - { - "__id__": 121 - }, { "__id__": 123 }, @@ -2813,10 +2849,13 @@ }, { "__id__": 127 + }, + { + "__id__": 129 } ], "_prefab": { - "__id__": 129 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -2853,20 +2892,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 114 + "__id__": 116 }, "_children": [], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 118 }, { - "__id__": 118 + "__id__": 120 } ], "_prefab": { - "__id__": 120 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", @@ -2903,11 +2942,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -2931,11 +2970,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 121 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2989,11 +3028,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -3017,11 +3056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3062,11 +3101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 128 }, "_type": 3, "_inverted": false, @@ -3084,11 +3123,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 130 }, "_alignFlags": 33, "_target": null, @@ -3133,11 +3172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 133 }, "_contentSize": { "__type__": "cc.Size", @@ -3161,11 +3200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 135 }, "_alignFlags": 36, "_target": null, @@ -3197,11 +3236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3255,23 +3294,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 112 + "__id__": 114 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 138 - }, { "__id__": 140 }, { "__id__": 142 + }, + { + "__id__": 144 } ], "_prefab": { - "__id__": 144 + "__id__": 146 }, "_lpos": { "__type__": "cc.Vec3", @@ -3308,11 +3347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 141 }, "_contentSize": { "__type__": "cc.Size", @@ -3336,11 +3375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 143 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3404,11 +3443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 145 }, "_alignFlags": 36, "_target": null, @@ -3443,6 +3482,8 @@ "__id__": 0 }, "fileId": "56pm4u3xtLBbHP/ntKqnNZ", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -3451,11 +3492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", @@ -3479,11 +3520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 150 }, "_alignFlags": 32, "_target": null, @@ -3532,11 +3573,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 154 }, "bounceDuration": 0.23, "brake": 0.75, @@ -3547,7 +3588,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 64 + "__id__": 66 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -3563,11 +3604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 156 }, "_opacity": 255, "_id": "" @@ -3595,11 +3636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 159 }, "_contentSize": { "__type__": "cc.Size", @@ -3623,11 +3664,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 161 }, "_type": 0, "_inverted": false, @@ -3645,11 +3686,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 163 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3704,11 +3745,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 166 }, "_contentSize": { "__type__": "cc.Size", @@ -3732,11 +3773,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 168 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3774,11 +3815,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 170 }, "_alignFlags": 5, "_target": null, @@ -3827,20 +3868,20 @@ }, "_children": [ { - "__id__": 171 + "__id__": 173 } ], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 179 }, { - "__id__": 179 + "__id__": 181 } ], "_prefab": { - "__id__": 181 + "__id__": 183 }, "_lpos": { "__type__": "cc.Vec3", @@ -3877,20 +3918,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 170 + "__id__": 172 }, "_children": [], "_active": false, "_components": [ { - "__id__": 172 + "__id__": 174 }, { - "__id__": 174 + "__id__": 176 } ], "_prefab": { - "__id__": 176 + "__id__": 178 }, "_lpos": { "__type__": "cc.Vec3", @@ -3927,11 +3968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 175 }, "_contentSize": { "__type__": "cc.Size", @@ -3955,11 +3996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 177 }, "_resourceType": 1, "_remoteURL": "", @@ -3998,11 +4039,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 180 }, "_contentSize": { "__type__": "cc.Size", @@ -4026,11 +4067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 182 }, "_alignFlags": 45, "_target": null, @@ -4079,37 +4120,28 @@ }, "_children": [ { - "__id__": 183 - }, - { - "__id__": 191 - }, - { - "__id__": 199 - }, - { - "__id__": 224 + "__id__": 185 } ], "_active": true, "_components": [ { - "__id__": 239 + "__id__": 247 }, { - "__id__": 241 + "__id__": 249 }, { - "__id__": 243 + "__id__": 251 } ], "_prefab": { - "__id__": 245 + "__id__": 253 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -842.1, + "y": -812.124, "z": 0 }, "_lrot": { @@ -4141,28 +4173,41 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 182 + "__id__": 184 }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 184 - }, + "_children": [ { "__id__": 186 }, { - "__id__": 188 + "__id__": 194 + }, + { + "__id__": 219 + }, + { + "__id__": 234 + } + ], + "_active": true, + "_components": [ + { + "__id__": 240 + }, + { + "__id__": 242 + }, + { + "__id__": 244 } ], "_prefab": { - "__id__": 190 + "__id__": 246 }, "_lpos": { "__type__": "cc.Vec3", - "x": -25, - "y": 44.60300000000001, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -4188,156 +4233,34 @@ }, "_id": "" }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 183 - }, - "_enabled": true, - "__prefab": { - "__id__": 185 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 988, - "height": 189 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b0Pieh8RBADZi4z8eUQz0k" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 183 - }, - "_enabled": true, - "__prefab": { - "__id__": 187 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "07804017-427b-40ee-85a0-8f908fdda683@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "192Hdt9qJNlrVHtEaJnP/D" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 183 - }, - "_enabled": true, - "__prefab": { - "__id__": 189 - }, - "_alignFlags": 40, - "_target": null, - "_left": 21, - "_right": 71, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 624.9, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "aes9usj+hKiIs///G5CUjD" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "23R4Bnq+hJ9a1QorYmGdKG", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "boxbg-001", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 182 + "__id__": 185 }, "_children": [], "_active": true, "_components": [ { - "__id__": 192 + "__id__": 187 }, { - "__id__": 194 + "__id__": 189 }, { - "__id__": 196 + "__id__": 191 } ], "_prefab": { - "__id__": 198 + "__id__": 193 }, "_lpos": { "__type__": "cc.Vec3", - "x": -186.34500000000003, - "y": 44.60300000000001, + "x": -134.712, + "y": -4.185000000000002, "z": 0 }, "_lrot": { @@ -4369,11 +4292,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 191 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", @@ -4397,11 +4320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 191 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 190 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4442,11 +4365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 191 + "__id__": 186 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 197 + "__id__": 192 }, "_alignFlags": 40, "_target": null, @@ -4491,38 +4414,38 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 182 + "__id__": 185 }, "_children": [ { - "__id__": 200 + "__id__": 195 }, { - "__id__": 206 + "__id__": 201 } ], "_active": true, "_components": [ { - "__id__": 214 + "__id__": 209 + }, + { + "__id__": 211 + }, + { + "__id__": 213 }, { "__id__": 216 - }, - { - "__id__": 218 - }, - { - "__id__": 221 } ], "_prefab": { - "__id__": 223 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", - "x": -188.09500000000003, - "y": 44.60300000000001, + "x": -125.75599999999997, + "y": 0, "z": 0 }, "_lrot": { @@ -4554,24 +4477,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 199 + "__id__": 194 }, "_children": [], "_active": false, "_components": [ { - "__id__": 201 + "__id__": 196 }, { - "__id__": 203 + "__id__": 198 } ], "_prefab": { - "__id__": 205 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", - "x": -296.35, + "x": -270.15, "y": 47, "z": 0 }, @@ -4604,15 +4527,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", - "width": 594.7, + "width": 542.3, "height": 94 }, "_anchorPoint": { @@ -4632,27 +4555,27 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 216, + "g": 204, + "b": 227, "a": 255 }, "_string": "", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 40, - "_fontSize": 40, + "_fontSize": 54, "_fontFamily": "NotoSans-Regular", "_lineHeight": 52, "_overflow": 1, @@ -4713,27 +4636,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 199 + "__id__": 194 }, "_children": [], "_active": true, "_components": [ { - "__id__": 207 + "__id__": 202 }, { - "__id__": 209 + "__id__": 204 }, { - "__id__": 211 + "__id__": 206 } ], "_prefab": { - "__id__": 213 + "__id__": 208 }, "_lpos": { "__type__": "cc.Vec3", - "x": -296.35, + "x": -270.15, "y": 47, "z": 0 }, @@ -4766,15 +4689,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", - "width": 594.7, + "width": 542.3, "height": 94 }, "_anchorPoint": { @@ -4794,11 +4717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 205 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4813,8 +4736,8 @@ "_string": "Message", "_horizontalAlign": 0, "_verticalAlign": 1, - "_actualFontSize": 35, - "_fontSize": 35, + "_actualFontSize": 54, + "_fontSize": 54, "_fontFamily": "NotoSans-Regular", "_lineHeight": 59.2, "_overflow": 1, @@ -4862,11 +4785,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 207 }, "languageKey": "chatpanel.inputplaceholder", "defaultText": "", @@ -4896,15 +4819,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 210 }, "_contentSize": { "__type__": "cc.Size", - "width": 596.7, + "width": 544.3, "height": 94 }, "_anchorPoint": { @@ -4924,11 +4847,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 194 }, "_enabled": false, "__prefab": { - "__id__": 217 + "__id__": 212 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4966,25 +4889,25 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 214 }, "editingDidBegan": [], "textChanged": [], "editingDidEnded": [], "editingReturn": [ { - "__id__": 220 + "__id__": 215 } ], "_textLabel": { - "__id__": 203 + "__id__": 198 }, "_placeholderLabel": { - "__id__": 209 + "__id__": 204 }, "_returnType": 0, "_string": "", @@ -5015,18 +4938,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 194 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 222 + "__id__": 217 }, "_alignFlags": 44, "_target": null, - "_left": 53.55499999999995, - "_right": 429.745, + "_left": 78.20499999999998, + "_right": 454.39500000000004, "_top": 0, - "_bottom": 97.60300000000001, + "_bottom": 57.185, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -5064,32 +4987,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 182 + "__id__": 185 }, "_children": [ { - "__id__": 225 + "__id__": 220 } ], "_active": true, "_components": [ { - "__id__": 231 + "__id__": 226 }, { - "__id__": 233 + "__id__": 228 }, { - "__id__": 235 + "__id__": 230 } ], "_prefab": { - "__id__": 238 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", - "x": 307.201, - "y": 45.411, + "x": 333.90200000000004, + "y": -3.3769999999999527, "z": 0 }, "_lrot": { @@ -5121,20 +5044,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 224 + "__id__": 219 }, "_children": [], "_active": true, "_components": [ { - "__id__": 226 + "__id__": 221 }, { - "__id__": 228 + "__id__": 223 } ], "_prefab": { - "__id__": 230 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -5171,11 +5094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 222 }, "_contentSize": { "__type__": "cc.Size", @@ -5199,11 +5122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 224 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5283,11 +5206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -5311,11 +5234,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 229 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5356,15 +5279,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 231 }, "clickEvents": [ { - "__id__": 237 + "__id__": 232 } ], "_interactable": true, @@ -5404,7 +5327,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 224 + "__id__": 219 }, "_id": "" }, @@ -5435,17 +5358,275 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "矩形 9", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 185 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 235 + }, + { + "__id__": 237 + } + ], + "_prefab": { + "__id__": 239 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -409.473, + "y": -4.173999999999978, + "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__": 182 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 236 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 9, + "height": 79 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d3kxYHZJNDHp9UqRJIbFzi" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 234 + }, + "_enabled": true, + "__prefab": { + "__id__": 238 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb355ce7-b670-4fc0-a7ae-19ce70a78cc3@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f6zs3Ow0xOjqAMlUJnpj+h" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7c3fUj2ERM2JdOF0jd8yEp", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 185 + }, + "_enabled": true, + "__prefab": { + "__id__": 241 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 988, + "height": 189 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b0Pieh8RBADZi4z8eUQz0k" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 185 + }, + "_enabled": true, + "__prefab": { + "__id__": 243 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "07804017-427b-40ee-85a0-8f908fdda683@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "192Hdt9qJNlrVHtEaJnP/D" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 185 + }, + "_enabled": true, + "__prefab": { + "__id__": 245 + }, + "_alignFlags": 40, + "_target": null, + "_left": 46, + "_right": 46, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 624.9, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "aes9usj+hKiIs///G5CUjD" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "23R4Bnq+hJ9a1QorYmGdKG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 184 + }, + "_enabled": true, + "__prefab": { + "__id__": 248 }, "_contentSize": { "__type__": "cc.Size", @@ -5469,11 +5650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 184 }, "_enabled": false, "__prefab": { - "__id__": 242 + "__id__": 250 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5514,18 +5695,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 252 }, "_alignFlags": 44, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": 227.9, + "_bottom": 257.876, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -5567,7 +5748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 255 }, "_contentSize": { "__type__": "cc.Size", @@ -5595,7 +5776,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 249 + "__id__": 257 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5637,7 +5818,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 259 }, "_alignFlags": 45, "_target": null, @@ -5685,41 +5866,41 @@ "__id__": 1 }, "_children": [ - { - "__id__": 254 - }, { "__id__": 262 }, { - "__id__": 291 + "__id__": 270 + }, + { + "__id__": 278 + }, + { + "__id__": 307 } ], "_active": true, "_components": [ { - "__id__": 320 + "__id__": 336 }, { - "__id__": 322 + "__id__": 338 }, { - "__id__": 324 + "__id__": 340 }, { - "__id__": 326 - }, - { - "__id__": 328 + "__id__": 342 } ], "_prefab": { - "__id__": 330 + "__id__": 344 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -486.20799999999997, + "y": -455.91200000000003, "z": 0 }, "_lrot": { @@ -5747,28 +5928,203 @@ }, { "__type__": "cc.Node", - "_name": "text", + "_name": "bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 253 + "__id__": 261 }, "_children": [], "_active": true, "_components": [ { - "__id__": 255 + "__id__": 263 }, { - "__id__": 257 + "__id__": 265 }, { - "__id__": 259 + "__id__": 267 } ], "_prefab": { + "__id__": 269 + }, + "_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__": 262 + }, + "_enabled": true, + "__prefab": { + "__id__": 264 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 442 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "acgfqS2WdJuqbvsaV7hMZ7" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 262 + }, + "_enabled": true, + "__prefab": { + "__id__": 266 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 29, + "g": 19, + "b": 38, + "a": 179 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "729ZiY6SxI1IWfbZN8TnS5" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 262 + }, + "_enabled": true, + "__prefab": { + "__id__": 268 + }, + "_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": 2, + "_originalHeight": 2, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "58dqRIALxKDpqztUp3/ehx" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "03/dwwF7VAMpIUcaiLke4D", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "text", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { "__id__": 261 }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 271 + }, + { + "__id__": 273 + }, + { + "__id__": 275 + } + ], + "_prefab": { + "__id__": 277 + }, "_lpos": { "__type__": "cc.Vec3", "x": 0, @@ -5804,11 +6160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -5832,11 +6188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 274 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5900,11 +6256,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 276 }, "languageKey": "chatpanel.paytotalk.desc", "defaultText": "", @@ -5934,41 +6290,41 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 253 + "__id__": 261 }, "_children": [ { - "__id__": 263 - }, - { - "__id__": 269 - }, - { - "__id__": 275 - } - ], - "_active": true, - "_components": [ - { - "__id__": 281 - }, - { - "__id__": 283 + "__id__": 279 }, { "__id__": 285 }, { - "__id__": 288 + "__id__": 291 + } + ], + "_active": true, + "_components": [ + { + "__id__": 297 + }, + { + "__id__": 299 + }, + { + "__id__": 301 + }, + { + "__id__": 304 } ], "_prefab": { - "__id__": 290 + "__id__": 306 }, "_lpos": { "__type__": "cc.Vec3", "x": -267.244, - "y": -101.04199999999997, + "y": -127.38700000000006, "z": 0 }, "_lrot": { @@ -6000,20 +6356,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 262 + "__id__": 278 }, "_children": [], "_active": true, "_components": [ { - "__id__": 264 + "__id__": 280 }, { - "__id__": 266 + "__id__": 282 } ], "_prefab": { - "__id__": 268 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -6050,11 +6406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 279 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 281 }, "_contentSize": { "__type__": "cc.Size", @@ -6078,11 +6434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 279 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 283 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6162,20 +6518,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 262 + "__id__": 278 }, "_children": [], "_active": true, "_components": [ { - "__id__": 270 + "__id__": 286 }, { - "__id__": 272 + "__id__": 288 } ], "_prefab": { - "__id__": 274 + "__id__": 290 }, "_lpos": { "__type__": "cc.Vec3", @@ -6212,11 +6568,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 287 }, "_contentSize": { "__type__": "cc.Size", @@ -6240,11 +6596,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 289 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6298,20 +6654,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 262 + "__id__": 278 }, "_children": [], "_active": true, "_components": [ { - "__id__": 276 + "__id__": 292 }, { - "__id__": 278 + "__id__": 294 } ], "_prefab": { - "__id__": 280 + "__id__": 296 }, "_lpos": { "__type__": "cc.Vec3", @@ -6348,11 +6704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 293 }, "_contentSize": { "__type__": "cc.Size", @@ -6376,11 +6732,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 295 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6460,11 +6816,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 298 }, "_contentSize": { "__type__": "cc.Size", @@ -6488,11 +6844,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 300 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6533,15 +6889,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 302 }, "clickEvents": [ { - "__id__": 287 + "__id__": 303 } ], "_interactable": true, @@ -6581,7 +6937,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 262 + "__id__": 278 }, "_id": "" }, @@ -6592,7 +6948,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 253 + "__id__": 261 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -6605,11 +6961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 305 }, "_alignFlags": 16, "_target": null, @@ -6654,41 +7010,41 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 253 + "__id__": 261 }, "_children": [ { - "__id__": 292 - }, - { - "__id__": 298 - }, - { - "__id__": 304 - } - ], - "_active": true, - "_components": [ - { - "__id__": 310 - }, - { - "__id__": 312 + "__id__": 308 }, { "__id__": 314 }, { - "__id__": 317 + "__id__": 320 + } + ], + "_active": true, + "_components": [ + { + "__id__": 326 + }, + { + "__id__": 328 + }, + { + "__id__": 330 + }, + { + "__id__": 333 } ], "_prefab": { - "__id__": 319 + "__id__": 335 }, "_lpos": { "__type__": "cc.Vec3", "x": 259.53, - "y": -101.04199999999997, + "y": -127.38700000000006, "z": 0 }, "_lrot": { @@ -6720,20 +7076,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 291 + "__id__": 307 }, "_children": [], "_active": true, "_components": [ { - "__id__": 293 + "__id__": 309 }, { - "__id__": 295 + "__id__": 311 } ], "_prefab": { - "__id__": 297 + "__id__": 313 }, "_lpos": { "__type__": "cc.Vec3", @@ -6770,11 +7126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 292 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 310 }, "_contentSize": { "__type__": "cc.Size", @@ -6798,11 +7154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 292 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 312 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6878,24 +7234,160 @@ }, { "__type__": "cc.Node", - "_name": "Label-001", + "_name": "Sprite", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 291 + "__id__": 307 }, "_children": [], "_active": true, "_components": [ { - "__id__": 299 + "__id__": 315 }, { - "__id__": 301 + "__id__": 317 } ], "_prefab": { - "__id__": 303 + "__id__": 319 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -74.56999999999996, + "y": 103.709, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.8, + "y": 0.8, + "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__": 314 + }, + "_enabled": true, + "__prefab": { + "__id__": 316 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 102, + "height": 89 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fdhA7RymJLSpc3kTZYzZek" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 314 + }, + "_enabled": true, + "__prefab": { + "__id__": 318 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "e72d6e10-73bf-44e8-82d5-da3a20f908b2@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": "1asokAgYNHGJrlwFkQwJBy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fcqeucCpRN+q3T9M1otU/A", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 307 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 321 + }, + { + "__id__": 323 + } + ], + "_prefab": { + "__id__": 325 }, "_lpos": { "__type__": "cc.Vec3", @@ -6932,11 +7424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 322 }, "_contentSize": { "__type__": "cc.Size", @@ -6960,11 +7452,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 324 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7038,153 +7530,17 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "Sprite", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 291 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 305 - }, - { - "__id__": 307 - } - ], - "_prefab": { - "__id__": 309 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -74.56999999999996, - "y": 103.709, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, - "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__": 304 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 306 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 102, - "height": 89 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "fdhA7RymJLSpc3kTZYzZek" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 304 - }, - "_enabled": true, - "__prefab": { - "__id__": 308 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "e72d6e10-73bf-44e8-82d5-da3a20f908b2@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": "1asokAgYNHGJrlwFkQwJBy" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "fcqeucCpRN+q3T9M1otU/A", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 291 - }, - "_enabled": true, - "__prefab": { - "__id__": 311 + "__id__": 327 }, "_contentSize": { "__type__": "cc.Size", @@ -7208,11 +7564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 329 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7253,15 +7609,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 331 }, "clickEvents": [ { - "__id__": 316 + "__id__": 332 } ], "_interactable": true, @@ -7301,7 +7657,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 291 + "__id__": 307 }, "_id": "" }, @@ -7312,7 +7668,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 253 + "__id__": 261 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -7325,11 +7681,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 334 }, "_alignFlags": 16, "_target": null, @@ -7374,16 +7730,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 415 + "height": 442 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7396,62 +7752,17 @@ "__type__": "cc.CompPrefabInfo", "fileId": "5ekIVCGqJG/rg3PHBhzmRt" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 253 - }, - "_enabled": true, - "__prefab": { - "__id__": 323 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "8de6a058-06ab-4713-a448-e7935a56ed28@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "84R6K1OMxKlKqb5gYEaEVs" - }, { "__type__": "cc.Widget", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 339 }, "_alignFlags": 40, "_target": null, @@ -7483,23 +7794,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 341 }, "timeLabel": { - "__id__": 266 + "__id__": 282 }, "timeBtnLabel": { - "__id__": 278 + "__id__": 294 }, "vipLabel": { - "__id__": 295 + "__id__": 311 }, "vipBtnLabel": { - "__id__": 301 + "__id__": 323 }, "_id": "" }, @@ -7513,11 +7824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 343 }, "_opacity": 255, "_id": "" @@ -7549,20 +7860,20 @@ }, "_children": [ { - "__id__": 332 + "__id__": 346 } ], "_active": true, "_components": [ { - "__id__": 356 + "__id__": 370 }, { - "__id__": 358 + "__id__": 372 } ], "_prefab": { - "__id__": 360 + "__id__": 374 }, "_lpos": { "__type__": "cc.Vec3", @@ -7599,24 +7910,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 331 + "__id__": 345 }, "_children": [ { - "__id__": 333 + "__id__": 347 } ], "_active": true, "_components": [ { - "__id__": 351 + "__id__": 365 }, { - "__id__": 353 + "__id__": 367 } ], "_prefab": { - "__id__": 355 + "__id__": 369 }, "_lpos": { "__type__": "cc.Vec3", @@ -7653,27 +7964,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 332 + "__id__": 346 }, "_children": [ { - "__id__": 334 + "__id__": 348 } ], "_active": true, "_components": [ { - "__id__": 344 + "__id__": 358 }, { - "__id__": 346 + "__id__": 360 }, { - "__id__": 348 + "__id__": 362 } ], "_prefab": { - "__id__": 350 + "__id__": 364 }, "_lpos": { "__type__": "cc.Vec3", @@ -7710,26 +8021,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 333 + "__id__": 347 }, "_children": [], "_active": true, "_components": [ { - "__id__": 335 + "__id__": 349 }, { - "__id__": 337 + "__id__": 351 }, { - "__id__": 339 + "__id__": 353 }, { - "__id__": 341 + "__id__": 355 } ], "_prefab": { - "__id__": 343 + "__id__": 357 }, "_lpos": { "__type__": "cc.Vec3", @@ -7766,11 +8077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 350 }, "_contentSize": { "__type__": "cc.Size", @@ -7794,11 +8105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 352 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7836,11 +8147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 354 }, "_alignFlags": 12, "_target": null, @@ -7872,11 +8183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 356 }, "clickEvents": [], "_interactable": true, @@ -7941,11 +8252,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 359 }, "_contentSize": { "__type__": "cc.Size", @@ -7969,11 +8280,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 361 }, "_type": 3, "_inverted": false, @@ -7991,11 +8302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 363 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8049,11 +8360,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 366 }, "_contentSize": { "__type__": "cc.Size", @@ -8077,11 +8388,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 368 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8135,11 +8446,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 371 }, "_contentSize": { "__type__": "cc.Size", @@ -8163,14 +8474,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 373 }, "image": { - "__id__": 337 + "__id__": 351 }, "_id": "" }, @@ -8201,7 +8512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 376 }, "_contentSize": { "__type__": "cc.Size", @@ -8229,7 +8540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 378 }, "_alignFlags": 45, "_target": null, @@ -8265,26 +8576,26 @@ }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 380 }, "m_rootNode": null, "payToTalkPanel": { - "__id__": 326 + "__id__": 340 }, "editBox": { - "__id__": 218 + "__id__": 213 }, "girlName": { - "__id__": 44 + "__id__": 46 }, "videoArea": { - "__id__": 177 + "__id__": 179 }, "layout": { - "__id__": 69 + "__id__": 71 }, "popUpImage": { - "__id__": 358 + "__id__": 372 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index 26a2203e..c51119ea 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -372,7 +372,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d5aa44e9-a6e4-4570-bfba-238a902ca222@f9941", + "__uuid__": "1f2275dc-ceb1-4b48-a4ae-f63f7abb1095@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -4241,7 +4241,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -4267,6 +4267,8 @@ "__id__": 0 }, "fileId": "eaXcMsu9NIZbMyNhSIVgD3", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/ui/chat/chatAtlas.pac b/assets/resources/ui/chat/chatAtlas.pac new file mode 100644 index 00000000..39b3c029 --- /dev/null +++ b/assets/resources/ui/chat/chatAtlas.pac @@ -0,0 +1,3 @@ +{ + "__type__": "cc.SpriteAtlas" +} diff --git a/assets/resources/ui/chat/chatAtlas.pac.meta b/assets/resources/ui/chat/chatAtlas.pac.meta new file mode 100644 index 00000000..02b6f4f6 --- /dev/null +++ b/assets/resources/ui/chat/chatAtlas.pac.meta @@ -0,0 +1,36 @@ +{ + "ver": "1.0.8", + "importer": "auto-atlas", + "imported": true, + "uuid": "3d9a361a-18c3-4aaa-9f33-6ad0d21435bf", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "maxWidth": 1024, + "maxHeight": 1024, + "padding": 2, + "allowRotation": true, + "forceSquared": false, + "powerOfTwo": false, + "algorithm": "MaxRects", + "format": "png", + "quality": 80, + "contourBleed": true, + "paddingBleed": true, + "filterUnused": true, + "removeTextureInBundle": true, + "removeImageInBundle": true, + "removeSpriteAtlasInBundle": true, + "compressSettings": {}, + "textureSetting": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + } + } +} diff --git a/assets/resources/ui/chat/矩形 11 拷贝.png b/assets/resources/ui/chat/矩形 11 拷贝.png new file mode 100644 index 00000000..521265f6 Binary files /dev/null and b/assets/resources/ui/chat/矩形 11 拷贝.png differ diff --git a/assets/resources/ui/girl_detail/遮罩.png.meta b/assets/resources/ui/chat/矩形 11 拷贝.png.meta similarity index 77% rename from assets/resources/ui/girl_detail/遮罩.png.meta rename to assets/resources/ui/chat/矩形 11 拷贝.png.meta index 33e8b1fc..6117b4f5 100644 --- a/assets/resources/ui/girl_detail/遮罩.png.meta +++ b/assets/resources/ui/chat/矩形 11 拷贝.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "d5aa44e9-a6e4-4570-bfba-238a902ca222", + "uuid": "760237d1-46b3-4c02-8e0b-849a95e36873", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "d5aa44e9-a6e4-4570-bfba-238a902ca222@6c48a", - "displayName": "遮罩", + "uuid": "760237d1-46b3-4c02-8e0b-849a95e36873@6c48a", + "displayName": "矩形 11 拷贝", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "d5aa44e9-a6e4-4570-bfba-238a902ca222", + "imageUuidOrDatabaseUri": "760237d1-46b3-4c02-8e0b-849a95e36873", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "d5aa44e9-a6e4-4570-bfba-238a902ca222@f9941", - "displayName": "遮罩", + "uuid": "760237d1-46b3-4c02-8e0b-849a95e36873@f9941", + "displayName": "矩形 11 拷贝", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1080, + "width": 10, "height": 307, - "rawWidth": 1080, + "rawWidth": 10, "rawHeight": 307, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -540, + -5, -153.5, 0, - 540, + 5, -153.5, 0, - -540, + -5, 153.5, 0, - 540, + 5, 153.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 307, - 1080, + 10, 307, 0, 0, - 1080, + 10, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -540, + -5, -153.5, 0 ], "maxPos": [ - 540, + 5, 153.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "d5aa44e9-a6e4-4570-bfba-238a902ca222@6c48a", + "imageUuidOrDatabaseUri": "760237d1-46b3-4c02-8e0b-849a95e36873@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "d5aa44e9-a6e4-4570-bfba-238a902ca222@6c48a" + "redirect": "760237d1-46b3-4c02-8e0b-849a95e36873@6c48a" } } diff --git a/assets/resources/ui/chat/矩形 14.png b/assets/resources/ui/chat/矩形 14.png deleted file mode 100644 index 76e5feb7..00000000 Binary files a/assets/resources/ui/chat/矩形 14.png and /dev/null differ diff --git a/assets/resources/ui/chat/矩形 14.png.meta b/assets/resources/ui/chat/矩形 14.png.meta deleted file mode 100644 index 8ad6063e..00000000 --- a/assets/resources/ui/chat/矩形 14.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "8de6a058-06ab-4713-a448-e7935a56ed28", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "8de6a058-06ab-4713-a448-e7935a56ed28@6c48a", - "displayName": "矩形 14", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "8de6a058-06ab-4713-a448-e7935a56ed28", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "8de6a058-06ab-4713-a448-e7935a56ed28@f9941", - "displayName": "矩形 14", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1080, - "height": 281, - "rawWidth": 1080, - "rawHeight": 281, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -540, - -140.5, - 0, - 540, - -140.5, - 0, - -540, - 140.5, - 0, - 540, - 140.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 281, - 1080, - 281, - 0, - 0, - 1080, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -540, - -140.5, - 0 - ], - "maxPos": [ - 540, - 140.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "8de6a058-06ab-4713-a448-e7935a56ed28@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "8de6a058-06ab-4713-a448-e7935a56ed28@6c48a" - } -} diff --git a/assets/resources/ui/chat/组 3 拷贝.png b/assets/resources/ui/chat/组 3 拷贝.png index 16292c42..e006cb09 100644 Binary files a/assets/resources/ui/chat/组 3 拷贝.png and b/assets/resources/ui/chat/组 3 拷贝.png differ diff --git a/assets/resources/ui/chat/组 3 拷贝.png.meta b/assets/resources/ui/chat/组 3 拷贝.png.meta index f420fc6a..143a0206 100644 --- a/assets/resources/ui/chat/组 3 拷贝.png.meta +++ b/assets/resources/ui/chat/组 3 拷贝.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1080, - "height": 150, - "rawWidth": 1080, - "rawHeight": 150, + "width": 512, + "height": 71, + "rawWidth": 512, + "rawHeight": 71, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -540, - -75, + -256, + -35.5, 0, - 540, - -75, + 256, + -35.5, 0, - -540, - 75, + -256, + 35.5, 0, - 540, - 75, + 256, + 35.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 150, - 1080, - 150, + 71, + 512, + 71, 0, 0, - 1080, + 512, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -540, - -75, + -256, + -35.5, 0 ], "maxPos": [ - 540, - 75, + 256, + 35.5, 0 ] }, diff --git a/assets/resources/ui/girl_detail/girl_detail_atlas.pac b/assets/resources/ui/girl_detail/girl_detail_atlas.pac new file mode 100644 index 00000000..39b3c029 --- /dev/null +++ b/assets/resources/ui/girl_detail/girl_detail_atlas.pac @@ -0,0 +1,3 @@ +{ + "__type__": "cc.SpriteAtlas" +} diff --git a/assets/resources/ui/girl_detail/girl_detail_atlas.pac.meta b/assets/resources/ui/girl_detail/girl_detail_atlas.pac.meta new file mode 100644 index 00000000..fc77ae34 --- /dev/null +++ b/assets/resources/ui/girl_detail/girl_detail_atlas.pac.meta @@ -0,0 +1,36 @@ +{ + "ver": "1.0.8", + "importer": "auto-atlas", + "imported": true, + "uuid": "31c01aab-820a-4aa2-b0bc-bb9e1081b7e2", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "maxWidth": 1024, + "maxHeight": 1024, + "padding": 2, + "allowRotation": true, + "forceSquared": false, + "powerOfTwo": false, + "algorithm": "MaxRects", + "format": "png", + "quality": 80, + "contourBleed": true, + "paddingBleed": true, + "filterUnused": true, + "removeTextureInBundle": true, + "removeImageInBundle": true, + "removeSpriteAtlasInBundle": true, + "compressSettings": {}, + "textureSetting": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + } + } +} diff --git a/assets/resources/ui/girl_detail/ref1.png b/assets/resources/ui/girl_detail/ref1.png deleted file mode 100644 index 489bbbeb..00000000 Binary files a/assets/resources/ui/girl_detail/ref1.png and /dev/null differ diff --git a/assets/resources/ui/girl_detail/ref1.png.meta b/assets/resources/ui/girl_detail/ref1.png.meta deleted file mode 100644 index b092c622..00000000 --- a/assets/resources/ui/girl_detail/ref1.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "5cc7e853-548e-44d6-819e-725fcfca8da2", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "5cc7e853-548e-44d6-819e-725fcfca8da2@6c48a", - "displayName": "ref1", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "5cc7e853-548e-44d6-819e-725fcfca8da2", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "5cc7e853-548e-44d6-819e-725fcfca8da2@f9941", - "displayName": "ref1", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 341, - "height": 438, - "rawWidth": 341, - "rawHeight": 438, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -170.5, - -219, - 0, - 170.5, - -219, - 0, - -170.5, - 219, - 0, - 170.5, - 219, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 438, - 341, - 438, - 0, - 0, - 341, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -170.5, - -219, - 0 - ], - "maxPos": [ - 170.5, - 219, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "5cc7e853-548e-44d6-819e-725fcfca8da2@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "5cc7e853-548e-44d6-819e-725fcfca8da2@6c48a" - } -} diff --git a/assets/resources/ui/girl_detail/ref2.png b/assets/resources/ui/girl_detail/ref2.png deleted file mode 100644 index 3a9c2354..00000000 Binary files a/assets/resources/ui/girl_detail/ref2.png and /dev/null differ diff --git a/assets/resources/ui/girl_detail/ref2.png.meta b/assets/resources/ui/girl_detail/ref2.png.meta deleted file mode 100644 index fdc0e87f..00000000 --- a/assets/resources/ui/girl_detail/ref2.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "479c1e8c-f1a9-48a7-9f85-1a27b25f0a5a", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "479c1e8c-f1a9-48a7-9f85-1a27b25f0a5a@6c48a", - "displayName": "ref2", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "479c1e8c-f1a9-48a7-9f85-1a27b25f0a5a", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "479c1e8c-f1a9-48a7-9f85-1a27b25f0a5a@f9941", - "displayName": "ref2", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1080, - "height": 1391, - "rawWidth": 1080, - "rawHeight": 1391, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -540, - -695.5, - 0, - 540, - -695.5, - 0, - -540, - 695.5, - 0, - 540, - 695.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 1391, - 1080, - 1391, - 0, - 0, - 1080, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -540, - -695.5, - 0 - ], - "maxPos": [ - 540, - 695.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "479c1e8c-f1a9-48a7-9f85-1a27b25f0a5a@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "479c1e8c-f1a9-48a7-9f85-1a27b25f0a5a@6c48a" - } -} diff --git a/assets/resources/ui/girl_detail/ref3.png b/assets/resources/ui/girl_detail/ref3.png deleted file mode 100644 index 39afc90b..00000000 Binary files a/assets/resources/ui/girl_detail/ref3.png and /dev/null differ diff --git a/assets/resources/ui/girl_detail/ref3.png.meta b/assets/resources/ui/girl_detail/ref3.png.meta deleted file mode 100644 index 9c32e0b0..00000000 --- a/assets/resources/ui/girl_detail/ref3.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "b1d17801-99e3-41ad-962e-f8fd4b14bc27", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "b1d17801-99e3-41ad-962e-f8fd4b14bc27@6c48a", - "displayName": "ref3", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "b1d17801-99e3-41ad-962e-f8fd4b14bc27", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "b1d17801-99e3-41ad-962e-f8fd4b14bc27@f9941", - "displayName": "ref3", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 341, - "height": 439, - "rawWidth": 341, - "rawHeight": 439, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -170.5, - -219.5, - 0, - 170.5, - -219.5, - 0, - -170.5, - 219.5, - 0, - 170.5, - 219.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 439, - 341, - 439, - 0, - 0, - 341, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -170.5, - -219.5, - 0 - ], - "maxPos": [ - 170.5, - 219.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "b1d17801-99e3-41ad-962e-f8fd4b14bc27@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "b1d17801-99e3-41ad-962e-f8fd4b14bc27@6c48a" - } -} diff --git a/assets/resources/ui/girl_detail/矩形 11 拷贝.png b/assets/resources/ui/girl_detail/矩形 11 拷贝.png index 13ea22fd..521265f6 100644 Binary files a/assets/resources/ui/girl_detail/矩形 11 拷贝.png and b/assets/resources/ui/girl_detail/矩形 11 拷贝.png differ diff --git a/assets/resources/ui/girl_detail/矩形 11 拷贝.png.meta b/assets/resources/ui/girl_detail/矩形 11 拷贝.png.meta index 0a0943a9..015bd904 100644 --- a/assets/resources/ui/girl_detail/矩形 11 拷贝.png.meta +++ b/assets/resources/ui/girl_detail/矩形 11 拷贝.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1080, + "width": 10, "height": 307, - "rawWidth": 1080, + "rawWidth": 10, "rawHeight": 307, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -540, + -5, -153.5, 0, - 540, + 5, -153.5, 0, - -540, + -5, 153.5, 0, - 540, + 5, 153.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 307, - 1080, + 10, 307, 0, 0, - 1080, + 10, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -540, + -5, -153.5, 0 ], "maxPos": [ - 540, + 5, 153.5, 0 ] diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png index 656b4e32..81ccc2e5 100644 Binary files a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png and b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png differ diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta index ccc16c85..c4d21036 100644 --- a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta +++ b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1029, - "height": 114, - "rawWidth": 1029, - "rawHeight": 114, + "width": 800, + "height": 88, + "rawWidth": 800, + "rawHeight": 88, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -514.5, - -57, + -400, + -44, 0, - 514.5, - -57, + 400, + -44, 0, - -514.5, - 57, + -400, + 44, 0, - 514.5, - 57, + 400, + 44, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 114, - 1029, - 114, + 88, + 800, + 88, 0, 0, - 1029, + 800, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -514.5, - -57, + -400, + -44, 0 ], "maxPos": [ - 514.5, - 57, + 400, + 44, 0 ] }, diff --git a/assets/resources/ui/girl_detail/遮罩.png b/assets/resources/ui/girl_detail/遮罩.png deleted file mode 100644 index 13ea22fd..00000000 Binary files a/assets/resources/ui/girl_detail/遮罩.png and /dev/null differ diff --git a/web-view_project/app.js b/web-view_project/app.js new file mode 100644 index 00000000..b3b9dc05 --- /dev/null +++ b/web-view_project/app.js @@ -0,0 +1,34 @@ + +//app.js +App({ + onLaunch: function () { + // show localstorage + let logs = wx.getStorageSync('logs') || [] + logs.unshift(Date.now()) + wx.setStorageSync('logs', logs) + + // login + wx.login({ + success: res => { + // get custom login info res + } + }) + // get user settings + wx.getSetting({ + success: res => { + if (res.authSetting['scope.userInfo']) { + // Already authorized, you can directly call getUserInfo to get the avatar nickname without popping up + wx.getUserInfo({ + success: res => { + // get custom user info res + this.globalData.userInfo = res.userInfo; + } + }) + } + } + }) + }, + globalData: { + userInfo: null + } +}) \ No newline at end of file diff --git a/web-view_project/app.json b/web-view_project/app.json new file mode 100644 index 00000000..96e5d48d --- /dev/null +++ b/web-view_project/app.json @@ -0,0 +1,13 @@ +{ + "pages": [ + "pages/index/index", + "pages/logs/logs" + ], + "style": "v2", + "window": { + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#fff", + "navigationBarTitleText": "TCSAS Mini Program", + "navigationBarTextStyle": "black" + } +} \ No newline at end of file diff --git a/web-view_project/app.wxss b/web-view_project/app.wxss new file mode 100644 index 00000000..28a4e613 --- /dev/null +++ b/web-view_project/app.wxss @@ -0,0 +1,9 @@ +.container { + height: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + padding: 200rpx 0; + box-sizing: border-box; + } \ No newline at end of file diff --git a/web-view_project/pages/index/index.js b/web-view_project/pages/index/index.js new file mode 100644 index 00000000..59ca6b10 --- /dev/null +++ b/web-view_project/pages/index/index.js @@ -0,0 +1,53 @@ +//index.js +//get application instance +const { defaultIcon } = require('../../utils/icon'); +const app = getApp() + + +Page({ + data: { + motto: 'Hello World', + userInfo: {}, + hasUserInfo: false, + canIUse: wx.canIUse('button.open-type.getUserInfo') + }, + // event handler function + bindViewTap: function () { + wx.navigateTo({ + url: '../logs/logs' + }) + }, + onLoad: function () { + if (app.globalData.userInfo) { + this.setData({ + userInfo: app.globalData.userInfo, + hasUserInfo: true + }) + } else if (this.data.canIUse) { + // do someting + } else { + // There is no compatibility processing for open-type=getUserInfo version + wx.getUserInfo({ + success: res => { + app.globalData.userInfo = res.userInfo + this.setData({ + userInfo: res.userInfo, + hasUserInfo: true + }) + } + }) + } + }, + getUserInfo: function (e) { + console.log('getUserInfo ----> ', e); + app.globalData.userInfo = e.detail.userInfo || ""; + const userInfo = e.detail.userInfo || { + avatarUrl: defaultIcon, + nickName: 'userNickName' + } + this.setData({ + userInfo: userInfo, + hasUserInfo: true + }) + } +}) diff --git a/web-view_project/pages/index/index.json b/web-view_project/pages/index/index.json new file mode 100644 index 00000000..8835af06 --- /dev/null +++ b/web-view_project/pages/index/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/web-view_project/pages/index/index.wxml b/web-view_project/pages/index/index.wxml new file mode 100644 index 00000000..672d03cb --- /dev/null +++ b/web-view_project/pages/index/index.wxml @@ -0,0 +1 @@ + diff --git a/web-view_project/pages/index/index.wxss b/web-view_project/pages/index/index.wxss new file mode 100644 index 00000000..05d6924f --- /dev/null +++ b/web-view_project/pages/index/index.wxss @@ -0,0 +1,20 @@ +.userinfo { + display: flex; + flex-direction: column; + align-items: center; +} + +.userinfo-avatar { + width: 128rpx; + height: 128rpx; + margin: 20rpx; + border-radius: 50%; +} + +.userinfo-nickname { + color: #aaa; +} + +.usermotto { + margin-top: 200px; +} \ No newline at end of file diff --git a/web-view_project/pages/logs/logs.js b/web-view_project/pages/logs/logs.js new file mode 100644 index 00000000..b2b967d8 --- /dev/null +++ b/web-view_project/pages/logs/logs.js @@ -0,0 +1,15 @@ +//logs.js +const util = require('../../utils/util.js') + +Page({ + data: { + logs: [] + }, + onLoad: function () { + this.setData({ + logs: (wx.getStorageSync('logs') || []).map(log => { + return util.formatTime(new Date(log)) + }) + }) + } +}) diff --git a/web-view_project/pages/logs/logs.json b/web-view_project/pages/logs/logs.json new file mode 100644 index 00000000..93196209 --- /dev/null +++ b/web-view_project/pages/logs/logs.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "Logs", + "usingComponents": {} +} \ No newline at end of file diff --git a/web-view_project/pages/logs/logs.wxml b/web-view_project/pages/logs/logs.wxml new file mode 100644 index 00000000..bf46409e --- /dev/null +++ b/web-view_project/pages/logs/logs.wxml @@ -0,0 +1,5 @@ + + + {{index + 1}}. {{log}} + + diff --git a/web-view_project/pages/logs/logs.wxss b/web-view_project/pages/logs/logs.wxss new file mode 100644 index 00000000..a4eeb41d --- /dev/null +++ b/web-view_project/pages/logs/logs.wxss @@ -0,0 +1,9 @@ +.log-list { + display: flex; + flex-direction: column; + padding: 40rpx; + } + .log-item { + margin: 10rpx; + } + \ No newline at end of file diff --git a/web-view_project/project.config.json b/web-view_project/project.config.json new file mode 100644 index 00000000..a9748a73 --- /dev/null +++ b/web-view_project/project.config.json @@ -0,0 +1,47 @@ +{ + "projectid": "mp0ygqvghc940ppb_AIphrodite", + "setting": { + "urlCheck": true, + "es6": true, + "postcss": true, + "minified": true, + "newFeature": true, + "autoAudits": false, + "nodeModules": true, + "uploadWithSourceMap": true, + "uglifyFileName": true, + "remoteDebugLogEnable": true, + "prefetch": false + }, + "LuffaToolsLibVersion": "2.2.13", + "compileType": "miniprogram", + "createTime": 1758263984023, + "accessTime": 1758263984023, + "packOptions": { + "ignore": [] + }, + "debugOptions": { + "hidedInDevtools": [] + }, + "LuffaToolsappid": "mp0ygqvghc940ppb", + "projectname": "AIphrodite", + "scripts": {}, + "condition": { + "search": { + "current": -1, + "list": [] + }, + "conversation": { + "current": -1, + "list": [] + }, + "game": { + "currentL": -1, + "list": [] + }, + "miniprogram": { + "current": -1, + "list": [] + } + } +} \ No newline at end of file diff --git a/web-view_project/utils/icon.js b/web-view_project/utils/icon.js new file mode 100644 index 00000000..abb8ada5 --- /dev/null +++ b/web-view_project/utils/icon.js @@ -0,0 +1,5 @@ +const defaultIcon = 'data:image/png;base64,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' + +module.exports = { + defaultIcon +} \ No newline at end of file diff --git a/web-view_project/utils/util.js b/web-view_project/utils/util.js new file mode 100644 index 00000000..dbadbb81 --- /dev/null +++ b/web-view_project/utils/util.js @@ -0,0 +1,19 @@ +const formatTime = date => { + const year = date.getFullYear() + const month = date.getMonth() + 1 + const day = date.getDate() + const hour = date.getHours() + const minute = date.getMinutes() + const second = date.getSeconds() + + return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':') +} + +const formatNumber = n => { + n = n.toString() + return n[1] ? n : '0' + n +} + +module.exports = { + formatTime: formatTime +} diff --git a/xchat_cfg b/xchat_cfg index 978581d3..0bb51554 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 978581d398513b2db750b57fa1a5116d147f5da5 +Subproject commit 0bb515545a5ad5647921749f46aaebd010134f30