Merge branch 'master' of https://gitee.com/dgflash/oops-framework

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. 框架以插件方式提供，与项目代码分离，方便不同版本平滑升级

assets/main.scene

@@ -227,7 +227,7 @@
     "_priority": 1073741824,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 439.1862284820031,
+    "_orthoHeight": 375,
     "_near": 1,
     "_far": 2000,
     "_color": {

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,

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");
     }
 
     /** 漂浮提示框 */