update

JNGame

@@ -1 +1 @@
-Subproject commit b9dec0c8e135291446a01f79310515508c79f6fd
+Subproject commit 8ea27bf948eeeee659a244a5bde095886bcf2e47

JisolGameCocos/assets/res/battle/fsm/RoleEntityFSM.json

@@ -1 +0,0 @@
-{"root":{"type":"sequence","config":{"type":"sequence","label":{"tag":"2RY6J1","events":{},"title":"Sequence","group":"composite","name":"Sequence","uuid":"7c895CfOwBCgKYk2gJEdRCX","properties":{},"order":0}},"elements":[],"children":[{"type":"task","config":{"type":"task","label":{"tag":"2RYGFD","events":{"onUpdate":{"node":{"name":"","path":"/"},"component":{"uuid":"c6d20kUSf5F6pvydQ3nzH7S","name":"GRoleEntity"},"method":"onAttack"}},"title":"Task","group":"task","name":"Task","uuid":"917dc/B4bBArq1QrBFaQ6gk","properties":{},"order":1}},"elements":[],"children":[]}]},"refs":[],"blackboard":{"variables":[],"globals":[]},"runtime":"oreo-behavior-creator","version":"1.1.2","uuid":"f9vbt2pPFGiKlXSDAA8M7p"}

JisolGameCocos/assets/res/battle/fsm/RoleEntityFSM.json.meta

@@ -1,11 +0,0 @@
-{
-  "ver": "2.0.1",
-  "importer": "json",
-  "imported": true,
-  "uuid": "4671c524-65e7-4bc8-9ab7-c8bd12241ac5",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}

JisolGameCocos/assets/resources/prefab/battle/role/RoleEntity.prefab

@@ -28,19 +28,10 @@
       },
       {
         "__id__": 6
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 10
-      },
-      {
-        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 8
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -99,98 +90,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "39OM3yMTpFCaO9LSQd5hDg"
   },
-  {
-    "__type__": "57329UxP9VOAa8MciTPhIOm",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9eXqyjhtpIi6L9GHkov+SV"
-  },
-  {
-    "__type__": "0047b40TAlFJaaH5Cj5qbAP",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 7
-    },
-    "logAbort": true,
-    "logInterrupt": true,
-    "logExecute": true,
-    "logUpdate": false,
-    "logLoad": false,
-    "logDestroy": false,
-    "logEnter": false,
-    "logExit": false,
-    "logEnable": false,
-    "logDisable": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "3cStgN8ClNbqN5vzrKZiig"
-  },
-  {
-    "__type__": "e021fzRX91CZbfisWd9maoE",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 9
-    },
-    "jsonAsset": {
-      "__uuid__": "4671c524-65e7-4bc8-9ab7-c8bd12241ac5",
-      "__expectedType__": "cc.JsonAsset"
-    },
-    "frameRate": 0,
-    "startWhenEnabled": true,
-    "pauseWhenDisabled": false,
-    "restartWhenComplete": true,
-    "resetValuesOnRestart": false,
-    "logTaskChanges": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "23a+R8DsZOhL6GPkduwyym"
-  },
-  {
-    "__type__": "c6d20kUSf5F6pvydQ3nzH7S",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 11
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "524mvbh2pCoKfgznMFaCs4"
-  },
   {
     "__type__": "7bbd2ZLN+pAR5d5W2wmy3A0",
     "_name": "",
@@ -201,7 +100,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 5
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -237,6 +136,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "27Fx6O7FRLnbRD+LXrrqfA"
   },
