@ives_xxz/packages 1.0.4 → 1.0.6

package/FWLayerGenerator/main.js

@@ -2,18 +2,15 @@ const Path = require('path');
 const Fs = require('fs');
 
 function capitalize(str) {
-    return str.charAt(0).toUpperCase() + str.slice(1);
+  return str.charAt(0).toUpperCase() + str.slice(1);
 }
 
 // 生成Layer类模板
-function generateLayerTemplate(bundleName, featureName,subDir) {
-    const className = `${capitalize(bundleName)}${capitalize(featureName)}Layer`;
-    return `import FWLayer from '${subDir?'../':''}../../../../../framework/layer/FWLayer';
-  
-  const { ccclass, property } = cc._decorator;
-  
+function generateLayerTemplate(bundleName, featureName, subDir) {
+  const className = `${capitalize(bundleName)}${capitalize(featureName)}Layer`;
+  return `const { ccclass, property } = cc._decorator;
   @ccclass
-  export default class ${className} extends FWLayer {
+  export default class ${className} extends FW.Layer {
       public onLoad(): void {
           super.onLoad();
       }
@@ -35,20 +32,21 @@ function generateLayerTemplate(bundleName, featureName,subDir) {
       }
 
   }`;
-  }
-  
-  // 生成LayerController类模板
-  function generateControllerTemplate(bundleName, featureName,subDir) {
-    const className = `${capitalize(bundleName)}${capitalize(featureName)}LayerController`;
-    const layerClassName = `${capitalize(bundleName)}${capitalize(featureName)}Layer`;
-    return `import { FWSystemDefine } from '${subDir?'../':''}../../../../../framework/define/FWSystemDefine';
-  import { FWLayerController } from '${subDir?'../':''}../../../../../framework/controller/FWLayerController';
-  import ${layerClassName} from '../${subDir ? `../`:''}layer/${subDir ? `${subDir}/` : ''}${layerClassName}';
+}
+
+// 生成LayerController类模板
+function generateControllerTemplate(bundleName, featureName, subDir) {
+  const className = `${capitalize(bundleName)}${capitalize(featureName)}LayerController`;
+  const layerClassName = `${capitalize(bundleName)}${capitalize(featureName)}Layer`;
+  return `
+  import ${layerClassName} from '../${subDir ? `../` : ''}layer/${
+    subDir ? `${subDir}/` : ''
+  }${layerClassName}';
   
-  export class ${className} extends FWLayerController {
-      public renderOrder: number;
+  export class ${className} extends FW.LayerController {
+      public renderOrder: number = FW.SystemDefine.FWLayerRenderOrder.PERMANENT;
       public layer: ${layerClassName};
-      public layerType: FWSystemDefine.FWLayerType;
+      public layerType: FW.SystemDefine.FWLayerType = FW.SystemDefine.FWLayerType.POPUP_DISPOSABLE;
       public get layerAssetProperty(): FW.AssetProperty {
           return;
       }
@@ -62,125 +60,128 @@ function generateLayerTemplate(bundleName, featureName,subDir) {
 }
 
 module.exports = {
-  
-
-    messages: {
-        'create-layer'() {
-            Editor.Panel.open('layer-generator');
-        },
-
-        'generate-files'(event, params) {
-            try{
-                const { bundleName, featureName ,subDir} = params;
-                const assetsPath = Path.join(Editor.Project.path, 'assets');
-                const bundleRootPath = Path.join(assetsPath, 'bundle');
-                // 递归查找bundle
-                function findBundlePath(dirPath) {
-                    const items = Fs.readdirSync(dirPath);
-                    for (const item of items) {
-                        const fullPath = Path.join(dirPath, item);
-                        const stats = Fs.statSync(fullPath);
-                        
-                        if (stats.isDirectory()) {
-                            // 检查是否是同名文件夹
-                            if (Path.basename(fullPath) === bundleName) {
-                                // 检查是否配置为bundle
-                                const metaPath = `${fullPath}.meta`;
-                                if (Fs.existsSync(metaPath)) {
-                                    try {
-                                        const metaContent = Fs.readFileSync(metaPath, 'utf8');
-                                        if (metaContent.includes('"isBundle": true')) {
-                                            return fullPath;
-                                        }
-                                    } catch (err) {
-                                        // 读取meta文件失败，继续搜索
-                                        continue;
-                                    }
-                                }
-                            }
-                            // 递归搜索子目录
-                            const foundPath = findBundlePath(fullPath);
-                            if (foundPath) {
-                                return foundPath;
-                            }
-                        }
-                    }
-                    return null;
-                }
-                    
-                const bundlePath = findBundlePath(bundleRootPath);
-                
-                if (!bundlePath) {
-                    Editor.error(`Cannot find bundle "${bundleName}" or it is not configured as a bundle!`);
-                    return;
-                }
+  messages: {
+    'create-layer'() {
+      Editor.Panel.open('layer-generator');
+    },
 
+    'generate-files'(event, params) {
+      try {
+        const { bundleName, featureName, subDir } = params;
+        const assetsPath = Path.join(Editor.Project.path, 'assets');
+        const bundleRootPath = Path.join(assetsPath, 'bundle');
+        // 递归查找bundle
+        function findBundlePath(dirPath) {
+          const items = Fs.readdirSync(dirPath);
+          for (const item of items) {
+            const fullPath = Path.join(dirPath, item);
+            const stats = Fs.statSync(fullPath);
 
-                const layerDir = Path.join(bundlePath, `script/layer${subDir? `/${subDir}` : ''}`);
-                const controllerDir = Path.join(bundlePath, `script/controller${subDir? `/${subDir}` : ''}`);
-                const prefabDir = Path.join(bundlePath, `res/prefab/layer${subDir? `/${subDir}` : ''}`);
-                // 创建必要的目录
-                const dirs = [
-                    layerDir,
-                    controllerDir,
-                    // prefabDir
-                ];
-    
-                dirs.forEach(dir => {
-                    if (!Fs.existsSync(dir)) {
-                        Fs.mkdirSync(dir, { recursive: true });
+            if (stats.isDirectory()) {
+              // 检查是否是同名文件夹
+              if (Path.basename(fullPath) === bundleName) {
+                // 检查是否配置为bundle
+                const metaPath = `${fullPath}.meta`;
+                if (Fs.existsSync(metaPath)) {
+                  try {
+                    const metaContent = Fs.readFileSync(metaPath, 'utf8');
+                    if (metaContent.includes('"isBundle": true')) {
+                      return fullPath;
                     }
-                });
-    
-                // 生成Layer类文件
-                const layerPath = Path.join( layerDir, `${capitalize(bundleName)}${capitalize(featureName)}Layer.ts`);
-                Fs.writeFileSync(layerPath, generateLayerTemplate(bundleName, featureName,subDir));
-    
-                // 生成Controller类文件
-                const controllerPath = Path.join( controllerDir, `${capitalize(bundleName)}${capitalize(featureName)}LayerController.ts`);
-                Fs.writeFileSync(controllerPath, generateControllerTemplate(bundleName, featureName,subDir));
-    
-                // 创建预制体路径
-                // const prefabPath = Path.join( prefabDir, `${capitalize(bundleName)}${capitalize(featureName)}Layer.prefab`);
-    
-               
-    
-                this.refreshAssetDB(layerDir);
-                this.refreshAssetDB(controllerDir);
-            }   
-            catch(err){
-                Editor.error("生成Layer失败:",err);
+                  } catch (err) {
+                    // 读取meta文件失败，继续搜索
+                    continue;
+                  }
+                }
+              }
+              // 递归搜索子目录
+              const foundPath = findBundlePath(fullPath);
+              if (foundPath) {
+                return foundPath;
+              }
             }
-          
-            
-            // // 在场景中创建节点
-            // Editor.Scene.callSceneScript('layer-generator', 'create-node', {
-            //     name: `${capitalize(bundleName)}${capitalize(featureName)}Layer`,
-            //     prefabPath: prefabPath,
-            //     scriptName: `${capitalize(bundleName)}${capitalize(featureName)}Layer`
-            // }, (err, nodeUuid) => {
-            //     if (err) {
-            //         Editor.error('创建Layer失败：', err);
-            //         return;
-            //     }
-            //     Editor.success('Layer files generated successfully!');
-            // });
+          }
+          return null;
+        }
 
+        const bundlePath = findBundlePath(bundleRootPath);
 
+        if (!bundlePath) {
+          Editor.error(`Cannot find bundle "${bundleName}" or it is not configured as a bundle!`);
+          return;
         }
-    },
 
-    refreshAssetDB(outputBase) {
-      const relativePath = Path.relative(Editor.Project.path, outputBase);
-      
-      const url = 'db://' + relativePath.replace(/\\/g, '/');
-      
-      Editor.assetdb.refresh(url, (err) => {
-        if (err) {
-          Editor.error(`刷新资源失败: ${err}`);
-        } else {
-          Editor.log(`已刷新目录: ${url}`);
-        }
-      });
+        const layerDir = Path.join(bundlePath, `script/layer${subDir ? `/${subDir}` : ''}`);
+        const controllerDir = Path.join(
+          bundlePath,
+          `script/controller${subDir ? `/${subDir}` : ''}`
+        );
+        const prefabDir = Path.join(bundlePath, `res/prefab/layer${subDir ? `/${subDir}` : ''}`);
+        // 创建必要的目录
+        const dirs = [
+          layerDir,
+          controllerDir,
+          // prefabDir
+        ];
+
+        dirs.forEach((dir) => {
+          if (!Fs.existsSync(dir)) {
+            Fs.mkdirSync(dir, { recursive: true });
+          }
+        });
+
+        // 生成Layer类文件
+        const layerPath = Path.join(
+          layerDir,
+          `${capitalize(bundleName)}${capitalize(featureName)}Layer.ts`
+        );
+        Fs.writeFileSync(layerPath, generateLayerTemplate(bundleName, featureName, subDir));
+
+        // 生成Controller类文件
+        const controllerPath = Path.join(
+          controllerDir,
+          `${capitalize(bundleName)}${capitalize(featureName)}LayerController.ts`
+        );
+        Fs.writeFileSync(
+          controllerPath,
+          generateControllerTemplate(bundleName, featureName, subDir)
+        );
+
+        // 创建预制体路径
+        // const prefabPath = Path.join( prefabDir, `${capitalize(bundleName)}${capitalize(featureName)}Layer.prefab`);
+
+        this.refreshAssetDB(layerDir);
+        this.refreshAssetDB(controllerDir);
+      } catch (err) {
+        Editor.error('生成Layer失败:', err);
+      }
+
+      // // 在场景中创建节点
+      // Editor.Scene.callSceneScript('layer-generator', 'create-node', {
+      //     name: `${capitalize(bundleName)}${capitalize(featureName)}Layer`,
+      //     prefabPath: prefabPath,
+      //     scriptName: `${capitalize(bundleName)}${capitalize(featureName)}Layer`
+      // }, (err, nodeUuid) => {
+      //     if (err) {
+      //         Editor.error('创建Layer失败：', err);
+      //         return;
+      //     }
+      //     Editor.success('Layer files generated successfully!');
+      // });
     },
-};
+  },
+
+  refreshAssetDB(outputBase) {
+    const relativePath = Path.relative(Editor.Project.path, outputBase);
+
+    const url = 'db://' + relativePath.replace(/\\/g, '/');
+
+    Editor.assetdb.refresh(url, (err) => {
+      if (err) {
+        Editor.error(`刷新资源失败: ${err}`);
+      } else {
+        Editor.log(`已刷新目录: ${url}`);
+      }
+    });
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/packages",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "cocoscreator 2.x plugins",
   "main": "index.js",
   "scripts": {},