@ives_xxz/framework 2.1.7 → 2.1.9

package/expand/FWDecorator.ts

@@ -21,9 +21,13 @@ type ParamType = {
 };
 
 export function FWPropertyNode($opt?: ParamType): FW.PropertyDecorator {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
-    const cache: { propertyKey: string; childName: string }[] = ($target[KeyChild] ??= []);
+    if (!$target.hasOwnProperty(KeyChild)) {
+      $target[KeyChild] = [];
+    }
+
+    const cache: { propertyKey: string; childName: string }[] = $target[KeyChild];
+
     if (!cache.some(($vo) => $vo.propertyKey === $propertyKey)) {
       cache.push({
         propertyKey: $propertyKey,
@@ -32,6 +36,7 @@ export function FWPropertyNode($opt?: ParamType): FW.PropertyDecorator {
     } else {
       throw new Error(`child 装饰器重复绑定属性：${$propertyKey},class：${$target?.name}`);
     }
+
     if (cache.length === 1) {
       const oldOnLoad: () => void = $target.onLoad || undefined;
       $target.onLoad = function () {
@@ -42,22 +47,19 @@ export function FWPropertyNode($opt?: ParamType): FW.PropertyDecorator {
   };
 }
 
-const KeyChildMulti = CookDecoratorKey('child_cache_multi'); // 重新定义 Key，避免冲突
+const KeyChildMulti = CookDecoratorKey('child_cache_multi');
 
 /** 查找多个节点，并存储为数组 */
 export function FWPropertyNodes(...paths: string[]): FW.PropertyDecorator {
   return ($target: any, $propertyKey: string) => {
-    // 确保 $target[KeyChild] 是数组
-    if (!$target[KeyChildMulti]) {
+    if (!$target.hasOwnProperty(KeyChildMulti)) {
       $target[KeyChildMulti] = [];
     }
 
     const cache: { propertyKey: string; childNames: string[] }[] = $target[KeyChildMulti];
 
-    // 查找是否已经存在该属性的绑定
     const existingEntry = cache.find(($vo) => $vo.propertyKey === $propertyKey);
 
-    // 如果没有找到绑定，则添加
     if (!existingEntry) {
       cache.push({
         propertyKey: $propertyKey,
@@ -69,7 +71,6 @@ export function FWPropertyNodes(...paths: string[]): FW.PropertyDecorator {
       );
     }
 
-    // 确保只绑定一次 onLoad，防止重复调用
     if (cache.length === 1) {
       const oldOnLoad = $target.onLoad;
 
@@ -81,7 +82,6 @@ export function FWPropertyNodes(...paths: string[]): FW.PropertyDecorator {
         cache.forEach(($vo) => {
           const nodes: cc.Node[] = [];
 
-          // 将所有路径对应的节点存入数组
           $vo.childNames.forEach((childName) => {
             const childNode = searchChild(this.node, childName);
             if (!childNode) {
@@ -91,11 +91,9 @@ export function FWPropertyNodes(...paths: string[]): FW.PropertyDecorator {
             }
           });
 
-          // 将结果赋值为数组，保证拿到所有节点
           this[$vo.propertyKey] = nodes;
         });
 
-        // 调用父类 onLoad 方法
         if (oldOnLoad) {
           oldOnLoad.apply(this);
         }
@@ -116,11 +114,15 @@ export function FWPropertyComponent(
   $mute = false,
 ): FW.PropertyDecorator {
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
+    if (!$target.hasOwnProperty(KeyComp)) {
+      $target[KeyComp] = [];
+    }
     const cache: {
       propertyKey: string;
       compClass: INewable<cc.Component>;
       childName: string;
-    }[] = ($target[KeyComp] ??= []);
+    }[] = $target[KeyComp];
+
     if (!cache.some(($vo) => $vo.propertyKey === $propertyKey)) {
       cache.push({
         propertyKey: $propertyKey,
@@ -162,7 +164,7 @@ export function FWPropertyComponents(
 ): FW.PropertyDecorator {
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
     const componentName = $childName || $propertyKey;
-    const oldOnLoad: () => void = $target.onLoad || undefined; //$target.onLoad也可以拿到父类的实现
+    const oldOnLoad: () => void = $target.onLoad || undefined;
     $target.onLoad = function () {
       const components = this.node.getComponentsInChildren($componentClass);
       if (components.length == 0) return;
@@ -192,7 +194,6 @@ export function isNull(message?: string) {
       value = newVal;
     };
 
-    // 使用 defineProperty 来替换原来的属性
     Object.defineProperty(target, propertyKey, {
       get: getter,
       set: setter,

package/manager/FWAudioManager.ts

@@ -96,34 +96,37 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
   ): Promise<number>;
   async play(): Promise<number> {
     try {
-      if (this.audioPool.size >= this.maxConcurrentAudio) {
-        this.clearFinishedAudio();
+      return new Promise<number>(async (resolve, reject) => {
         if (this.audioPool.size >= this.maxConcurrentAudio) {
-          FW.Log.warn('音频池已满，无法播放新音频');
-          return -1;
+          this.clearFinishedAudio();
+          if (this.audioPool.size >= this.maxConcurrentAudio) {
+            FW.Log.warn('音频池已满，无法播放新音频');
+            return -1;
+          }
         }
-      }
 
-      const audioData = await this.processAudioArguments(
-        arguments,
-        FW.SystemDefine.FWAudioType.SOUND,
-      );
-      if (!audioData.clip) return -1;
+        const audioData = await this.processAudioArguments(
+          arguments,
+          FW.SystemDefine.FWAudioType.SOUND,
+        );
+        if (!audioData.clip) return -1;
 
-      const volume = (audioData.volume ?? this.soundVolume) * this.effectsVolume;
-      const loop = audioData.loop ?? false;
-      const tag = audioData.tag;
+        const volume = (audioData.volume ?? this.soundVolume) * this.effectsVolume;
+        const loop = audioData.loop ?? false;
+        const tag = audioData.tag;
 
-      const id = cc.audioEngine.play(audioData.clip, loop, volume);
+        const id = cc.audioEngine.play(audioData.clip, loop, volume);
 
-      this.audioPool.set(id, new FWAudioPoolItem(id, Date.now(), tag));
+        this.audioPool.set(id, new FWAudioPoolItem(id, Date.now(), tag));
 
-      cc.audioEngine.setFinishCallback(id, () => {
-        audioData.cb?.(id);
-        this.audioPool.delete(id);
-      });
+        cc.audioEngine.setFinishCallback(id, () => {
+          audioData.cb?.(id);
+          resolve(id);
+          this.audioPool.delete(id);
+        });
 
-      return id;
+        return id;
+      });
     } catch (e) {
       FW.Log.error('播放音效失败:', e);
       return -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],