+  {
+    "__type__": "9fc03SnXGhPIpBlRHQ1MpyK",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 7
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "89OuR1/75BxLrKGMeVKN5C"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

JisolGameCocos/assets/script/App.ts

@@ -23,25 +23,13 @@ class JNGLayer extends JNLayer{
 //重写Socket
 class JNGSocket extends JNSocket{
     public url() {
-        return "ws://192.168.0.127:8080/websocket";
+        return "ws://localhost:8080/websocket";
     }
 }
 
 // 重写帧同步
 class JNGSyncFrame extends JNSyncFrame{
 
-    //更新
-    protected onUpdate(): JNFrameInfo {
-        let info = super.onUpdate();
-        
-        if(info){
-            //更新状态机
-            BehaviorManager.getInstance().tick(this.dt);
-        }
-
-        return info;
-    }
-
     protected onResetValue(){
         //重置状态机
         BehaviorManager.deleteInstance();
@@ -106,7 +94,7 @@ export const app = {
     event : EventDispatcher.getIns(), //通知
     proto : NGameMessage.getIns(), //消息
     api : axios.create({
-        baseURL: "http://192.168.0.127:8080",
+        baseURL: "http://localhost:8080",
     }), //请求
     battle : GBattleModeManager.getIns(), //战斗
 }

JisolGameCocos/assets/script/battle/GBaseMode.ts

@@ -7,6 +7,7 @@ export default class GBaseMode extends GObject<{}> {
 
     //添加对象到场景中
     addGObject(obj: GObject<{}>,pos?:Vec2){
+        obj.mode = this;
         this.node.addChild(obj.node);
         if(pos){
             obj.node.setWorldPosition(v3(pos.x,pos.y,0));

JisolGameCocos/assets/script/battle/PVP/GPVPMode.ts

@@ -2,9 +2,9 @@ import { _decorator } from "cc";
 import GBaseMode from "../GBaseMode";
 import { GTactical } from "../entity/GTactical";
 import { Prefab } from "cc";
-import GRoleEntity from "../base/role/impl/GRoleEntity";
 import { instantiate } from "cc";
 import { Vec2 } from "cc";
+import GRolePVPEntity from "../base/role/PVP/GRolePVPEntity";
 const { ccclass, property } = _decorator;
 
 
@@ -38,9 +38,9 @@ export default class GPVPMode extends GBaseMode{
     enemyInfo: GPVPModePlayerInfo = { tactical: GTactical.getTactical2(true),roles: [{},{},{}] };
 
     //玩家宠物
-    playerRoles: GRoleEntity[] = [];
+    playerRoles: GRolePVPEntity[] = [];
     //敌方宠物
-    enemyRoles: GRoleEntity[] = [];
+    enemyRoles: GRolePVPEntity[] = [];
 
     //玩家位置
     playerPos: Vec2 = new Vec2(-400,0);
@@ -65,8 +65,13 @@ export default class GPVPMode extends GBaseMode{
         let pos:Vec2 = this.getInfo(type).tactical.getPosition(index);
         if(!pos) return;
         let role = instantiate(this.rolePrefab);
-        let entity = role.getComponent(GRoleEntity)
+        let entity = role.getComponent(GRolePVPEntity)
+        //赋值阵容
+        entity.ones = type;
+        entity.tactical = this.getInfo(type).tactical;
+        entity.tacticalIndex = index;
         this.addGObject(entity,this.getInfo(type).tactical.getPosition(index,this.getTacticalPos(type)));
+        this.getOnesRole(type).push(entity);
 
     }
 
@@ -82,6 +87,39 @@ export default class GPVPMode extends GBaseMode{
         if(type == GPVPModePlayerEnum.ENEMY) return this.enemyPos;
     }
 
+    //获取阵营角色
+    getOnesRole(type: GPVPModePlayerEnum):GRolePVPEntity[]{
+        if(type == GPVPModePlayerEnum.PLAYER) return this.playerRoles;
+        if(type == GPVPModePlayerEnum.ENEMY) return this.enemyRoles;
+    }
+
+    //获取敌人
+    getEnumy(player:GRolePVPEntity):GRolePVPEntity{
+
+        let enumyOnes = GPVPModePlayerEnum.ENEMY
+        //如果是ENEMY 则 它的敌人是 PLAYER
+        if(player.ones == GPVPModePlayerEnum.ENEMY) enumyOnes = GPVPModePlayerEnum.PLAYER
+
+        //获取敌人
+        let roles = this.getOnesRole(enumyOnes);
+
+        //返回敌人
+        //获取我在第几排
+        let playerXY = player.tactical.getXY(player.tacticalIndex);
+        //通过排数获取最近的敌人
+        let sort = roles.sort((enumy1,enumy2) => {
+            let enumy1XY = enumy1.tactical.getXY(enumy1.tacticalIndex);
+            let enumy2XY = enumy2.tactical.getXY(enumy2.tacticalIndex);
+            return Math.abs((playerXY.y * 1000) - (enumy1XY.y * 1000)) + Math.abs((playerXY.x - enumy1XY.x)) -
+                    Math.abs((playerXY.y * 1000) - (enumy2XY.y * 1000)) + Math.abs((playerXY.x - enumy2XY.x))
+        });
+        console.log(playerXY,sort[0].tactical.getXY(sort[0].tacticalIndex),);
+        return sort[0]
+
+
+
+    }
+    
 }
 
 

JisolGameCocos/assets/script/battle/base/GObject.ts

@@ -1,7 +1,18 @@
 import { JNGSyncProtoBase } from "../../App";
+import GBaseMode from "../GBaseMode";
 
 
 export default class GObject<T> extends JNGSyncProtoBase<T>{
 
+    //当前模式
+    _mode:GBaseMode;
+
+    get mode():GBaseMode{
+        return this._mode;
+    }
+    set mode(value:GBaseMode){
+        this._mode = value;
+    }
+
 }
 

JisolGameCocos/assets/script/battle/base/fsm/GFSMBase.ts

@@ -1,6 +1,86 @@
 
+//流程模式
+export enum GFSMProcessMode{
+    Execute,//正常运行
+    WaitExecute,//等待执行
+}
+
+//流程信息
+export interface GFSMProcessInfo{
+    //备注
+    title:string;
+    //模式
+    mode?:GFSMProcessMode;
+    //执行方法
+    execute?:() => number;
+    //前往
+    to?:number[];
+}
+
 //状态机基类
-export default abstract class GFSMBase{
+export default class GFSMBase{
 
+    //状态流程图
+    process:{[key:number]:GFSMProcessInfo} = {};
+
+    //开始流程Id
+    start:number = 0;
+
+    //当前流程
+    current:number = 0;
+
+    //状态机刷新
+    onUpdate(dt:number){
+
+        if(!this.start) this.start = 0;
+        if(!this.current) this.current = 0;
+
+        //运行流程
+        this.execute(this.process[this.current]);
+
+    }
+
+    //执行流程
+    execute(process:GFSMProcessInfo){
+        if(!process) return;
+
+        process.mode = process.mode || GFSMProcessMode.Execute;
+        process.to = process.to || [];
+
+        let next:number;
+        let isReset:boolean = true;
+
+        //执行流程
+        switch(process.mode){
+            case GFSMProcessMode.Execute:
+                //执行方法
+                next = process.to[process.execute()-1];
+                break;
+            case GFSMProcessMode.WaitExecute:
+                //执行等待方法
+                let state = process.execute();
+                //如果 状态 -1 则 不重置 下一次状态从当前开始流程执行
+                if(state == -1){
+                    isReset = false;
+                }else{
+                    next = state;
+                }
+                break;
+        }
+
+        if(!this.process[next]) next = null;
+
+        if(next){
+            this.current = next;
+            //运行下一个流程
+            this.execute(this.process[next]);
+        }else{
+            if(isReset){
+                //重置
+                this.current = this.start;
+            }
+        }
+
+    }
 
 }

JisolGameCocos/assets/script/battle/base/fsm/GFSMBattle.ts

@@ -0,0 +1,54 @@
+import GRoleBase from "../role/GRoleBase";
+import GFSMBase, { GFSMProcessInfo } from "./GFSMBase";
+
+
+export default abstract class GFSMBattle extends GFSMBase{
+
+    //流程图
+    process: { [key: number]: GFSMProcessInfo; } = {
+        0:{
+            title:"寻找敌人",
+            execute: this.onSeekEnemyProcess.bind(this),
+            to:[1]
+        },
+        1:{
+            title:"攻击敌人",
+            execute: this.onAttackProcess.bind(this),
+        }
+    }
+
+    //锁定的敌人
+    enemy:GRoleBase<any>;
+
+
+    abstract onSeekEnemy():GRoleBase<any>;
+
+    //寻敌流程
+    onSeekEnemyProcess():number{
+
+        if(this.enemy){
+            //如果有敌人 直接 攻击
+            return 1;
+        }
+
+        if(this.enemy = this.onSeekEnemy()){
+            //如果有敌人 直接 攻击
+            return 1;
+        }
+        
+        //负责继续寻敌
+        return 0;
+
+    }
+
+    abstract onAttack();
+
+    //攻击敌人
+    onAttackProcess(){
+        this.onAttack();
+        return 0;
+    }
+
+
+}
+

JisolGameCocos/assets/script/battle/base/fsm/GFSMBattle.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "c6d20914-49fe-45ea-9bf2-750de7cc7ed2",
+  "uuid": "ac1a0b3b-e57a-4718-a27f-39b8e072f74e",
   "files": [],
   "subMetas": {},
   "userData": {}

JisolGameCocos/assets/script/battle/base/fsm/PVP.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "dd2bdaea-c6ea-4d98-8102-c807d059bd25",
+  "uuid": "fe4e5e9b-d1dc-4aaf-9fa8-d089fd6ca00a",
   "files": [],
   "subMetas": {},
   "userData": {}

JisolGameCocos/assets/script/battle/base/fsm/PVP/GFSMPVP.ts

@@ -0,0 +1,25 @@
+import GRoleBase from "../../role/GRoleBase";
+import GRolePVPEntity from "../../role/PVP/GRolePVPEntity";
+import GFSMBattle from "../GFSMBattle";
+
+
+//PVP 状态机
+export default class GFSMPVP extends GFSMBattle{
+
+    player:GRolePVPEntity;
+
+    constructor(player:GRolePVPEntity){
+        super();
+        this.player = player;
+    }
+
+    //寻敌
+    onSeekEnemy(): GRoleBase<any> {
+        return this.player.mode.getEnumy(this.player);
+    }
+
+    //攻击
+    onAttack() {
+    }
+}
+

JisolGameCocos/assets/script/battle/base/fsm/PVP/GFSMPVP.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "bf6010d3-4d2e-4ecf-abc4-a4e770ebd5df",
+  "uuid": "86cd6fa1-1340-4343-8929-7c5363727b1c",
   "files": [],
   "subMetas": {},
   "userData": {}

JisolGameCocos/assets/script/battle/base/fsm/impl.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "03218a59-18c0-42bc-aa22-117d45bc314a",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

JisolGameCocos/assets/script/battle/base/fsm/impl/GFSMRoleController.ts

@@ -1,9 +0,0 @@
-import GFSMBase from "../GFSMBase";
-
-//角色状态机实现
-export default class GFSMRoleController extends GFSMBase{
-
-    //状态机更新
-
-}
-

JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts

@@ -1,7 +1,7 @@
 import { _decorator, sp } from "cc";
-import { JNGSyncProtoBase } from "../../../App";
 import GObject from "../GObject";
-import { BehaviorStatus } from "../../../../../extensions/Behavior Creator/runtime/main";
+import { JNFrameInfo } from "../../../../../extensions/ngame/assets/ngame/sync/frame/JNSyncFrame";
+import GFSMBase from "../fsm/GFSMBase";
 const { ccclass, property } = _decorator;
 
 //角色基类
@@ -10,17 +10,28 @@ export default abstract class GRoleBase<T> extends GObject<T>{
     @property(sp.Skeleton)
     spine:sp.Skeleton;
 
-    onLoad(){
+    //状态机
-        super.onLoad();
+    fsm:GFSMBase;
-        if(!this.spine) this.spine = this.node.getComponent(sp.Skeleton);
 
+    onLoad(){
+        if(!this.spine) this.spine = this.node.getComponent(sp.Skeleton);
         //如果没有生成则直接销毁
+        if(!this.spine) {
             this.node.removeFromParent();
+            return;
         }
 
-    //攻击
+        //创建角色状态机
-    public onAttack(data){
+        this.fsm = this.fsmCreate();
-        return BehaviorStatus.Success;
+
+    }
+
+    //创建一个状态机
+    protected abstract fsmCreate():GFSMBase;
+
+    onSyncUpdate(dt: number,frame:JNFrameInfo, input?: T){
+        //更新状态机
+        this.fsm.onUpdate(dt);
     }
 
 }

JisolGameCocos/assets/script/battle/base/role/PVP.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "ae55abd4-8e9d-4e2a-859f-d8c2d518c608",
+  "uuid": "34152d1b-ca03-4bb1-a970-692cd8995991",
   "files": [],
   "subMetas": {},
   "userData": {}

JisolGameCocos/assets/script/battle/base/role/PVP/GRolePVPEntity.ts

@@ -0,0 +1,33 @@
+import { _decorator } from "cc";
+import GRoleBase from "../GRoleBase";
+import GFSMBase from "../../fsm/GFSMBase";
+import GFSMPVP from "../../fsm/PVP/GFSMPVP";
+import GPVPMode, { GPVPModePlayerEnum } from "../../../PVP/GPVPMode";
+import { GTactical } from "../../../entity/GTactical";
+const { ccclass, property } = _decorator;
+
+//PVP 角色
+@ccclass('GRolePVPEntity')
+export default class GRolePVPEntity extends GRoleBase<{}>{
+
+    //所属阵容
+    ones:GPVPModePlayerEnum;
+
+    //在阵容中的下标
+    tacticalIndex:number;
+    tactical:GTactical;
+    
+
+    get mode():GPVPMode{
+        return super.mode as GPVPMode;
+    }
+    set mode(value:GPVPMode){
+        this._mode = value;
+    }
+
+    protected fsmCreate(): GFSMBase {
+        return new GFSMPVP(this);
+    }
+    
+}
+

JisolGameCocos/assets/script/battle/base/role/PVP/GRolePVPEntity.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "9fc034a7-5c68-4f22-9065-447435329c8a",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/script/battle/base/role/impl.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "b2af28db-e925-419f-81b8-3bf755a3224f",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

JisolGameCocos/assets/script/battle/base/role/impl/GRoleEntity.ts

@@ -1,16 +0,0 @@
-import { _decorator } from "cc";
-import GRoleBase from "../GRoleBase";
-const { ccclass, property } = _decorator;
-
-/**
- * 基础实现
- */
-@ccclass('GRoleEntity')
-export default class GRoleEntity extends GRoleBase<{}> {
-
-    onLoad(){
-        super.onLoad();
-    }
-
-}
-

JisolGameCocos/assets/script/battle/entity/GTactical.ts

@@ -62,15 +62,34 @@ export class GTactical{
 
     //返回阵法位置
     getPosition(index:number,father:Vec2 = v2(0,0)){
+
+        let pos;
+        if(pos = this.getXY(index)){
+            return father.clone().add(GTactical.pos[pos.y][pos.x].clone());
+        }
+        return null;
+        
+    }
+
+    //返回XY
+    getXY(index:number):Vec2{
         for(let i = 0;i < 3;i++){
             for(let j = 0;j < 3;j++){
                 let tag = this.tactical[i][j];
                 if(tag == index){
-                    return father.clone().add(GTactical.pos[i][j].clone());
+                    return v2(j,i);
                 }
             }
         }
+        return null;
+    }
 
+    //返回我在第几排
+    getRow(index:number):number{
+        let pos;
+        if(pos = this.getXY(index)){
+            return pos.y;
+        }
         return null;
     }
 

JisolGameCocos/extensions/Behavior Creator/package-lock.json

@@ -0,0 +1,12 @@
+{
+    "name": "oreo-behavior-creator",
+    "version": "1.1.2",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "oreo-behavior-creator",
+            "version": "1.1.2"
+        }
+    }
+}

JisolGameCocos/extensions/Behavior Creator/plugin/package-lock.json

@@ -1,276 +1,352 @@
 {
     "name": "oreo-behavior-creator",
     "version": "1.0.0",
-    "lockfileVersion": 1,
+    "lockfileVersion": 3,
     "requires": true,
+    "packages": {
+        "": {
+            "name": "oreo-behavior-creator",
+            "version": "1.0.0",
             "dependencies": {
-        "@electron/remote": {
+                "@electron/remote": "^2.0.8",
+                "fs-extra": "^10.0.0",
+                "request": "^2.88.2",
+                "vue": "^2.6.14"
+            }
+        },
+        "node_modules/@electron/remote": {
             "version": "2.0.8",
             "resolved": "https://registry.npmmirror.com/@electron/remote/-/remote-2.0.8.tgz",
-            "integrity": "sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw=="
+            "integrity": "sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==",
+            "peerDependencies": {
+                "electron": ">= 13.0.0"
+            }
         },
-        "ajv": {
+        "node_modules/ajv": {
             "version": "6.12.6",
             "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
             "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-            "requires": {
+            "dependencies": {
                 "fast-deep-equal": "^3.1.1",
                 "fast-json-stable-stringify": "^2.0.0",
                 "json-schema-traverse": "^0.4.1",
                 "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
             }
         },
-        "asn1": {
+        "node_modules/asn1": {
             "version": "0.2.6",
             "resolved": "https://registry.npmmirror.com/asn1/-/asn1-0.2.6.tgz",
             "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-            "requires": {
+            "dependencies": {
                 "safer-buffer": "~2.1.0"
             }
         },
-        "assert-plus": {
+        "node_modules/assert-plus": {
             "version": "1.0.0",
             "resolved": "https://registry.npmmirror.com/assert-plus/-/assert-plus-1.0.0.tgz",
-            "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
+            "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+            "engines": {
+                "node": ">=0.8"
+            }
         },
-        "asynckit": {
+        "node_modules/asynckit": {
             "version": "0.4.0",
             "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
             "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
         },
-        "aws-sign2": {
+        "node_modules/aws-sign2": {
             "version": "0.7.0",
             "resolved": "https://registry.npmmirror.com/aws-sign2/-/aws-sign2-0.7.0.tgz",
-            "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="
+            "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+            "engines": {
+                "node": "*"
+            }
         },
-        "aws4": {
+        "node_modules/aws4": {
             "version": "1.11.0",
             "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.11.0.tgz",
             "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
         },
-        "bcrypt-pbkdf": {
+        "node_modules/bcrypt-pbkdf": {
             "version": "1.0.2",
             "resolved": "https://registry.npmmirror.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
             "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-            "requires": {
+            "dependencies": {
                 "tweetnacl": "^0.14.3"
             }
         },
-        "caseless": {
+        "node_modules/caseless": {
             "version": "0.12.0",
             "resolved": "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz",
             "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
         },
-        "combined-stream": {
+        "node_modules/combined-stream": {
             "version": "1.0.8",
             "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
             "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "requires": {
+            "dependencies": {
                 "delayed-stream": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
             }
         },
-        "core-util-is": {
+        "node_modules/core-util-is": {
             "version": "1.0.2",
             "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz",
             "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
         },
-        "dashdash": {
+        "node_modules/dashdash": {
             "version": "1.14.1",
             "resolved": "https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz",
             "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-            "requires": {
+            "dependencies": {
                 "assert-plus": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10"
             }
         },
-        "delayed-stream": {
+        "node_modules/delayed-stream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "engines": {
+                "node": ">=0.4.0"
+            }
         },
-        "ecc-jsbn": {
+        "node_modules/ecc-jsbn": {
             "version": "0.1.2",
             "resolved": "https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
             "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-            "requires": {
+            "dependencies": {
                 "jsbn": "~0.1.0",
                 "safer-buffer": "^2.1.0"
             }
         },
-        "extend": {
+        "node_modules/extend": {
             "version": "3.0.2",
             "resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
             "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
         },
-        "extsprintf": {
+        "node_modules/extsprintf": {
             "version": "1.3.0",
             "resolved": "https://registry.npmmirror.com/extsprintf/-/extsprintf-1.3.0.tgz",
-            "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
+            "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+            "engines": [
+                "node >=0.6.0"
+            ]
         },
-        "fast-deep-equal": {
+        "node_modules/fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
         },
-        "fast-json-stable-stringify": {
+        "node_modules/fast-json-stable-stringify": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
             "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
         },
-        "forever-agent": {
+        "node_modules/forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmmirror.com/forever-agent/-/forever-agent-0.6.1.tgz",
-            "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
+            "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+            "engines": {
+                "node": "*"
+            }
         },
-        "form-data": {
+        "node_modules/form-data": {
             "version": "2.3.3",
             "resolved": "https://registry.npmmirror.com/form-data/-/form-data-2.3.3.tgz",
             "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-            "requires": {
+            "dependencies": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.6",
                 "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 0.12"
             }
         },
-        "fs-extra": {
+        "node_modules/fs-extra": {
             "version": "10.1.0",
             "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
             "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-            "requires": {
+            "dependencies": {
                 "graceful-fs": "^4.2.0",
                 "jsonfile": "^6.0.1",
                 "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "getpass": {
+        "node_modules/getpass": {
             "version": "0.1.7",
             "resolved": "https://registry.npmmirror.com/getpass/-/getpass-0.1.7.tgz",
             "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-            "requires": {
+            "dependencies": {
                 "assert-plus": "^1.0.0"
             }
         },
-        "graceful-fs": {
+        "node_modules/graceful-fs": {
             "version": "4.2.10",
             "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz",
             "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
         },
-        "har-schema": {
+        "node_modules/har-schema": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz",
-            "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="
+            "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "har-validator": {
+        "node_modules/har-validator": {
             "version": "5.1.5",
             "resolved": "https://registry.npmmirror.com/har-validator/-/har-validator-5.1.5.tgz",
             "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-            "requires": {
+            "deprecated": "this library is no longer supported",
+            "dependencies": {
                 "ajv": "^6.12.3",
                 "har-schema": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
             }
         },
-        "http-signature": {
+        "node_modules/http-signature": {
             "version": "1.2.0",
             "resolved": "https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz",
             "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-            "requires": {
+            "dependencies": {
                 "assert-plus": "^1.0.0",
                 "jsprim": "^1.2.2",
                 "sshpk": "^1.7.0"
+            },
+            "engines": {
+                "node": ">=0.8",
+                "npm": ">=1.3.7"
             }
         },
-        "is-typedarray": {
+        "node_modules/is-typedarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz",
             "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
         },
-        "isstream": {
+        "node_modules/isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz",
             "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
         },
-        "jsbn": {
+        "node_modules/jsbn": {
             "version": "0.1.1",
             "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-0.1.1.tgz",
             "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
         },
-        "json-schema": {
+        "node_modules/json-schema": {
             "version": "0.4.0",
             "resolved": "https://registry.npmmirror.com/json-schema/-/json-schema-0.4.0.tgz",
             "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
         },
-        "json-schema-traverse": {
+        "node_modules/json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
             "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
-        "json-stringify-safe": {
+        "node_modules/json-stringify-safe": {
             "version": "5.0.1",
             "resolved": "https://registry.npmmirror.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
             "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
         },
-        "jsonfile": {
+        "node_modules/jsonfile": {
             "version": "6.1.0",
             "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
             "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-            "requires": {
+            "dependencies": {
-                "graceful-fs": "^4.1.6",
                 "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
             }
         },
-        "jsprim": {
+        "node_modules/jsprim": {
             "version": "1.4.2",
             "resolved": "https://registry.npmmirror.com/jsprim/-/jsprim-1.4.2.tgz",
             "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-            "requires": {
+            "dependencies": {
                 "assert-plus": "1.0.0",
                 "extsprintf": "1.3.0",
                 "json-schema": "0.4.0",
                 "verror": "1.10.0"
+            },
+            "engines": {
+                "node": ">=0.6.0"
             }
         },
-        "mime-db": {
+        "node_modules/mime-db": {
             "version": "1.52.0",
             "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "engines": {
+                "node": ">= 0.6"
+            }
         },
-        "mime-types": {
+        "node_modules/mime-types": {
             "version": "2.1.35",
             "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
             "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "requires": {
+            "dependencies": {
                 "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
             }
         },
-        "oauth-sign": {
+        "node_modules/oauth-sign": {
             "version": "0.9.0",
             "resolved": "https://registry.npmmirror.com/oauth-sign/-/oauth-sign-0.9.0.tgz",
-            "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+            "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+            "engines": {
+                "node": "*"
+            }
         },
-        "performance-now": {
+        "node_modules/performance-now": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz",
             "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
         },
-        "psl": {
+        "node_modules/psl": {
             "version": "1.8.0",
             "resolved": "https://registry.npmmirror.com/psl/-/psl-1.8.0.tgz",
             "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
         },
-        "punycode": {
+        "node_modules/punycode": {
             "version": "2.1.1",
             "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "qs": {
+        "node_modules/qs": {
             "version": "6.5.3",
             "resolved": "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz",
-            "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
+            "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+            "engines": {
+                "node": ">=0.6"
+            }
         },
-        "request": {
+        "node_modules/request": {
             "version": "2.88.2",
             "resolved": "https://registry.npmmirror.com/request/-/request-2.88.2.tgz",
             "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-            "requires": {
+            "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+            "dependencies": {
                 "aws-sign2": "~0.7.0",
                 "aws4": "^1.8.0",
                 "caseless": "~0.12.0",
@@ -291,23 +367,40 @@
                 "tough-cookie": "~2.5.0",
                 "tunnel-agent": "^0.6.0",
                 "uuid": "^3.3.2"
+            },
+            "engines": {
+                "node": ">= 6"
             }
         },
-        "safe-buffer": {
+        "node_modules/safe-buffer": {
             "version": "5.2.1",
             "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
                 },
-        "safer-buffer": {
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/safer-buffer": {
             "version": "2.1.2",
             "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
         },
-        "sshpk": {
+        "node_modules/sshpk": {
             "version": "1.17.0",
             "resolved": "https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz",
             "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
-            "requires": {
+            "dependencies": {
                 "asn1": "~0.2.3",
                 "assert-plus": "^1.0.0",
                 "bcrypt-pbkdf": "^1.0.0",
@@ -317,59 +410,83 @@
                 "jsbn": "~0.1.0",
                 "safer-buffer": "^2.0.2",
                 "tweetnacl": "~0.14.0"
+            },
+            "bin": {
+                "sshpk-conv": "bin/sshpk-conv",
+                "sshpk-sign": "bin/sshpk-sign",
+                "sshpk-verify": "bin/sshpk-verify"
+            },
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "tough-cookie": {
+        "node_modules/tough-cookie": {
             "version": "2.5.0",
             "resolved": "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz",
             "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-            "requires": {
+            "dependencies": {
                 "psl": "^1.1.28",
                 "punycode": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.8"
             }
         },
-        "tunnel-agent": {
+        "node_modules/tunnel-agent": {
             "version": "0.6.0",
             "resolved": "https://registry.npmmirror.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
             "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-            "requires": {
+            "dependencies": {
                 "safe-buffer": "^5.0.1"
+            },
+            "engines": {
+                "node": "*"
             }
         },
-        "tweetnacl": {
+        "node_modules/tweetnacl": {
             "version": "0.14.5",
             "resolved": "https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz",
             "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
         },
-        "universalify": {
+        "node_modules/universalify": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz",
-            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
         },
-        "uri-js": {
+        "node_modules/uri-js": {
             "version": "4.4.1",
             "resolved": "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz",
             "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "requires": {
+            "dependencies": {
                 "punycode": "^2.1.0"
             }
         },
-        "uuid": {
+        "node_modules/uuid": {
             "version": "3.4.0",
             "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
-            "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+            "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+            "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+            "bin": {
+                "uuid": "bin/uuid"
+            }
         },
-        "verror": {
+        "node_modules/verror": {
             "version": "1.10.0",
             "resolved": "https://registry.npmmirror.com/verror/-/verror-1.10.0.tgz",
             "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-            "requires": {
+            "engines": [
+                "node >=0.6.0"
+            ],
+            "dependencies": {
                 "assert-plus": "^1.0.0",
                 "core-util-is": "1.0.2",
                 "extsprintf": "^1.2.0"
             }
         },
-        "vue": {
+        "node_modules/vue": {
             "version": "2.6.14",
             "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz",
             "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="

JisolGameCocos/extensions/ngame

@@ -1 +1 @@
-Subproject commit ae5e3350cfeea1cbe82196b1f6e75db55d67f749
+Subproject commit 90633378ad0023e59a62faa601d66889b46cebc6