@cc-component/cc-guide 1.0.7 → 1.0.9

package/assets/guide/guide/GuideCenter.ts

@@ -31,13 +31,12 @@ export class GuideCenter {
 
     callClick: (step: number) => void;
     callJumpWindow: (urls: string[]) => void;
-    callFinishGroup: (groupId: number) => void;
+    callFinishGroup: (groupId: number, enableGroup: number) => void;
     /** 游戏初始化模块 */
     guide: Guide = null!;
     node: Node;
     /** 资源路径 */
     path: string = "guide/tableJS/";
-    bundleName: string = "guide";
 
     /** 数据缓存 */
     data: Map<string, any> = new Map();
@@ -71,7 +70,7 @@ export class GuideCenter {
             this.step = step;
             // 引导最大步数（最后步骤引导完后自动释放引导相关资源）
             //this.guide.GuideModel.last = 2;
-            this.load(this.bundleName, [this.guide.GuideModel.res_dir], (pro) => {
+            this.load(this.param.bundleName, [this.param.prefabPath], (pro) => {
                 // Log.log("加载进度：", pro);
             }).then(async () => {
                 //await this.loadDirJsonAsync()
@@ -89,8 +88,7 @@ export class GuideCenter {
 
 
     getAsset<T>(name: string) {
-        return assetManager.getBundle(this.bundleName).get(name) as T;
-
+        return assetManager.getBundle(this.param.bundleName).get(name) as T;
     }
     /**加载视频 */
     load(bundleName: string, dirs: string[], pro: (pro: number) => void) {
@@ -207,8 +205,8 @@ export class GuideCenter {
                 } else {
                     this.step = 100000
                     step_net = this.step;
-                    GuideModule.GuideCenter.callFinishGroup?.(curren.data.groupID)
                 }
+                GuideModule.GuideCenter.callFinishGroup?.(curren.data.groupID, enableGroup)
                 this.callMessageNet?.(step_net, () => { }) //功能引导
             }
             else {
@@ -321,7 +319,7 @@ export class GuideCenter {
     OnMessageJumpWindow(call: (urls: string[]) => void) {
         this.callJumpWindow = call
     }
-    OnMessageFinishGroup(call: (groupId: number) => void) {
+    OnMessageFinishGroup(call: (groupId: number, enableGroup: number) => void) {
         this.callFinishGroup = call
     }
 
@@ -357,7 +355,7 @@ export class GuideCenter {
     }
 
 
-    spriteRootPath(name: string) { return `${this.param.spriteRootPath}/${name}` }
+    spriteRootPath(name: string) { return `${this.param.spritePath}/${name}` }
 }
 
 

package/assets/guide/guide/model/GuideCommon.ts

@@ -13,8 +13,10 @@ export enum GuideCommon {
 export interface IGuideData {
     /**资源bundle-引导 */
     bundleName: string;
-    /**图片资源根路径 */
-    spriteRootPath: string;
+    /**预制体根路径 */
+    prefabPath: string;
+    /**图片根路径 */
+    spritePath: string;
     /**资源表json */
     tableGuide: Map<number, ITableGuide>;
 }

package/assets/guide/guide/model/GuideModelComp.ts

@@ -87,6 +87,14 @@ export class GuideModelComp {
 
     loadData(param: IGuideData) {
         this.table = param.tableGuide
+
+        /** 资源文件夹 */
+        this.res_dir = param.prefabPath;
+        /** 遮罩预制资源 */
+        this.res_mask = `${param.prefabPath}/mask`
+        /** 提示预制资源 */
+        this.res_prompt = `${param.prefabPath}/prompt`
+
         this.prompts.push({ is_week: false, is_finish: false, data: null })
         this.table.forEach((element, key) => {
             const data = { is_week: false, is_finish: key === 2 ? false : false, data: element }

package/assets/guide/interface/GuideModule.ts

@@ -8,10 +8,10 @@ import { Log } from "../common/Log";
 /**引导模块 */
 class GuideModule {
   static async Init(node: Node, step: number, param: IGuideData) {
-    Log.enable(false);
     await GuideSDK.init(node, step, param)
     //await GuideModule.TaskInit(MiddleCenter.GetLayer(LayerType.Task), 0)
   }
+  static Debug(enable: boolean) { Log.enable(enable); }
   static Check(step: number) { GuideSDK.check(step); }
   /** 开始指定功能引导组-注意此方法需要更新服务器的步骤 */
   static StartGuideGroup<T>(group_id: number): void { GuideSDK.startGuideGroup(group_id); }
@@ -22,7 +22,7 @@ class GuideModule {
   static OnMessageStepNet(call: (step: number, finish: Function) => void) { GuideCenter.instance.OnMessageStepNet(call) }
   static OnMessageClick(call: (step: number) => void) { GuideCenter.instance.OnMessageClick(call) }
   static OnMessageJumpWindow(call: (urls: string[]) => void) { GuideCenter.instance.OnMessageJumpWindow(call) }
-  static OnMessageFinishGroup(call: (groupId: number) => void) { GuideCenter.instance.OnMessageFinishGroup(call) }
+  static OnMessageFinishGroup(call: (groupId: number, enableGroup: number) => void) { GuideCenter.instance.OnMessageFinishGroup(call) }
   /**是否引导中 */
   static GuideShow(): boolean { return GuideSDK.GuideShow() };
 

package/assets/guide/interface/Interface.ts

@@ -25,10 +25,11 @@ declare global {
         /**监听跳转界面 */
         function OnMessageJumpWindow(call: (urls: string[]) => void)
         /**监听完成引导组引导 */
-        function OnMessageFinishGroup(call: (groupId: number) => void)
+        function OnMessageFinishGroup(call: (groupId: number, enableGroup: number) => void)
         /**是否引导中 */
         function GuideShow(): boolean;
-
+        /**开启日志打印 */
+        function Debug(enable: boolean)
         //任务
         // const TaskCenter: TaskCenter;
         // function TaskInit(node: Node, step?: number, step_week?: number)

package/assets/guide/interface/guide/prefab/mask.prefab

@@ -652,7 +652,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

package/assets/guide/interface/guide/prefab/prompt.prefab

@@ -672,7 +672,7 @@
       "b": 10,
       "a": 255
     },
-    "_string": "简薇",
+    "_string": "角色名",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 36,
@@ -1003,7 +1003,7 @@
       "b": 145,
       "a": 255
     },
-    "_string": "你好",
+    "_string": "文本",
     "_horizontalAlign": 0,
     "_verticalAlign": 0,
     "_actualFontSize": 38,
@@ -1308,8 +1308,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 320,
-      "height": 320
+      "width": 100,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1344,12 +1344,9 @@
       "b": 255,
       "a": 255
     },
-    "_skeletonData": {
-      "__uuid__": "0020ca0a-083c-4f03-add8-c00d8e73845e",
-      "__expectedType__": "sp.SkeletonData"
-    },
-    "defaultSkin": "default",
-    "defaultAnimation": "idle",
+    "_skeletonData": null,
+    "defaultSkin": "",
+    "defaultAnimation": "",
     "_premultipliedAlpha": true,
     "_timeScale": 0.75,
     "_preCacheMode": 0,

package/assets/guide/interface/guide.meta

@@ -5,7 +5,5 @@
   "uuid": "2b013440-a00b-4cec-96ad-301126200a44",
   "files": [],
   "subMetas": {},
-  "userData": {
-    "isBundle": true
-  }
+  "userData": {}
 }

package/package.json

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

package/assets/guide/interface/guide/prefab/skeleton.atlas

@@ -1,20 +0,0 @@
-
-skeleton.png
-size: 231,231
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-guide_circle_b
-  rotate: false
-  xy: 2, 69
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-guide_hand
-  rotate: false
-  xy: 2, 2
-  size: 67, 65
-  orig: 68, 68
-  offset: 1, 0
-  index: -1

package/assets/guide/interface/guide/prefab/skeleton.atlas.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "*",
-  "imported": true,
-  "uuid": "64af9f0e-f0ba-40e5-9c2c-566c01ec2876",
-  "files": [
-    ".atlas",
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}

package/assets/guide/interface/guide/prefab/skeleton.json

@@ -1 +0,0 @@
-{"skeleton":{"hash":"xKe3zNwGjXsLX0Yz3VA3CZB5QOE","spine":"3.8.84","x":-160,"y":-160,"width":320,"height":320,"images":"./images/","audio":""},"bones":[{"name":"root"},{"name":"bone","parent":"root","length":141.44},{"name":"bone2","parent":"bone","length":33.63,"rotation":145.53,"x":99.22,"y":-94.67},{"name":"bone3","parent":"bone2","length":59.7,"rotation":-25.54,"x":33.63},{"name":"bone4","parent":"bone3","length":20.23,"rotation":0.74,"x":72.33,"y":22.83},{"name":"bone5","parent":"bone4","length":12.51,"rotation":-5.13,"x":20.23},{"name":"bone6","parent":"bone3","length":23.63,"rotation":35.63,"x":33.77,"y":42.79},{"name":"bone7","parent":"bone"},{"name":"bone8","parent":"root","length":233.57,"rotation":90}],"slots":[{"name":"guide_circle_b","bone":"bone8","attachment":"guide_circle_b"},{"name":"guide_hand","bone":"root","attachment":"guide_hand"}],"skins":[{"name":"default","attachments":{"guide_circle_b":{"guide_circle_b":{"rotation":-90,"width":320,"height":320}},"guide_hand":{"guide_hand":{"type":"mesh","uvs":[0.43171,0.96723,0.14312,0.80076,0.02665,0.68429,0.07165,0.57312,0.21988,0.52679,0.16995,0.45891,0.12723,0.38518,0.08223,0.30312,0.05709,0.21444,0.06503,0.13768,0.13253,0.05429,0.21856,0.05694,0.28473,0.10988,0.34165,0.21576,0.45153,0.2602,0.59951,0.24583,0.78469,0.29656,0.89753,0.39444,0.96779,0.55001,1,0.76503,1,0.88282,0.9015,1,0.75591,1,0.27812,0.87753,0.32047,0.60722],"triangles":[2,3,1,1,3,4,13,7,12,12,7,11,9,10,11,11,7,8,9,11,8,5,13,14,5,6,13,6,7,13,4,5,14,1,23,0,23,1,24,1,4,24,0,23,17,17,23,24,24,4,15,0,17,18,17,24,16,24,15,16,4,14,15,18,19,22,21,22,20,20,22,19,22,0,18],"vertices":[2,2,47.84,45.86,0.536,3,-6.95,47.5,0.464,3,2,93.01,49.41,7.0E-4,3,32.28,70.18,0.488,6,14.75,23.13,0.5113,1,6,35.71,15.24,1,2,4,-7.86,40.4,0.00104,6,36.37,-1.06,0.99896,2,3,59.33,42.51,0.28,6,20.61,-15.12,0.72,4,3,70.72,43.77,2.0E-4,4,-1.34,20.97,0.83169,5,-23.36,18.95,0.0051,6,30.6,-20.73,0.16301,3,4,10.25,20.83,0.87101,5,-11.81,19.86,0.09649,6,40.03,-27.46,0.0325,3,4,22.97,20.39,0.56993,5,0.9,20.55,0.4289,6,50.21,-35.1,0.00117,2,4,35.08,17.17,0.19548,5,13.26,18.43,0.80452,2,4,43.51,10.9,0.03594,5,22.21,12.94,0.96406,1,5,28.46,-0.24,1,1,5,23.08,-10.63,1,3,3,104.03,6.52,0.00411,4,31.48,-16.71,0.075,5,12.7,-15.64,0.9209,3,3,87.69,7.02,0.12594,4,15.15,-16,0.65399,5,-3.63,-16.4,0.22007,3,3,74.98,-2.9,0.7038,4,2.32,-25.76,0.2946,5,-15.54,-27.26,0.00161,1,3,66.61,-21.31,1,1,3,48.05,-39.67,1,1,3,28.84,-46.31,1,2,2,19.85,-42.18,0.536,3,5.74,-44.01,0.464,1,2,-0.31,-20.55,1,1,2,-9.38,-7.35,1,1,2,-7.35,13.37,1,1,2,8.97,24.58,1,1,3,14.06,59.5,1,2,3,43.02,36.13,0.8,6,3.64,-10.8,0.2],"hull":23,"edges":[10,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,0,36,44,0,0,46,46,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,0,2,34,46,8,48,48,32,8,30],"width":136,"height":136}}}}],"animations":{"idle":{"bones":{"bone8":{"rotate":[{},{"time":0.3333,"angle":120},{"time":0.6667,"angle":-120},{"time":1},{"time":1.3333,"angle":120},{"time":1.6667,"angle":-120},{"time":2}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.5,"x":1.1,"y":1.1,"curve":0.25,"c3":0.75},{"time":1,"curve":0.25,"c3":0.75},{"time":1.5,"x":1.1,"y":1.1,"curve":0.25,"c3":0.75},{"time":2}]},"bone7":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.2333,"x":1.2,"y":1.2,"curve":0.25,"c3":0.75},{"time":0.4333,"curve":0.25,"c3":0.75},{"time":0.6667,"x":1.2,"y":1.2,"curve":0.25,"c3":0.75},{"time":0.9,"curve":0.25,"c3":0.75},{"time":1.1,"x":1.2,"y":1.2,"curve":0.25,"c3":0.75},{"time":1.3333}]},"bone2":{"translate":[{"x":10.92,"y":2.3,"curve":0.25,"c3":0.75},{"time":0.5,"x":5.66,"y":1.99,"curve":0.25,"c3":0.75},{"time":1,"x":10.92,"y":2.3,"curve":0.25,"c3":0.75},{"time":1.5,"x":5.66,"y":1.99,"curve":0.25,"c3":0.75},{"time":2,"x":10.92,"y":2.3}]},"bone3":{"rotate":[{"angle":-0.21,"curve":0.371,"c2":0.62,"c3":0.71},{"time":0.1,"angle":-1.11,"curve":0.25,"c3":0.75},{"time":0.6,"angle":8.21,"curve":0.243,"c3":0.689,"c4":0.75},{"time":1,"angle":-0.21,"curve":0.371,"c2":0.62,"c3":0.71},{"time":1.1,"angle":-1.11,"curve":0.25,"c3":0.75},{"time":1.6,"angle":8.21,"curve":0.243,"c3":0.689,"c4":0.75},{"time":2,"angle":-0.21}]},"bone4":{"rotate":[{"angle":-2.34,"curve":0.382,"c2":0.57,"c3":0.735},{"time":0.1667,"angle":-5.18,"curve":0.25,"c3":0.75},{"time":0.6667,"angle":4.81,"curve":0.243,"c3":0.649,"c4":0.6},{"time":1,"angle":-2.34,"curve":0.382,"c2":0.57,"c3":0.735},{"time":1.1667,"angle":-5.18,"curve":0.25,"c3":0.75},{"time":1.6667,"angle":4.81,"curve":0.243,"c3":0.649,"c4":0.6},{"time":2,"angle":-2.34}]},"bone5":{"rotate":[{"angle":-4.96,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2667,"angle":-19.58,"curve":0.25,"c3":0.75},{"time":0.7667,"angle":9.65,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1,"angle":-4.96,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.2667,"angle":-19.58,"curve":0.25,"c3":0.75},{"time":1.7667,"angle":9.65,"curve":0.25,"c3":0.625,"c4":0.5},{"time":2,"angle":-4.96}]},"bone6":{"rotate":[{"angle":-1.56,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2667,"angle":-5.94,"curve":0.25,"c3":0.75},{"time":0.7667,"angle":2.82,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1,"angle":-1.56,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.2667,"angle":-5.94,"curve":0.25,"c3":0.75},{"time":1.7667,"angle":2.82,"curve":0.25,"c3":0.625,"c4":0.5},{"time":2,"angle":-1.56}]}}}}}

package/assets/guide/interface/guide/prefab/skeleton.json.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.2.7",
-  "importer": "spine-data",
-  "imported": true,
-  "uuid": "0020ca0a-083c-4f03-add8-c00d8e73845e",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "atlasUuid": "64af9f0e-f0ba-40e5-9c2c-566c01ec2876"
-  }
-}

package/assets/guide/interface/guide/prefab/skeleton.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a0a94430-6739-4c1a-9228-aaf29af7fdd4",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a0a94430-6739-4c1a-9228-aaf29af7fdd4@6c48a",
-      "displayName": "skeleton",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a0a94430-6739-4c1a-9228-aaf29af7fdd4",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "a0a94430-6739-4c1a-9228-aaf29af7fdd4@f9941",
-      "displayName": "skeleton",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": -33.5,
-        "offsetY": 0,
-        "trimX": 2,
-        "trimY": 2,
-        "width": 160,
-        "height": 227,
-        "rawWidth": 231,
-        "rawHeight": 231,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -80,
-            -113.5,
-            0,
-            80,
-            -113.5,
-            0,
-            -80,
-            113.5,
-            0,
-            80,
-            113.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            2,
-            229,
-            162,
-            229,
-            2,
-            2,
-            162,
-            2
-          ],
-          "nuv": [
-            0.008658008658008658,
-            0.008658008658008658,
-            0.7012987012987013,
-            0.008658008658008658,
-            0.008658008658008658,
-            0.9913419913419913,
-            0.7012987012987013,
-            0.9913419913419913
-          ],
-          "minPos": [
-            -80,
-            -113.5,
-            0
-          ],
-          "maxPos": [
-            80,
-            113.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a0a94430-6739-4c1a-9228-aaf29af7fdd4@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a0a94430-6739-4c1a-9228-aaf29af7fdd4@6c48a"
-  }
-}