From c3382b33b1fe65299a86745d4d5321a589e367ba Mon Sep 17 00:00:00 2001 From: dgflash Date: Sun, 2 Oct 2022 21:20:41 +0800 Subject: [PATCH 1/2] . --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 42f07ef..485a902 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Oops Framework 基于 Cocos Creator 3.x 开发的一款游戏框架。 - 热更控制脚本 game/initialize/view/HotUpdate.ts - 本地热更配置 resources/project.manifes - 本地热更配置 resources/version.manifes -8. Cocos Creator 3.5 版本新功能业务框架模板 +8. 业务框架模板 ![](http://dgflash.gitee.io/oops-full-stack-web/doc/img/module.png) 9. 框架以插件方式提供,与项目代码分离,方便不同版本平滑升级 From 214fef5bfe71967a5e88c2815471cf34371815ea Mon Sep 17 00:00:00 2001 From: dgflash Date: Mon, 3 Oct 2022 22:08:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DDialog=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=90=8C=E8=B5=84=E6=BA=90=E7=AA=97=E5=8F=A3=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/main.scene | 2 +- assets/resources/common/prefab/window.prefab | 7 ------- assets/script/game/demo/Demo.ts | 6 ++++++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/assets/main.scene b/assets/main.scene index 550c1f4..4a622ab 100644 --- a/assets/main.scene +++ b/assets/main.scene @@ -227,7 +227,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 439.1862284820031, + "_orthoHeight": 375, "_near": 1, "_far": 2000, "_color": { diff --git a/assets/resources/common/prefab/window.prefab b/assets/resources/common/prefab/window.prefab index 52cd39e..062ac63 100644 --- a/assets/resources/common/prefab/window.prefab +++ b/assets/resources/common/prefab/window.prefab @@ -163,7 +163,6 @@ "__prefab": { "__id__": 6 }, - "_visFlags": 0, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -315,7 +314,6 @@ "__prefab": { "__id__": 14 }, - "_visFlags": 0, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -525,7 +523,6 @@ "__prefab": { "__id__": 23 }, - "_visFlags": 0, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -626,7 +623,6 @@ "__prefab": { "__id__": 30 }, - "_visFlags": 0, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -935,7 +931,6 @@ "__prefab": { "__id__": 42 }, - "_visFlags": 0, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -1036,7 +1031,6 @@ "__prefab": { "__id__": 49 }, - "_visFlags": 0, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -1236,7 +1230,6 @@ "__prefab": { "__id__": 59 }, - "_visFlags": 0, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, diff --git a/assets/script/game/demo/Demo.ts b/assets/script/game/demo/Demo.ts index 5adba19..fdb0148 100644 --- a/assets/script/game/demo/Demo.ts +++ b/assets/script/game/demo/Demo.ts @@ -120,6 +120,12 @@ export class Demo extends Component { tips.test(() => { }); + tips.confirm("内容1", () => { + + }, "确认1"); + tips.confirm("内容2", () => { + + }, "确认2"); } /** 漂浮提示框 */