From 5cacad707ec795af4aa3e6fcc52807735e47f861 Mon Sep 17 00:00:00 2001
From: Lenheart <947330670@qq.com>
Date: Sat, 14 Dec 2024 23:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UI=E7=B1=BB=E5=9F=BA=E7=B1=BB?=
 =?UTF-8?q?=20=E6=A0=B9=E6=8D=AE=E7=AA=97=E5=8F=A3=E5=92=8C=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=80=89=E5=AE=9A=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E5=9F=BA=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sqr/Core/BaseClass/LayerObject.nut | 20 ++++++++++----------
 sqr/Core/UI_Class/UI_Core.nut      | 14 ++++++++++----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/sqr/Core/BaseClass/LayerObject.nut b/sqr/Core/BaseClass/LayerObject.nut
index 2bb7795..97e6a7d 100644
--- a/sqr/Core/BaseClass/LayerObject.nut
+++ b/sqr/Core/BaseClass/LayerObject.nut
@@ -6,16 +6,16 @@
 */
 class Layer extends Actor {
 
-    constructor(...) {
-        local C_Object;
-        if (vargv.len() == 0) {
-            C_Object = LayerActor_Create();
-            base.constructor(C_Object);
-        } else {
-            C_Object = vargv[0];
-            base.constructor(C_Object, true);
-        }
-    }
+    // constructor(...) {
+    //     local C_Object;
+    //     if (vargv.len() == 0) {
+    //         C_Object = LayerActor_Create();
+    //         base.constructor(C_Object);
+    //     } else {
+    //         C_Object = vargv[0];
+    //         base.constructor(C_Object, true);
+    //     }
+    // }
 
     //设置图层裁剪区域
     function SetClipRect(x, y, w, h) {
diff --git a/sqr/Core/UI_Class/UI_Core.nut b/sqr/Core/UI_Class/UI_Core.nut
index 3acc07a..8ddbc4c 100644
--- a/sqr/Core/UI_Class/UI_Core.nut
+++ b/sqr/Core/UI_Class/UI_Core.nut
@@ -25,9 +25,15 @@ class Yosin_BaseWindow extends Layer {
     Y = null;
     B_Y = null;
 
-    constructor() {
-        //构造函数 创建一个空Actor
-        base.constructor();
+    constructor(IsWindowFlag = false) {
+        local ObjectBuf;
+        //如果是游戏窗口类 则以Layer为基类 否则以Actor为基类
+        if (IsWindowFlag) {
+            ObjectBuf = LayerActor_Create();
+            base.constructor(ObjectBuf);
+        } else {
+            base.constructor();
+        }
 
         //子控件list初始化
         UI_Childrens = [];
@@ -190,7 +196,7 @@ class Yosin_Window extends Yosin_BaseWindow {
         Y = gY;
 
         //调用原生方法
-        base.constructor();
+        base.constructor(true);
 
         SetSize(Width, Height);
     }