From e8ff82a4754910fc4bf969666a235b76143f0a42 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Tue, 9 Sep 2025 22:05:26 +0800 Subject: [PATCH] fix --- assets/Scripts/Main/Manager/ViewManager.ts | 451 ++++++----- assets/Scripts/chat18x/data/GirlData.ts | 6 +- assets/Scripts/chat18x/data/GirlDetailData.ts | 2 +- .../Scripts/chat18x/uiitems/GirlListItem.ts | 2 +- .../bundles/Chat18x/GirlListPopupPanel.prefab | 732 +++++++++++++----- proto_cs | 2 +- 6 files changed, 822 insertions(+), 373 deletions(-) diff --git a/assets/Scripts/Main/Manager/ViewManager.ts b/assets/Scripts/Main/Manager/ViewManager.ts index 60774479..026bfd91 100644 --- a/assets/Scripts/Main/Manager/ViewManager.ts +++ b/assets/Scripts/Main/Manager/ViewManager.ts @@ -1,4 +1,17 @@ -import { _decorator, Node, Camera, Component, director, game, instantiate, Prefab, RenderTexture, view, resources, macro } from "cc"; +import { + _decorator, + Node, + Camera, + Component, + director, + game, + instantiate, + Prefab, + RenderTexture, + view, + resources, + macro, +} from "cc"; import Utils from "../Common/Utils"; import GameRootUI from "../Common/GameRootUI"; import ResManager from "./ResManager"; @@ -6,204 +19,276 @@ import { CommonConfig } from "../Config/CommonConfig"; const { ccclass, property } = _decorator; -@ccclass('ViewManager') +@ccclass("ViewManager") export class ViewManager extends Component { - private static _I: ViewManager = null; - public static get I(): ViewManager { - if (!ViewManager._I) { - ViewManager._I = new ViewManager(); + private static _I: ViewManager = null; + public static get I(): ViewManager { + if (!ViewManager._I) { + ViewManager._I = new ViewManager(); + } + return ViewManager._I; + } + + private m_viewList = []; + private m_viewListData = {}; + + start() {} + + update(deltaTime: number) {} + + private openIdx = 0; + private openViewByPrefab( + err, + i_prefab: Prefab | Node, + i_openInfo, + callBack = null, + path, + type: string = "" + ) { + if (err) { + Utils.Log("打开界面时加载资源出错:" + err, path); + return; + } + let t_node: any = instantiate(i_prefab); + if (!t_node.isValid) return; + + //界面已打开 + for (let i = this.m_viewList.length - 1; i >= 0; i--) { + let t_view: Node = this.m_viewList[i]; + if (t_view) { + if (t_view.isValid && t_node.name == t_view.name) { + t_node.setSiblingIndex(999); + Utils.Log("已经打开的相同的界面：" + t_node.name); + return; } - return ViewManager._I; + } } - private m_viewList = []; - private m_viewListData = {}; - - start() { - + //截屏纹理 + if (i_openInfo && i_openInfo.blueBg === true) { + i_openInfo.screenShotTex = this.getScreenShot(); } - update(deltaTime: number) { - + let viewSP = t_node.getComponent(t_node.name); + if (!viewSP) { + for (let index = 0; index < t_node["_components"].length; index++) { + const element = t_node["_components"][index]; + if (element.isScriptComponent) { + viewSP = element; + break; + } + } } + this.m_viewList.push(t_node); + this.m_viewListData[t_node.name] = { + path: path, + data: i_openInfo, + sort: this.openIdx++, + name: t_node.name, + uuid: t_node["_prefab"]["asset"]["_uuid"], + }; + viewSP && viewSP.openUIData && viewSP.openUIData(i_openInfo); + callBack && callBack(t_node, i_openInfo); + if (type == "") { + GameRootUI.I.AddUIToLayer( + t_node, + CommonConfig.UILayerGroup.Layer_ui1, + this.m_viewList.length + ); + } else if (type == "top") { + // t_node.sType = "top" + GameRootUI.I.AddUIToLayer(t_node, CommonConfig.UILayerGroup.Layer_top); + } else if (type == "tips") { + GameRootUI.I.AddUIToLayer(t_node, CommonConfig.UILayerGroup.Layer_tips); + } + } - private openIdx = 0; - private openViewByPrefab(err, i_prefab: Prefab | Node, i_openInfo, callBack = null, path, type: string = '') { - if (err) { - Utils.Log('打开界面时加载资源出错:' + err, path); - return; - } - let t_node:any = instantiate(i_prefab); - if (!t_node.isValid) return; + //检查是否有相同的View + private checkSameView(i_node: Node, path) { + // let t_com = i_node.getComponent('li_BaseView'); + // if (t_com) { + // if (t_com.name == 'li_BaseView') return true; + // for (let i = this.m_viewList.length - 1; i >= 0; i--) { + // let t_view: Node = this.m_viewList[i]; + // if (t_view) { + // if (t_view.isValid && t_com.node.name == t_view.name) { + // i_node.setSiblingIndex(999) + // return false; + // } + // } + // } + // i_node['path'] = path; + // this.m_viewList.push(i_node); + // return true; + // } - //界面已打开 - for (let i = this.m_viewList.length - 1; i >= 0; i--) { - let t_view: Node = this.m_viewList[i]; - if (t_view) { - if (t_view.isValid && t_node.name == t_view.name) { - t_node.setSiblingIndex(999) - Utils.Log('已经打开的相同的界面：' + t_node.name); - return; - } - } - } + return false; + } - //截屏纹理 - if (i_openInfo && i_openInfo.blueBg===true){ - i_openInfo.screenShotTex = this.getScreenShot() - } + //获取截屏纹理 + private getScreenShot(): RenderTexture { + // let texture = new RenderTexture(); + // let winSize = view.getViewportRect() + // let winSize1 = view.getVisibleSize() + // texture.reset({ + // width: winSize.width, + // height: winSize.height, + // }); - let viewSP = t_node.getComponent(t_node.name); - if (!viewSP) { - for (let index = 0; index < t_node['_components'].length; index++) { - const element = t_node['_components'][index]; - if (element.isScriptComponent) { - viewSP = element; - break; - } - } - } - - this.m_viewList.push(t_node); - this.m_viewListData[t_node.name] = { path: path, data: i_openInfo, sort: this.openIdx++, name: t_node.name, uuid: t_node["_prefab"]['asset']['_uuid'] }; - viewSP && viewSP.openUIData && viewSP.openUIData(i_openInfo); - callBack && callBack(t_node, i_openInfo); - if (type == '') { - GameRootUI.I.AddUIToLayer(t_node, CommonConfig.UILayerGroup.Layer_ui1, this.m_viewList.length) - } else if (type == 'top') { - // t_node.sType = "top" - GameRootUI.I.AddUIToLayer(t_node, CommonConfig.UILayerGroup.Layer_top) - } else if (type == 'tips') { - GameRootUI.I.AddUIToLayer(t_node, CommonConfig.UILayerGroup.Layer_tips) - } + // let camera = director.getScene().getComponentInChildren(Camera); + // let oldTargetTexture = camera.targetTexture + // camera.targetTexture = texture; + // camera.render(); + // camera.targetTexture = oldTargetTexture + // return texture + return null; + } + + private getViewIndex(i_view: Node) { + for (let i = this.m_viewList.length - 1; i >= 0; i--) { + let t_view = this.m_viewList[i]; + if (t_view == i_view) { + return i; + } } - //检查是否有相同的View - private checkSameView(i_node: Node, path){ - // let t_com = i_node.getComponent('li_BaseView'); - // if (t_com) { - // if (t_com.name == 'li_BaseView') return true; - // for (let i = this.m_viewList.length - 1; i >= 0; i--) { - // let t_view: Node = this.m_viewList[i]; - // if (t_view) { - // if (t_view.isValid && t_com.node.name == t_view.name) { - // i_node.setSiblingIndex(999) - // return false; - // } - // } - // } - // i_node['path'] = path; - // this.m_viewList.push(i_node); - // return true; - // } + return -1; + } - return false; + /**打开resources窗体 */ + openMainView( + i_prefab: string | Prefab, + i_openData?, + callBack = null, + type: string = "" + ) { + if (i_prefab instanceof Prefab) { + this.openViewByPrefab( + null, + i_prefab, + i_openData, + callBack, + i_prefab, + type + ); + } else { + resources.load(i_prefab, (err, $prefab: Prefab) => { + this.openViewByPrefab( + err, + $prefab, + i_openData, + callBack, + i_prefab, + type + ); + }); + } + } + /**打开bundle窗体 */ + openBundlesView( + i_prefab: string | Prefab, + i_openData?, + callBack = null, + type: string = "" + ) { + if (i_prefab instanceof Prefab) { + this.openViewByPrefab( + null, + i_prefab, + i_openData, + callBack, + i_prefab, + type + ); + } else { + console.log("打开界面：", i_prefab); + ResManager.I.getPrefab( + i_prefab, + (pb: Node) => { + this.openViewByPrefab(null, pb, i_openData, callBack, i_prefab, type); + }, + null + ); + } + } + /**打开bundle弹窗 */ + openBundlesPopupView( + i_prefab: string | Prefab, + i_openData?, + callBack = null + ) { + if (i_prefab instanceof Prefab) { + this.openViewByPrefab( + null, + i_prefab, + i_openData, + callBack, + i_prefab, + "tips" + ); + } else { + console.log("打开界面：", i_prefab); + ResManager.I.getPrefab( + i_prefab, + (pb: Node) => { + this.openViewByPrefab( + null, + pb, + i_openData, + callBack, + i_prefab, + "tips" + ); + }, + null + ); + } + } + + /**关闭窗体 */ + closeView(i_view: Node) { + let closeUIName = null; + let t_index = this.getViewIndex(i_view); + if (t_index > -1) { + let t_view = this.m_viewList[t_index]; + if (t_view) { + closeUIName = t_view.name; + delete this.m_viewListData[t_view.name]; + t_view.destroy(); + t_view.removeFromParent(); + } + this.m_viewList.splice(t_index, 1); //删除列表元素 参数1是指定位置，参数2是删除元素个数 + } else { + if (!this.m_viewList.length) { + i_view.destroy(); + } + Utils.Log("试图关闭一个队列中不存在的界面:", i_view.name); + } + } + + /**关闭所有窗体 */ + closeAllView(isR = false) { + for (let i = this.m_viewList.length - 1; i >= 0; i--) { + let t_view = this.m_viewList[i]; + if (t_view) { + delete this.m_viewListData[t_view.name]; + t_view.destroy(); + t_view.removeFromParent(); + } } - //获取截屏纹理 - private getScreenShot():RenderTexture { - // let texture = new RenderTexture(); - // let winSize = view.getViewportRect() - // let winSize1 = view.getVisibleSize() - // texture.reset({ - // width: winSize.width, - // height: winSize.height, - // }); - - // let camera = director.getScene().getComponentInChildren(Camera); - // let oldTargetTexture = camera.targetTexture - // camera.targetTexture = texture; - // camera.render(); - // camera.targetTexture = oldTargetTexture - - // return texture - return null + this.m_viewList = []; + this.m_viewListData = {}; + this.openIdx = 0; + } + + //是否在主界面，没有打开任何其他界面。主界面是在打开场景时直接创建的，不走这里的打开接口 + isNotOpenAnyUI() { + if (this.m_viewList && this.m_viewList.length > 0) { + return false; } - - private getViewIndex(i_view: Node) { - for (let i = this.m_viewList.length - 1; i >= 0; i--) { - let t_view = this.m_viewList[i]; - if (t_view == i_view) { - return i; - } - } - - return -1; - } - - - - /**打开resources窗体 */ - openMainView(i_prefab: string | Prefab, i_openData?, callBack = null, type: string = '') { - if (i_prefab instanceof Prefab) { - this.openViewByPrefab(null, i_prefab, i_openData, callBack, i_prefab, type); - } else { - resources.load(i_prefab, (err, $prefab: Prefab) => { - this.openViewByPrefab(err, $prefab, i_openData, callBack, i_prefab, type); - }); - } - } - /**打开bundle窗体 */ - openBundlesView(i_prefab: string | Prefab, i_openData?, callBack = null, type: string = '') { - if (i_prefab instanceof Prefab) { - this.openViewByPrefab(null, i_prefab, i_openData, callBack, i_prefab, type); - } else { - console.log("打开界面：", i_prefab); - ResManager.I.getPrefab(i_prefab, (pb: Node) => { - this.openViewByPrefab(null, pb, i_openData, callBack, i_prefab, type); - }, null); - } - } - - - /**关闭窗体 */ - closeView(i_view: Node) { - let closeUIName = null - let t_index = this.getViewIndex(i_view); - if (t_index > -1) { - let t_view = this.m_viewList[t_index]; - if (t_view) { - closeUIName = t_view.name - delete this.m_viewListData[t_view.name]; - t_view.destroy(); - t_view.removeFromParent(); - - } - this.m_viewList.splice(t_index, 1); //删除列表元素 参数1是指定位置，参数2是删除元素个数 - } - else { - if (!this.m_viewList.length) { - i_view.destroy(); - } - Utils.Log('试图关闭一个队列中不存在的界面:', i_view.name); - } - } - - /**关闭所有窗体 */ - closeAllView(isR = false) { - for (let i = this.m_viewList.length - 1; i >= 0; i--) { - let t_view = this.m_viewList[i]; - if (t_view) { - delete this.m_viewListData[t_view.name]; - t_view.destroy(); - t_view.removeFromParent(); - } - } - - this.m_viewList = []; - this.m_viewListData = {}; - this.openIdx = 0; - - } - - //是否在主界面，没有打开任何其他界面。主界面是在打开场景时直接创建的，不走这里的打开接口 - isNotOpenAnyUI() { - if (this.m_viewList && this.m_viewList.length > 0) { - return false - } - return true - } - -} \ No newline at end of file + return true; + } +} diff --git a/assets/Scripts/chat18x/data/GirlData.ts b/assets/Scripts/chat18x/data/GirlData.ts index 3a2b56ef..225321fc 100644 --- a/assets/Scripts/chat18x/data/GirlData.ts +++ b/assets/Scripts/chat18x/data/GirlData.ts @@ -335,17 +335,17 @@ export class GirlData extends BaseData { let price = oneData.getGrilPhotoPrice(id); if (price <= 0) { // 价格为0，代表免费 - displayIds.push({ id: id }); + displayIds.push(id); } else { // 价格大于0，代表付费 let isUnlock = this.isImageUnlock(categoryId, girlId, id); if (isUnlock) { // 已经解锁 - displayIds.push({ id: id }); + displayIds.push(id); } else { // 总聊天次数 大于等于 触发次数 if (chatTotalCount >= unlockCounts) { - displayIds.push({ id: id }); + displayIds.push(id); } } } diff --git a/assets/Scripts/chat18x/data/GirlDetailData.ts b/assets/Scripts/chat18x/data/GirlDetailData.ts index 85b617b5..be35e788 100644 --- a/assets/Scripts/chat18x/data/GirlDetailData.ts +++ b/assets/Scripts/chat18x/data/GirlDetailData.ts @@ -113,7 +113,7 @@ export class GirlDetailData extends BaseData { if (!this.photoData) return null; // 遍历数组找到匹配的资源 for (let oneData of this.photoData) { - if (oneData.id === id) { + if (oneData.id == id) { return oneData; } } diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index f45d41c8..122c1a34 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -158,7 +158,7 @@ export class GirlListItem extends Component { ViewManager.I.closeView(this.baseNode); } else { //未解锁 - ViewManager.I.openBundlesView("GirlListPopupPanel", { + ViewManager.I.openBundlesPopupView("GirlListPopupPanel", { base: this, category: this.category, id: this.id, diff --git a/assets/bundles/Chat18x/GirlListPopupPanel.prefab b/assets/bundles/Chat18x/GirlListPopupPanel.prefab index f96e06ad..53963f84 100644 --- a/assets/bundles/Chat18x/GirlListPopupPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPopupPanel.prefab @@ -22,35 +22,26 @@ "__id__": 2 }, { - "__id__": 10 - }, - { - "__id__": 18 - }, - { - "__id__": 24 - }, - { - "__id__": 106 + "__id__": 12 } ], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 134 }, { - "__id__": 118 + "__id__": 136 }, { - "__id__": 120 + "__id__": 138 }, { - "__id__": 122 + "__id__": 140 } ], "_prefab": { - "__id__": 124 + "__id__": 142 }, "_lpos": { "__type__": "cc.Vec3", @@ -83,7 +74,7 @@ }, { "__type__": "cc.Node", - "_name": "Img_Frame", + "_name": "blocker", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -100,15 +91,18 @@ }, { "__id__": 7 + }, + { + "__id__": 9 } ], "_prefab": { - "__id__": 9 + "__id__": 11 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 81.5, + "y": 0, "z": 0 }, "_lrot": { @@ -146,6 +140,268 @@ "__prefab": { "__id__": 4 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 2340 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b1JO4gykFJYLhlXpehQlHu" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5coSMaBpEXKS+rtkAi/Qy" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_alignFlags": 45, + "_target": null, + "_left": -107.5, + "_right": -107.5, + "_top": -530.5, + "_bottom": -530.5, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 36, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2d2mjdFBxMSbvNwCxSQFji" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bu3kibSRMO4yW0uG1xS3o" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "35Hk7au3xFU7K74ZzmRsvb", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "mask", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 13 + }, + { + "__id__": 21 + }, + { + "__id__": 29 + }, + { + "__id__": 35 + }, + { + "__id__": 117 + } + ], + "_active": true, + "_components": [ + { + "__id__": 127 + }, + { + "__id__": 129 + }, + { + "__id__": 131 + } + ], + "_prefab": { + "__id__": 133 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Img_Frame", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 12 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 + } + ], + "_prefab": { + "__id__": 20 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 81.5, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 13 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, "_contentSize": { "__type__": "cc.Size", "width": 865, @@ -168,11 +424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 17 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -213,11 +469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 19 }, "_alignFlags": 1, "_target": null, @@ -262,23 +518,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 + "__id__": 12 }, "_children": [], "_active": true, "_components": [ { - "__id__": 11 + "__id__": 22 }, { - "__id__": 13 + "__id__": 24 }, { - "__id__": 15 + "__id__": 26 } ], "_prefab": { - "__id__": 17 + "__id__": 28 }, "_lpos": { "__type__": "cc.Vec3", @@ -315,11 +571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 23 }, "_contentSize": { "__type__": "cc.Size", @@ -343,11 +599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 25 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -388,11 +644,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 27 }, "_alignFlags": 40, "_target": null, @@ -437,20 +693,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 + "__id__": 12 }, "_children": [], "_active": true, "_components": [ { - "__id__": 19 + "__id__": 30 }, { - "__id__": 21 + "__id__": 32 } ], "_prefab": { - "__id__": 23 + "__id__": 34 }, "_lpos": { "__type__": "cc.Vec3", @@ -487,11 +743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 31 }, "_contentSize": { "__type__": "cc.Size", @@ -515,11 +771,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 33 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -573,36 +829,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 + "__id__": 12 }, "_children": [ { - "__id__": 25 + "__id__": 36 }, { - "__id__": 33 + "__id__": 44 }, { - "__id__": 41 + "__id__": 52 }, { - "__id__": 79 + "__id__": 90 } ], "_active": true, "_components": [ { - "__id__": 99 + "__id__": 110 }, { - "__id__": 101 + "__id__": 112 }, { - "__id__": 103 + "__id__": 114 } ], "_prefab": { - "__id__": 105 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -639,23 +895,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 35 }, "_children": [], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 37 }, { - "__id__": 28 + "__id__": 39 }, { - "__id__": 30 + "__id__": 41 } ], "_prefab": { - "__id__": 32 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -692,11 +948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 38 }, "_contentSize": { "__type__": "cc.Size", @@ -720,11 +976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 40 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -791,11 +1047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 42 }, "_alignFlags": 9, "_target": null, @@ -840,23 +1096,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 35 }, "_children": [], "_active": true, "_components": [ { - "__id__": 34 + "__id__": 45 }, { - "__id__": 36 + "__id__": 47 }, { - "__id__": 38 + "__id__": 49 } ], "_prefab": { - "__id__": 40 + "__id__": 51 }, "_lpos": { "__type__": "cc.Vec3", @@ -893,11 +1149,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -921,11 +1177,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -992,11 +1248,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 50 }, "_alignFlags": 9, "_target": null, @@ -1041,39 +1297,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 35 }, "_children": [ { - "__id__": 42 + "__id__": 53 }, { - "__id__": 48 + "__id__": 59 }, { - "__id__": 54 + "__id__": 65 }, { - "__id__": 60 + "__id__": 71 }, { - "__id__": 66 + "__id__": 77 } ], "_active": false, "_components": [ { - "__id__": 72 + "__id__": 83 }, { - "__id__": 74 + "__id__": 85 }, { - "__id__": 76 + "__id__": 87 } ], "_prefab": { - "__id__": 78 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -1110,20 +1366,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 41 + "__id__": 52 }, "_children": [], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 54 }, { - "__id__": 45 + "__id__": 56 } ], "_prefab": { - "__id__": 47 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -1160,11 +1416,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 53 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 55 }, "_contentSize": { "__type__": "cc.Size", @@ -1188,11 +1444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 53 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 57 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1246,20 +1502,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 41 + "__id__": 52 }, "_children": [], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 60 }, { - "__id__": 51 + "__id__": 62 } ], "_prefab": { - "__id__": 53 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1296,11 +1552,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1324,11 +1580,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1382,20 +1638,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 41 + "__id__": 52 }, "_children": [], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 66 }, { - "__id__": 57 + "__id__": 68 } ], "_prefab": { - "__id__": 59 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -1432,11 +1688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", @@ -1460,11 +1716,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 69 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1518,20 +1774,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 41 + "__id__": 52 }, "_children": [], "_active": true, "_components": [ { - "__id__": 61 + "__id__": 72 }, { - "__id__": 63 + "__id__": 74 } ], "_prefab": { - "__id__": 65 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1568,11 +1824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1596,11 +1852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 75 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1654,20 +1910,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 41 + "__id__": 52 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 78 }, { - "__id__": 69 + "__id__": 80 } ], "_prefab": { - "__id__": 71 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -1704,11 +1960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 79 }, "_contentSize": { "__type__": "cc.Size", @@ -1732,11 +1988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 81 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1790,11 +2046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1818,11 +2074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 86 }, "_alignFlags": 8, "_target": null, @@ -1854,11 +2110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 52 }, "_enabled": false, "__prefab": { - "__id__": 77 + "__id__": 88 }, "_resizeMode": 1, "_layoutType": 1, @@ -1905,24 +2161,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 35 }, "_children": [ { - "__id__": 80 + "__id__": 91 } ], "_active": true, "_components": [ { - "__id__": 94 + "__id__": 105 }, { - "__id__": 96 + "__id__": 107 } ], "_prefab": { - "__id__": 98 + "__id__": 109 }, "_lpos": { "__type__": "cc.Vec3", @@ -1959,24 +2215,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 79 + "__id__": 90 }, "_children": [ { - "__id__": 81 + "__id__": 92 } ], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 100 }, { - "__id__": 91 + "__id__": 102 } ], "_prefab": { - "__id__": 93 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -2013,23 +2269,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 91 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 93 }, { - "__id__": 84 + "__id__": 95 }, { - "__id__": 86 + "__id__": 97 } ], "_prefab": { - "__id__": 88 + "__id__": 99 }, "_lpos": { "__type__": "cc.Vec3", @@ -2066,11 +2322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -2094,11 +2350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 96 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2139,11 +2395,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 92 }, "_enabled": false, "__prefab": { - "__id__": 87 + "__id__": 98 }, "_alignFlags": 8, "_target": null, @@ -2188,11 +2444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -2216,11 +2472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 103 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2300,11 +2556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 106 }, "_contentSize": { "__type__": "cc.Size", @@ -2328,11 +2584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 108 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2386,11 +2642,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 111 }, "_contentSize": { "__type__": "cc.Size", @@ -2414,11 +2670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 113 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2459,11 +2715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 115 }, "_alignFlags": 4, "_target": null, @@ -2508,26 +2764,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 + "__id__": 12 }, "_children": [], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 118 }, { - "__id__": 109 + "__id__": 120 }, { - "__id__": 111 + "__id__": 122 }, { - "__id__": 113 + "__id__": 124 } ], "_prefab": { - "__id__": 115 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -2564,11 +2820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -2592,11 +2848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 121 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2637,11 +2893,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 123 }, "clickEvents": [], "_interactable": true, @@ -2693,7 +2949,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 106 + "__id__": 117 }, "_id": "" }, @@ -2707,11 +2963,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 125 }, "_alignFlags": 33, "_target": null, @@ -2750,6 +3006,114 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 128 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 865, + "height": 1279 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a36iqNC2VO4JSfbhmR10qj" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 130 + }, + "_type": 3, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7e+Fn+7QJLZpb7lTwLtNJc" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 132 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "0bdfe3e6-6632-42ac-ac0b-b4f50cbb3fc8@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": "75fF5RMz5FnZ/Wcqd/kLjD" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a7cD1sg8dCyZcd+POWFd/h", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -2760,7 +3124,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 135 }, "_contentSize": { "__type__": "cc.Size", @@ -2786,9 +3150,9 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 119 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2831,9 +3195,9 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 121 + "__id__": 139 }, "_type": 3, "_inverted": false, @@ -2855,7 +3219,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 141 }, "m_rootNode": null, "_id": "" diff --git a/proto_cs b/proto_cs index 9ec1d4f0..f055100c 160000 --- a/proto_cs +++ b/proto_cs @@ -1 +1 @@ -Subproject commit 9ec1d4f07754a1c91f80bf1e3c583d42e42049b2 +Subproject commit f055100cf0f378ddd96d8e153655b5166c65e6e8