@cc-component/cc-core 1.0.7 → 1.0.9

package/assets/core/home/BaseLoading.ts

@@ -3,7 +3,7 @@ import { _decorator, CCString, Component, Enum, instantiate, Node, Prefab } from
 import { ISceneParam } from '../interface/ISceneParam';
 import { DEBUG } from 'cc/env';
 import { ResourceManager } from './ResourceManager';
-import { ProgessView } from './ProgessView';
+import { ProgessView } from './ProgessWindow';
 import { AssetType, BundleConfig, BundleConfigName, GetAssetType } from '../config/CommonEnum';
 import { LanguageData } from '../lib/language/LanguageData';
 const { ccclass, property } = _decorator;

package/assets/core/home/{ProgessView.ts → ProgessWindow.ts}

@@ -16,16 +16,17 @@ const { ccclass, property, menu } = _decorator;
  *
  */
 
-@ccclass('ProgessView')
-@menu('组件进度条/ProgessView')
-export class ProgessView extends Component {
+@ccclass('ProgessWindow')
+@menu('组件进度条/ProgessWindow')
+export class ProgessWindow extends Component {
 
-    // static Ins:ProgessView;
+    // static Ins:ProgessWindow;
     @property({
         type: ProgressBar,
         displayName: "进度条"
     })
     pro_bar!: ProgressBar;
+    stop = false
 
     protected onLoad(): void {
 
@@ -35,33 +36,29 @@ export class ProgessView extends Component {
         this.pro_bar.node.active = isShow
     }
 
-    stop = false
-    async SetProgessAuto(isOk) {
+    /***更新进度--假的进度 */
+    async ProgessValueAuto(isOk) {
         this.stop = isOk
         if (isOk) {
             for (var i = 90; i < 101; i++) {
                 await MainModule.timeManager.AwaitMS(1);
-                this.SetProgessValue((i));
+                this.ProgessValue((i));
             }
             this.Hide()
         } else {
             for (var i = 0; i < 90; i++) {
                 if (this.stop) { return }
                 await MainModule.timeManager.AwaitMS(1);
-                this.SetProgessValue((i));
+                this.ProgessValue((i));
             }
         }
     }
 
-    async SetProgessValue(value: number) {
+    /***更新进度 */
+    public ProgessValue(value: number) {
         if (this.pro_bar) {
-            this.pro_bar.SetValue(value);
-            //    console.log(value);
-            if (value >= 100) {
-                //  this.Hide();
-            }
+            this.pro(this.pro_bar, value, 100);
         }
-
     }
 
     Show() {
@@ -73,24 +70,19 @@ export class ProgessView extends Component {
     }
 
 
-    pro(this: ProgressBar, progress: number, max: number, anim_time?: number): void {
-
-        const com_max_pro = this.totalLength//getComponent(UITransform).width
+    pro(proBar: ProgressBar, progress: number, max: number, anim_time?: number): void {
+        const com_max_pro = proBar.totalLength//getComponent(UITransform).width
         const max_progress = com_max_pro;
         const s = max_progress / max;
         const pro = progress * s / max_progress;
-
         if (anim_time) {
-            tween(this).to(anim_time, {
+            tween(proBar).to(anim_time, {
                 progress: pro
             }).start();
 
         } else {
-            this.progress = pro;
-
+            proBar.progress = pro;
         }
     }
-
-
 }
 

package/assets/core/interface/Interface.ts

@@ -107,6 +107,14 @@ declare global {
     //MainModule.On(SystemMessage.OpenWindow)
     /**✅✅✅监听窗口的关闭 */
     //MainModule.On(SystemMessage.CloseWindow)
+    /**获取所有已打开的窗口名称 */
+    function GetOpenedWindowNames(): string[]
+    /**获取已打开的窗口实例*/
+    function GetOpenWindow<T extends Component>(config: IBundleConfig): T;
+    // 获取已打开的窗口实例-对象
+    function GetOpenWindows<T extends Component>(): T[]
+    // 获取已打开的窗口实例-配置
+    function GetOpenWindowsConfig(): IBundleConfig[];
     /**
      * 显示加载转圈
      */

package/assets/core/interface/MainModule.ts

@@ -16,8 +16,6 @@ import { TimeManager } from "../home/TimeManager";
 import { LanguageManager } from "../lib/language/Language";
 import { BundleConfigName, HttpType, IBundleConfig, IExtData, IHttpConfig, IInitConfig, IWindowParam, SystemMessage } from "../config/CommonEnum";
 import { LayerType } from "../config/LayerType";
-import { Logger } from "../lib/Logger";
-import { Main } from "electron";
 
 
 // const { keepClassName } = keepClass;
@@ -942,12 +940,21 @@ export class MainModule {
     }
 
     // 获取已打开的窗口实例
-    static GetOpenWindow<T extends Component>(config: IBundleConfig): T | null {
+    static GetOpenWindow<T extends Component>(config: IBundleConfig): T {
         const className = config.path.split('/').pop();
         const window = MainModule.Ins.openedWindows.get(className);
         return window ? window as T : null;
     }
+    // 获取已打开的窗口实例
+    static GetOpenWindows<T extends Component>(): T[] {
+        return Array.from(MainModule.Ins.openedWindows.values()) as T[];
 
+    }
+    // 获取已打开的窗口实例
+    static GetOpenWindowsConfig(): IBundleConfig[] {
+        return Array.from(MainModule.Ins.openedWindowsConfig.values());
+
+    }
     // 获取所有已打开的窗口名称
     static GetOpenedWindowNames(): string[] {
         return Array.from(MainModule.Ins.openedWindows.keys());

package/index.ts

@@ -8,7 +8,7 @@ export * from './assets/core/config/IConfig';
 //基类
 export * from './assets/core/home/BaseLaunchComponent';
 export * from './assets/core/home/BaseLoading';
-export * from './assets/core/home/ProgessView';
+export * from './assets/core/home/ProgessWindow';
 //日志
 export * from './assets/core/lib/logger/ELoggerLevel';
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-core",
-    "version": "1.0.7",
+    "version": "1.0.9",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",