Commit 7bf24277 authored by Tt's avatar Tt

Merge branch 'master' of http://vcs.ireadabc.com/template/OP33_PLUS into master

parents 8d97bb52 58c7199b
No preview for this file type
{ {"ver":"1.1.2","uuid":"8ce9ad31-01f1-4d18-8881-390d12c43f85","isBundle":false,"bundleName":"","priority":1,"compressionType":{},"optimizeHotUpdate":{},"inlineSpriteFrames":{},"isRemoteBundle":{"ios":false,"android":false},"subMetas":{}}
"ver": "1.1.2", \ No newline at end of file
"uuid": "9f8f3926-37fb-4850-a71c-e7fe9d36e949",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "77c6afce-5be9-476b-b3ee-fc07063ed348", "uuid": "9b454182-e836-4e91-b23f-aa310d9a76a1",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "c75b9114-9f11-4753-a591-ea3779961074", "uuid": "e231fbcd-a97c-4780-a755-f1d87649e37a",
"downloadMode": 0, "downloadMode": 0,
"duration": 7.74, "duration": 7.74,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "b767b3a2-208b-4790-935a-e83276a8277b", "uuid": "b4157452-9460-488e-b670-4e51e3e3b7fe",
"downloadMode": 0, "downloadMode": 0,
"duration": 10.944, "duration": 10.944,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "37f8998c-5fbe-45c6-880f-feda41765983", "uuid": "311ba2d9-5c7f-4509-bdd9-ee3fb361fe6e",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.365714, "duration": 0.365714,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "6987f0d0-8fb2-4cf1-aebd-8155035ea77b", "uuid": "e5485690-99a9-418c-a136-e638c1ceffb2",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.044898, "duration": 1.044898,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "80ce9fe2-232d-48da-9298-8f721bfefc2f", "uuid": "e9e72e34-d9c0-4d8c-ba3c-2e58e056cc67",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.287347, "duration": 0.287347,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "307d8f53-6425-48a5-8dc5-262b03408d47", "uuid": "18dacbde-03e9-4106-838e-7cd4d6afbbb5",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.365714, "duration": 0.365714,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "711a80d1-36b4-46a2-a201-4a36f7d3dcfb", "uuid": "c9408214-f92f-45aa-b355-10a51c703cb9",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.966531, "duration": 0.966531,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "ee8e6a36-5f73-4545-9e8b-e791894d2a88", "uuid": "3bda5716-2de2-4425-b3f4-3f48693dd3f0",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.626939, "duration": 0.626939,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "554e1884-51b9-4ffb-8dce-c4edb80b1e41", "uuid": "d28d69c0-6282-497d-9802-0179c28a687a",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.168, "duration": 0.168,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "2714b4c3-7f50-4c28-8b5a-031a0a3812a5", "uuid": "572bc374-76d3-4916-8137-d8215d125e2c",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.39185, "duration": 0.39185,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "086bac54-5dba-489d-af3c-58765c63f5e2", "uuid": "f510acc1-5f89-42a9-b389-16e4cd6a076c",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "f59f0fcc-837b-4ad1-b280-7a5f10f6306c", "uuid": "c8416fa4-1a6a-4bc9-8026-a14e37f2e696",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "f5057793-a92d-4f73-a9cf-c161645b5adb", "uuid": "fba5ea68-8717-494b-a31e-ba25e50e14c3",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "d2f430b5-11c7-40b5-a964-75bd09fbac02", "uuid": "789cf448-753f-4a29-83ec-63d2cfac49fa",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3cc6a3e6-02a9-4987-94e0-22f2d7a123a6", "uuid": "41fe9f35-6e2f-46f8-96f0-00e9174c73c7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"mao_tex": { "mao_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0af6352f-32d6-4c98-a4b9-50f14b6ea66c", "uuid": "10736af2-c0f6-4dae-af1a-2dbaeac3eaa2",
"rawTextureUuid": "3cc6a3e6-02a9-4987-94e0-22f2d7a123a6", "rawTextureUuid": "41fe9f35-6e2f-46f8-96f0-00e9174c73c7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "665b4ac2-8763-4d12-a554-c4e430e38883", "uuid": "1340dde9-0c2a-476b-924c-f8c8c9df1abc",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "7d721fc0-9ea3-4a57-8edf-b47fe412e051", "uuid": "a6f05574-f8cf-454c-b4d6-6a3661aa888e",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "9a2b53ed-9896-4335-85fa-e88df1497bf0", "uuid": "e1864b30-be8b-4734-8848-8f1ce924dff6",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "9cd68528-1836-4bb7-bc01-64964fb5e00f", "uuid": "1c18fbfb-14db-4d6a-8c76-6c13e5b0ebb7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"车尾气_tex": { "车尾气_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "031b13a1-c3a9-44ab-acd3-2f874936efb9", "uuid": "6967cb06-c6b4-4d11-8bf1-aa76ca15b7e5",
"rawTextureUuid": "9cd68528-1836-4bb7-bc01-64964fb5e00f", "rawTextureUuid": "1c18fbfb-14db-4d6a-8c76-6c13e5b0ebb7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "d238c7b4-49ae-4e9f-b19a-9e06be0b0e70", "uuid": "c88940b6-8d88-49a1-b028-5ede3e0e62fa",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "85bff1ed-d6df-4276-a5c9-1fa6437b9b19", "uuid": "6b9c4a35-bb0d-4166-9583-aff3d416081c",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "95dd4bec-090d-46c9-b1b7-03bd656dc549", "uuid": "aeae569f-642a-4a16-a2c6-64a6c440ea14",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3b6d7d2e-9788-4de5-822b-753d7aac0875", "uuid": "568b0d80-078f-4a17-91a1-c87caa7fd089",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"烟花_tex": { "烟花_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d184add9-7760-411c-b0ea-dcd8eb7994d8", "uuid": "0e9debc4-e7f8-4a5f-9109-9e6e20c96386",
"rawTextureUuid": "3b6d7d2e-9788-4de5-822b-753d7aac0875", "rawTextureUuid": "568b0d80-078f-4a17-91a1-c87caa7fd089",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "deb2e601-529a-4fc2-b998-e664e3bc0d17", "uuid": "2e9114b9-3134-4b20-a5dd-4da04b350bd2",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "b5096566-f543-48ce-b48f-98fb9c7a6f79", "uuid": "c20a1eaf-f52f-4ae7-8916-aeed39bbf2fe",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
export as namespace Play;
declare class EventEmitter<T> {
on<K extends keyof T>(event: K, listener: (payload: T[K]) => any): this;
on(evt: string, listener: Function): this;
once<K extends keyof T>(event: K, listener: (payload: T[K]) => any): this;
once(evt: string, listener: Function): this;
off<K extends keyof T>(evt: K | string, listener?: Function): this;
emit<K extends keyof T>(evt: K | string, ...args: any[]): boolean;
}
export enum Event {
/** 断开连接 */
DISCONNECTED = 'disconnected',
/** 加入到大厅 */
LOBBY_JOINED = 'lobbyJoined',
/** 大厅房间列表变化 */
LOBBY_ROOM_LIST_UPDATED = 'lobbyRoomListUpdate',
/** 有新玩家加入房间 */
PLAYER_ROOM_JOINED = 'newPlayerJoinedRoom',
/** 有玩家离开房间 */
PLAYER_ROOM_LEFT = 'playerLeftRoom',
/** 玩家活跃属性变化 */
PLAYER_ACTIVITY_CHANGED = 'playerActivityChanged',
/** 主机变更 */
MASTER_SWITCHED = 'masterSwitched',
/** 离开房间 */
ROOM_LEFT = 'roomLeft',
/** 被踢出房间 */
ROOM_KICKED = 'roomKicked',
/** 房间系统属性变化 */
ROOM_SYSTEM_PROPERTIES_CHANGED = 'roomSystemPropertiesChanged',
/** 房间自定义属性变化 */
ROOM_CUSTOM_PROPERTIES_CHANGED = 'roomCustomPropertiesChanged',
/** 玩家自定义属性变化 */
PLAYER_CUSTOM_PROPERTIES_CHANGED = 'playerCustomPropertiesChanged',
/** 自定义事件 */
CUSTOM_EVENT = 'customEvent',
/** 错误事件 */
ERROR = 'error',
}
export enum ReceiverGroup {
/** 其他人(除了自己之外的所有人) */
Others,
/** 所有人(包括自己) */
All,
/** 主机客户端 */
MasterClient,
}
interface CustomProperties {
[key: string]: any;
}
interface CustomEventData {
[key: string]: any;
}
interface ErrorEvent {
code: number;
detail: string;
}
declare interface PlayEvent {
connected: void;
connectFailed: ErrorEvent;
disconnected: void;
lobbyJoined: void;
lobbyLeft: void;
lobbyRoomListUpdate: void;
roomCreated: void;
roomCreateFailed: ErrorEvent;
roomJoined: void;
roomJoinFailed: ErrorEvent;
newPlayerJoinedRoom: {
newPlayer: Player;
};
playerLeftRoom: {
leftPlayer: Player;
};
playerActivityChanged: {
player: Player;
};
masterSwitched: {
newMaster: Player;
};
roomLeft: void;
roomKicked: {
code: number;
msg: string;
};
roomCustomPropertiesChanged: {
changedProps: CustomProperties;
};
roomSystemPropertiesChanged: {
changedProps: CustomProperties;
};
playerCustomPropertiesChanged: {
player: Player;
changedProps: CustomProperties;
};
customEvent: {
eventId: number;
eventData: CustomEventData;
senderId: number;
};
error: ErrorEvent;
}
export class LobbyRoom {
readonly roomName: string;
readonly maxPlayerCount: number;
readonly expectedUserIds: string[];
readonly emptyRoomTtl: number;
readonly playerTtl: number;
readonly playerCount: number;
readonly customRoomPropertiesForLobby: CustomProperties;
}
export class Player {
readonly userId: string;
readonly actorId: number;
readonly isLocal: boolean;
readonly isMaster: boolean;
readonly isActive: boolean;
setCustomProperties(
properties: CustomProperties,
opts?: {
expectedValues?: CustomProperties;
}
): Promise<void>;
readonly customProperties: CustomProperties;
}
export class Room {
readonly name: string;
readonly open: boolean;
readonly visible: boolean;
readonly maxPlayerCount: number;
readonly master: Player;
readonly masterId: number;
readonly expectedUserIds: string[];
readonly playerList: Player[];
getPlayer(actorId: number): Player;
setCustomProperties(
properties: CustomProperties,
opts?: {
expectedValues?: CustomProperties;
}
): Promise<void>;
readonly customProperties: CustomProperties;
setOpen(open: boolean): Promise<void>;
setVisible(visible: boolean): Promise<void>;
setRoomMaxPlayerCount(count: number): Promise<void>;
setRoomExpectedUserIds(expectedUserIds: string[]): Promise<void>;
clearRoomExpectedUserIds(): Promise<void>;
addRoomExpectedUserIds(expectedUserIds: string[]): Promise<void>;
removeRoomExpectedUserIds(expectedUserIds: string[]): Promise<void>;
setMaster(newMasterId: number): Promise<void>;
sendEvent(
eventId: number,
eventData?: CustomEventData,
options?: {
receiverGroup?: ReceiverGroup;
targetActorIds?: number[];
}
): Promise<void>;
kickPlayer(
actorId: number,
opts?: {
code?: number;
msg?: string;
}
): Promise<void>;
leave(): Promise<void>;
}
export class Client extends EventEmitter<PlayEvent> {
readonly room: Room;
readonly player: Player;
readonly lobbyRoomList: LobbyRoom[];
userId: string;
constructor(opts: {
appId: string;
appKey: string;
userId: string;
ssl?: boolean;
feature?: string;
gameVersion?: string;
playServer?: string;
});
connect(): Promise<Client>;
reconnect(): Promise<Client>;
reconnectAndRejoin(): Promise<Room>;
close(): Promise<void>;
joinLobby(): Promise<void>;
leaveLobby(): Promise<void>;
createRoom(opts?: {
roomName?: string;
roomOptions?: Object;
expectedUserIds?: string[];
}): Promise<Room>;
joinRoom(
roomName: string,
opts?: {
expectedUserIds?: string[];
}
): Promise<Room>;
rejoinRoom(roomName: string): Promise<Room>;
joinOrCreateRoom(
roomName: string,
opts?: {
roomOptions?: Object;
expectedUserIds: string[];
}
): Promise<Room>;
joinRandomRoom(opts?: {
matchProperties?: Object;
expectedUserIds?: string[];
}): Promise<Room>;
matchRandom(
piggybackPeerId: string,
opts?: { matchProperties?: Object; expectedUserIds?: string[] }
): Promise<LobbyRoom>;
setRoomOpen(open: boolean): Promise<void>;
setRoomVisible(visible: boolean): Promise<void>;
setRoomMaxPlayerCount(count: number): Promise<void>;
setRoomExpectedUserIds(expectedUserIds: string[]): Promise<void>;
clearRoomExpectedUserIds(): Promise<void>;
addRoomExpectedUserIds(expectedUserIds: string[]): Promise<void>;
removeRoomExpectedUserIds(expectedUserIds: string[]): Promise<void>;
setMaster(newMasterId: number): Promise<void>;
sendEvent(
eventId: number,
eventData?: CustomEventData,
options?: {
receiverGroup?: ReceiverGroup;
targetActorIds?: number[];
}
): Promise<void>;
leaveRoom(): Promise<void>;
kickPlayer(
actorId: number,
opts?: {
code?: number;
msg?: string;
}
): Promise<void>;
pauseMessageQueue(): void;
resumeMessageQueue(): void;
}
export enum CreateRoomFlag {
FixedMaster = 1,
MasterUpdateRoomProperties = 2,
}
export function setAdapters(newAdapters: { WebSocket: Function }): void;
export enum LogLevel {
Debug = 'Debug',
Warn = 'Warn',
Error = 'Error',
}
export function setLogger(logger: {
Debug: (...args: any[]) => any;
Warn: (...args: any[]) => any;
Error: (...args: any[]) => any;
}): void;
export enum PlayErrorCode {
OPEN_WEBSOCKET_ERROR = 10001,
SEND_MESSAGE_STATE_ERROR = 10002,
}
export function registerType<T>(
type: T,
typeId: number,
serializeMethod: (obj: T) => Uint8Array,
deserializeMethod: (bytes: Uint8Array) => T
): void;
export function serializeObject(obj: Object): Uint8Array;
export function deserializeObject(bytes: Uint8Array): Object;
{
"ver": "2.0.0",
"uuid": "6882e3d8-2923-4e4a-9711-1e9abd7002b7",
"subMetas": {}
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "fdbb32f2-9341-42e9-b486-67fc8c33fa36", "uuid": "5cc2d7f5-cc73-4358-b809-2a77057dd861",
"isPlugin": true, "isPlugin": true,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "75bf48d1-63ae-4dc6-bed7-0107053b74b3", "uuid": "5a543969-232b-400b-817b-7962f525910c",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "83a14191-1412-4891-b748-a390f78627c1", "uuid": "a217e9ec-4fe4-415d-9fa3-af3988b1c276",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a018ad70-48cf-4ebb-9f91-5a272897a14a" "__uuid__": "2b79564b-2243-4b18-8411-0d8ef129b0d7"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "a1GjpGzJdD65Biy/y88Sq8", "fileId": "a1GjpGzJdD65Biy/y88Sq8",
"sync": false "sync": false
...@@ -432,7 +432,7 @@ ...@@ -432,7 +432,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "afaLDsGNdF8rTS2GfZ3h3s", "fileId": "afaLDsGNdF8rTS2GfZ3h3s",
"sync": false "sync": false
...@@ -525,7 +525,7 @@ ...@@ -525,7 +525,7 @@
"_lineHeight": 50, "_lineHeight": 50,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "af6b883b-3524-47da-98f9-6727f5f2164a" "__uuid__": "de3f3282-fdf4-401f-b50d-b7165702ee8f"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "8bJSQRyJRA0Jkcc+8GY5Do", "fileId": "8bJSQRyJRA0Jkcc+8GY5Do",
"sync": false "sync": false
...@@ -734,7 +734,7 @@ ...@@ -734,7 +734,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a3561cab-e8b1-4661-8dbe-d58cc701b7ca" "__uuid__": "a178f929-9f18-462f-83b4-3adfe6c1879d"
}, },
"_type": 2, "_type": 2,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -783,7 +783,7 @@ ...@@ -783,7 +783,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "1coIwLNVZGEZEzF3dItpuK", "fileId": "1coIwLNVZGEZEzF3dItpuK",
"sync": false "sync": false
...@@ -804,7 +804,7 @@ ...@@ -804,7 +804,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "00acc07b-540e-46b7-a68e-27c5ee62d4fe" "__uuid__": "4969820d-c25a-4832-b01d-a5fd6fa86ac8"
}, },
"_type": 1, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -870,7 +870,7 @@ ...@@ -870,7 +870,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "55nJZ9Uk5CArtjDKXyL9xa", "fileId": "55nJZ9Uk5CArtjDKXyL9xa",
"sync": false "sync": false
...@@ -1031,7 +1031,7 @@ ...@@ -1031,7 +1031,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "591c3070-85da-4cd9-8788-e65bbf92797c" "__uuid__": "380f7d62-0874-4f13-9ffa-a8139e8702d8"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1053,7 +1053,7 @@ ...@@ -1053,7 +1053,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "eauguU1wtOrbhO0xPWGhAt", "fileId": "eauguU1wtOrbhO0xPWGhAt",
"sync": false "sync": false
...@@ -1228,7 +1228,7 @@ ...@@ -1228,7 +1228,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "60BI1U1b9OoZRIDunWHW0a", "fileId": "60BI1U1b9OoZRIDunWHW0a",
"sync": false "sync": false
...@@ -1247,7 +1247,7 @@ ...@@ -1247,7 +1247,7 @@
} }
], ],
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "591c3070-85da-4cd9-8788-e65bbf92797c" "__uuid__": "380f7d62-0874-4f13-9ffa-a8139e8702d8"
}, },
"_type": 2, "_type": 2,
"_segments": 64, "_segments": 64,
...@@ -1261,7 +1261,7 @@ ...@@ -1261,7 +1261,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "5cd2Jos1dOS46NiARvN6qg", "fileId": "5cd2Jos1dOS46NiARvN6qg",
"sync": false "sync": false
...@@ -1346,7 +1346,7 @@ ...@@ -1346,7 +1346,7 @@
"_srcBlendFactor": 1, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "4c09dd6d-6694-4cfc-be21-69f0ae6b41cd" "__uuid__": "2e1eabc4-5d7d-454f-8c4c-96a28e6b7e89"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1368,7 +1368,7 @@ ...@@ -1368,7 +1368,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "8aSOlD3bNAYbWZEGUBpU7X", "fileId": "8aSOlD3bNAYbWZEGUBpU7X",
"sync": false "sync": false
...@@ -1453,7 +1453,7 @@ ...@@ -1453,7 +1453,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8f74ebad-379b-4697-9851-236b918f8f61" "__uuid__": "2875f0a5-4f33-471f-830b-a4363b496f08"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1475,7 +1475,7 @@ ...@@ -1475,7 +1475,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "ddBCn3FshPQ4V9KDNSlBfr", "fileId": "ddBCn3FshPQ4V9KDNSlBfr",
"sync": false "sync": false
...@@ -1565,7 +1565,7 @@ ...@@ -1565,7 +1565,7 @@
"_lineHeight": 50, "_lineHeight": 50,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "fdc70fe1-3f0a-485e-9c1f-658f708043e2" "__uuid__": "db944dd7-18fd-4997-b751-b11d687c676e"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -1585,7 +1585,7 @@ ...@@ -1585,7 +1585,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "6anh4wjaRPMqyS2LhXSx4j", "fileId": "6anh4wjaRPMqyS2LhXSx4j",
"sync": false "sync": false
...@@ -1596,7 +1596,7 @@ ...@@ -1596,7 +1596,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "f9qrJyDh5P1oErn3FfsNL7", "fileId": "f9qrJyDh5P1oErn3FfsNL7",
"sync": false "sync": false
...@@ -1629,7 +1629,7 @@ ...@@ -1629,7 +1629,7 @@
"_id": "" "_id": ""
}, },
{ {
"__type__": "dc4f5e/a9xOdYQIMVaZsE9C", "__type__": "04960Zg1mtKaalcAbxpm775",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -1644,7 +1644,7 @@ ...@@ -1644,7 +1644,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "67388d6d-3094-4a49-9cb5-66c4e834140c", "uuid": "51f33b9a-a281-4852-9079-471392dbfb0e",
"optimizationPolicy": "SINGLE_INSTANCE", "optimizationPolicy": "SINGLE_INSTANCE",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"readonly": false, "readonly": false,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "0c69e2fd-c94c-48b3-95b2-b6e91860f7b2", "uuid": "04960660-d66b-4a69-a95c-01bc699bbef9",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "69dcbf86-d3a1-4f0e-b25b-acb7ee860bdc", "uuid": "21c4f097-3a55-4728-950a-46c36b013354",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "fdc70fe1-3f0a-485e-9c1f-658f708043e2", "uuid": "db944dd7-18fd-4997-b751-b11d687c676e",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b10e2f8b-c724-4806-a27c-b0b6856ec111", "uuid": "da732153-09f9-4d45-83c0-02bec6578918",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg": { "bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a018ad70-48cf-4ebb-9f91-5a272897a14a", "uuid": "2b79564b-2243-4b18-8411-0d8ef129b0d7",
"rawTextureUuid": "b10e2f8b-c724-4806-a27c-b0b6856ec111", "rawTextureUuid": "da732153-09f9-4d45-83c0-02bec6578918",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "af6b883b-3524-47da-98f9-6727f5f2164a", "uuid": "de3f3282-fdf4-401f-b50d-b7165702ee8f",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5e12603e-37ae-400b-8b33-3270754d5f82", "uuid": "9ddd4f47-e0e6-4208-9beb-347ce2ae6591",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"head_4": { "head_4": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "6e92d743-3f87-4066-9fa2-816aa95047e7", "uuid": "0453351b-dec6-49c0-87f3-9efcf93ec2cc",
"rawTextureUuid": "5e12603e-37ae-400b-8b33-3270754d5f82", "rawTextureUuid": "9ddd4f47-e0e6-4208-9beb-347ce2ae6591",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "00d0593b-dd6f-4bdc-8c50-2fc3068550e9", "uuid": "4e3f098b-ce88-4ce9-a852-ebdce2d9a136",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "point", "filterMode": "point",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"progress_bar": { "progress_bar": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a3561cab-e8b1-4661-8dbe-d58cc701b7ca", "uuid": "a178f929-9f18-462f-83b4-3adfe6c1879d",
"rawTextureUuid": "00d0593b-dd6f-4bdc-8c50-2fc3068550e9", "rawTextureUuid": "4e3f098b-ce88-4ce9-a852-ebdce2d9a136",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c5fb4a53-d5b8-4343-a0de-facb496f7dfc", "uuid": "a94f1e30-512f-4f14-bd9d-a07de2e51db7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "point", "filterMode": "point",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"progress_bg": { "progress_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "00acc07b-540e-46b7-a68e-27c5ee62d4fe", "uuid": "4969820d-c25a-4832-b01d-a5fd6fa86ac8",
"rawTextureUuid": "c5fb4a53-d5b8-4343-a0de-facb496f7dfc", "rawTextureUuid": "a94f1e30-512f-4f14-bd9d-a07de2e51db7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "9723bfd0-0b6f-4737-842f-accc84525f76", "uuid": "a064d764-c3d8-4509-87e8-8a960325a64a",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"progress_dot": { "progress_dot": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "efe0340e-d087-46dd-ab47-9717095d0840", "uuid": "68c65d06-202a-4d9b-89c3-0de8efccf16b",
"rawTextureUuid": "9723bfd0-0b6f-4737-842f-accc84525f76", "rawTextureUuid": "a064d764-c3d8-4509-87e8-8a960325a64a",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "be5a56e8-1a49-4a5e-b314-66f2703397f7", "uuid": "7071447a-858a-4d59-b98a-3b7d607adcbf",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"tx_01": { "tx_01": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "4c09dd6d-6694-4cfc-be21-69f0ae6b41cd", "uuid": "2e1eabc4-5d7d-454f-8c4c-96a28e6b7e89",
"rawTextureUuid": "be5a56e8-1a49-4a5e-b314-66f2703397f7", "rawTextureUuid": "7071447a-858a-4d59-b98a-3b7d607adcbf",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "8af34ab0-74ff-42a7-8959-59a4ad93a32d", "uuid": "98280c6b-55a4-4ba2-b066-c6159ded4432",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"tx_01zw": { "tx_01zw": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "591c3070-85da-4cd9-8788-e65bbf92797c", "uuid": "380f7d62-0874-4f13-9ffa-a8139e8702d8",
"rawTextureUuid": "8af34ab0-74ff-42a7-8959-59a4ad93a32d", "rawTextureUuid": "98280c6b-55a4-4ba2-b066-c6159ded4432",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "eb400c79-9c5e-448f-9aca-657808ad6dbb", "uuid": "5b7338e0-7e65-41d9-bb18-207a526579f4",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"tx_xuanzhong": { "tx_xuanzhong": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "8f74ebad-379b-4697-9851-236b918f8f61", "uuid": "2875f0a5-4f33-471f-830b-a4363b496f08",
"rawTextureUuid": "eb400c79-9c5e-448f-9aca-657808ad6dbb", "rawTextureUuid": "5b7338e0-7e65-41d9-bb18-207a526579f4",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "760d76d7-0b3f-4da6-99fb-70befd0939db", "uuid": "006d0802-bc29-48e5-a43f-4fc224ae5d5b",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
cc.Class({
extends: cc.Component,
properties: {
},
start() {
const BtnExit = cc.find('BtnFrame/BtnExit', this.node);
this.buttonOnClick(BtnExit, () => {
const middleLayer = cc.find('middleLayer');
if (middleLayer) {
const middleLayerComponent = middleLayer.getComponent('middleLayer');
if (middleLayerComponent.onClickExitBtn) {
middleLayerComponent.onClickExitBtn();
}
} else {
cc.director.getScene().destroy();
cc.audioEngine.stopAll();
if (window.courseware) {
window.courseware.freeAllOcMethod();
}
var bundle = cc.assetManager.bundles.find((obj) => {
return obj.getSceneInfo('debug_shell');
});
if (bundle) {
cc.director.loadScene("debug_shell", null, null, (err, scene) => { });
} else {
cc.director.loadScene("OXFORDCORE", null, null, (err, scene) => { });
}
}
});
const BtnPlayAgain = cc.find('BtnFrame/BtnPlayAgain', this.node);
this.buttonOnClick(BtnPlayAgain, () => {
const middleLayer = cc.find('middleLayer');
if (middleLayer) {
const middleLayerComponent = middleLayer.getComponent('middleLayer');
if (middleLayerComponent) {
middleLayerComponent.reloadBundle();
}
} else {
const sceneName = cc.director.getScene().name;
cc.director.getScene().destroy();
cc.audioEngine.stopAll();
if (window.courseware) {
window.courseware.freeAllOcMethod();
}
cc.director.loadScene(sceneName, null, null, (err, scene) => { });
}
});
},
buttonOnClick(button, callback, scale = 1.0) {
button.on('click', () => {
if (button['cantClick']) {
return;
}
button['cantClick'] = true;
cc.tween(button)
.to(0.1, { scale: scale * 1.1 })
.to(0.1, { scale: scale })
.call(() => {
button['cantClick'] = false;
callback && callback();
})
.start();
});
}
});
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "dc4f57bf-6bdc-4e75-8408-315699b04f42", "uuid": "b36ac6c9-b808-4584-84bc-a616c8f02c2d",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
cc.Class({
extends: cc.Component,
properties: {
},
start () {
const BtnExit = cc.find('BtnFrame/BtnExit', this.node);
BtnExit.on('click', ()=>{
const middleLayer = cc.find('middleLayer');
cc.game.removePersistRootNode(middleLayer);
cc.director.getScene().destroy();
cc.audioEngine.stopAll();
if (window.courseware) {
window.courseware.freeAllOcMethod();
}
cc.director.loadScene("debug_shell", null, null, (err, scene) => {
});
});
const BtnPlayAgain = cc.find('BtnFrame/BtnPlayAgain', this.node);
BtnPlayAgain.on('click', ()=>{
const sceneName = cc.director.getScene().name;
cc.director.getScene().destroy();
cc.audioEngine.stopAll();
if (window.courseware) {
window.courseware.freeAllOcMethod();
}
cc.director.loadScene(sceneName, null, null, (err, scene) => {
});
});
},
});
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "a2lcBX6axJcYgWizPAwXJQ", "fileId": "a2lcBX6axJcYgWizPAwXJQ",
"sync": false "sync": false
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "67819cbe-5ddd-40b9-8718-6381169e8e11" "__uuid__": "198c0583-7af2-4ddb-a687-654af1686fc1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "2dFg2BRxNDIbzNQUJzInwD", "fileId": "2dFg2BRxNDIbzNQUJzInwD",
"sync": false "sync": false
...@@ -656,7 +656,7 @@ ...@@ -656,7 +656,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "15f1ce1d-faec-44e9-a132-050e05c87cf3" "__uuid__": "86aa7240-8156-45d5-bb57-5c35533d2788"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -773,7 +773,7 @@ ...@@ -773,7 +773,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "426YGeaQ1GSqxAl0es/FZ5", "fileId": "426YGeaQ1GSqxAl0es/FZ5",
"sync": false "sync": false
...@@ -794,7 +794,7 @@ ...@@ -794,7 +794,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c3212e1e-c907-4b5d-90c8-d2f5d7bd01ee" "__uuid__": "bdcfd97e-d9c1-4508-baf0-4d8796a211a9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -816,7 +816,7 @@ ...@@ -816,7 +816,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "1bsWjap9JK84XN2hkYfXDb", "fileId": "1bsWjap9JK84XN2hkYfXDb",
"sync": false "sync": false
...@@ -849,7 +849,7 @@ ...@@ -849,7 +849,7 @@
"_id": "" "_id": ""
}, },
{ {
"__type__": "6f9a1BFxYdMVrf7qBAsrDKu", "__type__": "b36acbJuAhFhIS8phbI8Cwt",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -864,7 +864,7 @@ ...@@ -864,7 +864,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "32554152-8099-4085-b27c-f30a54f8e8f3", "uuid": "6cc19183-e95f-4001-8b22-404e52ae989c",
"optimizationPolicy": "AUTO", "optimizationPolicy": "AUTO",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"readonly": false, "readonly": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "0cef79d4-c3ca-487a-8b5b-cb4a53a8b659", "uuid": "6e5bf437-e4eb-49ac-afa0-fce60f8e8330",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "2e08fd6b-8453-4050-b7b6-cc09ee8d7052", "uuid": "c2981d87-43d6-4034-b3dd-4e2708e8f7f7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"BtnExit": { "BtnExit": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "67819cbe-5ddd-40b9-8718-6381169e8e11", "uuid": "198c0583-7af2-4ddb-a687-654af1686fc1",
"rawTextureUuid": "2e08fd6b-8453-4050-b7b6-cc09ee8d7052", "rawTextureUuid": "c2981d87-43d6-4034-b3dd-4e2708e8f7f7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4a2b2f1c-bd55-4575-a508-a60fd220d273", "uuid": "2221c648-7d1f-4047-aae0-6ad5578d3054",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"BtnFrame": { "BtnFrame": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c3212e1e-c907-4b5d-90c8-d2f5d7bd01ee", "uuid": "bdcfd97e-d9c1-4508-baf0-4d8796a211a9",
"rawTextureUuid": "4a2b2f1c-bd55-4575-a508-a60fd220d273", "rawTextureUuid": "2221c648-7d1f-4047-aae0-6ad5578d3054",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "98a0b6fd-e028-4679-8823-a97e0b1ab9d8", "uuid": "87045005-3510-4290-952b-6ba54618aff7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"BtnPlayAgain": { "BtnPlayAgain": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "15f1ce1d-faec-44e9-a132-050e05c87cf3", "uuid": "86aa7240-8156-45d5-bb57-5c35533d2788",
"rawTextureUuid": "98a0b6fd-e028-4679-8823-a97e0b1ab9d8", "rawTextureUuid": "87045005-3510-4290-952b-6ba54618aff7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "f372f497-ec43-4f96-a446-877e60417d6c", "uuid": "d5163dc4-ea5d-4229-baa1-aa89abab2b30",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
import { RandomInt } from "../script/util";
export class NetworkHelper { export class NetworkHelper {
_eventListeners: any = {}; _eventListeners: any = {};
ctor() {} ctor() { }
on(eventName, func) { on(eventName, func) {
this._eventListeners[eventName] = func; this._eventListeners[eventName] = func;
} }
async init(roomType: string, maxPlayers: number) { async init(roomType: string, maxPlayers: number) {
this.initRoom(); await this.initRoom();
try {
return await this.joinRoom(roomType, maxPlayers);
} catch (e) {
await this.initListener();
this.initRoom();
return await this.joinRoom(roomType, maxPlayers); return await this.joinRoom(roomType, maxPlayers);
} }
}
async startGame() { async startGame() {
await this.startFrameSync(); await this.startFrameSync();
...@@ -25,239 +20,137 @@ export class NetworkHelper { ...@@ -25,239 +20,137 @@ export class NetworkHelper {
async stopGame() { async stopGame() {
await this.stopFrameSync(); await this.stopFrameSync();
await this.closeRoom();
await this.leaveRoom(); await this.leaveRoom();
} }
getRoomInfo() { listenerInited = false;
return this.room.roomInfo;
}
initListener() {
if (MGOBE.Player.id !== undefined) {
return;
}
return new Promise((resolve, reject) => {
const gameId = "obg-i4ql53h1"; //替换为控制台上的 游戏 ID
const secretKey = "060d81c7abaf24c8ce2afc5a725c152062676d35"; //替换为控制台上的 游戏 Key
const serverUrl = "i4ql53h1.wxlagame.com"; //替换为控制台上的 域名
const gameInfo = {
gameId: gameId,
openId: "openid_test" + Math.random(), //自定义的用户唯一ID
secretKey: secretKey,
};
const config = {
url: serverUrl,
reconnectMaxTimes: 5,
reconnectInterval: 1000,
resendInterval: 1000,
resendTimeout: 10000,
cacertNativeUrl: "",
};
MGOBE.DebuggerLog.enable = false;
// 如果是原生平台,则加载 Cert 证书,否则会提示 WSS 错误
if (cc.sys.isNative) {
let cacertFile;
const cacertNode = cc.find("cacertNode");
if (cacertNode) {
cacertFile = cacertNode.getComponent("cacert").cacertFile;
}
if (!cacertFile) {
this.log("没有cacertFile!!!");
}
config.cacertNativeUrl =
cc.loader.md5Pipe && cc.ENGINE_VERSION < "2.4.0"
? cc.loader.md5Pipe.transformURL(cacertFile.nativeUrl)
: cacertFile.nativeUrl;
}
MGOBE.Listener.init(gameInfo, config, (event) => { room: any;
this.log(JSON.stringify(event)); client: any;
if (event.code !== 0) { async initRoom() {
this.log("初始化失败: " + event.code); const client = new globalThis.Play.Client({
reject(); appId: "JCKc6bU8FywdjIPupjNH8Jwx-gzGzoHsz",
return; appKey: "WUrRDpb46z2qFLsUNbhknYcP",
} userId: `${new Date().getTime()}_${RandomInt(100000000)}`,
this.log("初始化成功"); playServer: 'https://lyn5nahs.lc-cn-n1-shared.com'
resolve(null);
});
}); });
console.log('client = ', client);
await client.connect();
this.client = client;
console.log('连接成功');
} }
room: MGOBE.Room; player: any;
initRoom() { joinRoom(roomType: string, maxPlayers: number) {
this.room = new MGOBE.Room();
MGOBE.Listener.add(this.room);
this.room.onJoinRoom = this.onJoinRoom.bind(this);
this.room.onLeaveRoom = this.onLeaveRoom.bind(this);
this.room.onRecvFromClient = this.onRecvFromClient.bind(this);
this.room.onRecvFrame = this.onRecvFrame.bind(this);
this.room.onChangePlayerNetworkState =
this.onChangePlayerNetworkState.bind(this);
this.room.onStartFrameSync = this.onStartFrameSync.bind(this);
this.room.onStopFrameSync = this.onStopFrameSync.bind(this);
this.room.onRecvFromGameSvr = this.onRecvFromGameSvr.bind(this);
this.log("this.room = " + JSON.stringify(this.room.roomInfo));
}
joinRoom(roomType: string, maxPlayers: number, customData: string = "") {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const playerName = "Tom" + Math.random(); const roomProp = { roomType, maxPlayers };
const playerInfo = { this.client.joinRandomRoom({
name: playerName, matchProperties: roomProp,
customPlayerStatus: 0, }).then((room) => {
customProfile: customData, resolve(this.onJoinRoomSuccess(room));
}; }).catch((error) => {
console.log('加入房间失败');
const matchRoomPara = { if (error.code == 4301) {
playerInfo, const options = {
maxPlayers: maxPlayers, visible: true,
roomType: roomType, playerTtl: 0,
emptyRoomTtl: 0,
maxPlayerCount: maxPlayers,
customRoomProperties: roomProp,
customRoomPropertyKeysForLobby: ['roomType', 'maxPlayers'],
flag: globalThis.Play.CreateRoomFlag.MasterUpdateRoomProperties
}; };
this.client.createRoom({
this.room.matchRoom(matchRoomPara, (event) => { roomOptions: options,
this.log(JSON.stringify(event)); }).then((room) => {
if (event.code === 0) { resolve(this.onJoinRoomSuccess(room));
cc.log("匹配成功: " + event.data.roomInfo.id); }).catch((error) => {
const player = event.data.roomInfo.playerList.find( console.error(error.code, error.detail);
(player) => player.name == playerName
);
if (this.checkRoomOwnerOffLine()) {
if (this._eventListeners["playerOffLine"]) {
this._eventListeners["playerOffLine"](event);
}
cc.log("房主掉线了");
resolve(null);
return;
}
resolve(player.id);
} else {
cc.log("匹配失败");
reject(event);
}
});
}); });
} }
leaveRoom() {
return new Promise((resolve, reject) => {
this.room.leaveRoom({}, (event) => {
this.log(JSON.stringify(event));
if (event.code === 0) {
this.log("退房成功" + this.room.roomInfo.id);
// this.room.initRoom();
resolve(null);
} else {
this.log("退房失败");
}
}); });
}); });
} }
closeRoom() { onJoinRoomSuccess(room: globalThis.Play.Room) {
return new Promise((resolve, reject) => { console.log('加入房间成功 room = ', room);
this.room.changeRoom({ isForbidJoin: true }, (event) => { const playerMe = room.playerList.find(player => player.isLocal);
console.log("关门"); const masterPlayer = room.playerList.find(player => player.isMaster);
this.log(JSON.stringify(event)); const masterId = masterPlayer.userId;
resolve(null); const playerId = playerMe.userId;
this.room = new FakeRoom(masterId);
this.room.players.push(this.room.player);
this.player = this.room.player;
this.client.on(globalThis.Play.Event.PLAYER_ROOM_LEFT, (event) => {
this.onLeaveRoom({ data: { leavePlayerId: event.leftPlayer.userId } });
});
this.client.on(globalThis.Play.Event.PLAYER_ROOM_JOINED, (event) => {
this.onJoinRoom({ playerId: event.newPlayer.userId });
}); });
this.client.on(globalThis.Play.Event.CUSTOM_EVENT, (event) => {
this.onRecvFrame({ data: event.eventData });
}); });
// this.room.onDisconnect(this.onDisconnect.bind(this));
// this.room.onDismiss(this.onDisconnect.bind(this));
return playerId;
} }
sendMessage() { async leaveRoom() {
const sendToClientPara = { await this.client.close();
recvType: MGOBE.ENUM.RecvType.ROOM_ALL, console.log("退房成功");
recvPlayerList: [],
msg: "hello" + Math.random(),
};
this.room.sendToClient(sendToClientPara, (event) => console.log(event));
} }
startFrameSync() { async dismissRoom() {
return new Promise((resolve, reject) => { if (this.room.ownerId == this.player.id) {
this.room.startFrameSync({}, (event) => { console.log("房间已解散");
this.log(JSON.stringify(event));
if (event.code === 0) {
cc.log("开始帧同步成功,请到控制台查看具体帧同步信息");
resolve(null);
} else {
reject();
} }
});
});
} }
stopFrameSync() { async closeRoom() {
return new Promise((resolve, reject) => { // 设置房间不可见
if (!this.room) { await this.client.setRoomVisible(false);
resolve(null); console.log(this.client.room.visible);
return;
} }
this.room.stopFrameSync({}, (event) => {
this.log(JSON.stringify(event)); async startFrameSync() {
if (event.code === 0) { console.log("开始帧同步成功");
this.log("停止帧同步成功");
resolve(null);
} else {
this.log("停止帧同步失败");
reject(event.code);
}
});
});
} }
sendToServer() { async stopFrameSync() {
const sendToGameServerPara = { console.log("停止帧同步成功");
data: {
cmd: 1,
},
};
this.room.sendToGameSvr(sendToGameServerPara, (event) =>
console.log(event)
);
} }
sendFrame(data: any) { sendFrame(data: any) {
this.room.sendFrame({ data }, (err) => { this.client.sendEvent(0, { frame: { items: [{ data: data }] } }, {
if (err.code != 0) { receiverGroup: globalThis.Play.ReceiverGroup.All,
console.log("err", err);
}
}); });
} }
onJoinRoom(event) { onJoinRoom(event) {
console.log("新玩家加入", event);
if (this._eventListeners["playerJoin"]) { if (this._eventListeners["playerJoin"]) {
this._eventListeners["playerJoin"](event); this._eventListeners["playerJoin"](event);
} }
console.log("新玩家加入", event.data.joinPlayerId); this.room.players.forEach(player => {
console.log('player.playerId = ', player.playerId);
});
} }
onLeaveRoom(event) { onLeaveRoom(event) {
console.log("onLeaveRoom");
if (this._eventListeners["playerLeave"]) { if (this._eventListeners["playerLeave"]) {
this._eventListeners["playerLeave"](event); this._eventListeners["playerLeave"](event);
} }
console.log("玩家退出", event.data.leavePlayerId); console.log("玩家退出", event.data.leavePlayerId);
} }
onRecvFromClient() {} onRecvFromClient() { }
checkRoomOwnerOffLine() {
const owner = this.room.roomInfo.playerList.find( onDisconnect(event) {
(player) => player.id == this.room.roomInfo.owner this.log("玩家掉线了: " + JSON.stringify(event));
);
return (
owner.commonNetworkState == MGOBE.types.NetworkState.COMMON_OFFLINE ||
owner.relayNetworkState == MGOBE.types.NetworkState.RELAY_OFFLINE
);
}
onChangePlayerNetworkState(event) {
console.log("玩家网络变化: " + JSON.stringify(event));
if (this.checkRoomOwnerOffLine()) {
if (this._eventListeners["playerOffLine"]) { if (this._eventListeners["playerOffLine"]) {
this._eventListeners["playerOffLine"](event); this._eventListeners["playerOffLine"](event);
} }
cc.log("房主掉线了");
}
} }
onRecvFrame(event) { onRecvFrame(event) {
...@@ -266,21 +159,25 @@ export class NetworkHelper { ...@@ -266,21 +159,25 @@ export class NetworkHelper {
} }
} }
onStartFrameSync(event) { onStartFrameSync(event) {
console.log('onStartFrameSync');
if (this._eventListeners["gameStart"]) { if (this._eventListeners["gameStart"]) {
this._eventListeners["gameStart"](event); this._eventListeners["gameStart"](event);
} }
} }
onStopFrameSync(event) {} onStopFrameSync(event) { }
onRecvFromGameSvr() {} onRecvFromGameSvr() { }
async onDestroy() { async onDestroy() {
try { try {
this.log("onDestroy1"); console.log("onDestroy1");
MGOBE.Listener.clear(); // MGOBE.Listener.clear();
await this.stopGame(); this.stopFrameSync();
this.log("onDestroy2"); this.closeRoom();
this.dismissRoom();
this.leaveRoom();
console.log("onDestroy2");
} catch (e) { } catch (e) {
this.log(JSON.stringify(e)); console.log(JSON.stringify(e));
} }
} }
...@@ -292,4 +189,48 @@ export class NetworkHelper { ...@@ -292,4 +189,48 @@ export class NetworkHelper {
cc.log(str); cc.log(str);
} }
} }
callNetworkApiGet(baseUrl, uri, data, callBack) {
let queryStr = "?";
const params = [];
for (const key in data) {
if (Object.hasOwnProperty.call(data, key)) {
params.push(`${key}=${data[key]}`);
}
}
queryStr += params.join("&");
const xhr = new XMLHttpRequest();
xhr.onreadystatechange = () => {
if (xhr.readyState == 4 && xhr.status >= 200 && xhr.status < 400) {
callBack(xhr.responseText);
}
};
const url = `${baseUrl}${uri}${queryStr}`;
console.log("url = " + url);
xhr.open("GET", url, true);
xhr.send();
}
}
export function asyncDelay(time) {
return new Promise((resolve, reject) => {
cc.tween(cc.find("Canvas"))
.delay(time)
.call(() => {
resolve(null);
})
.start();
});
}
class FakeRoom {
ownerId;
players = [];
player: any;
roomInfo;
constructor(playerId) {
this.player = { playerId: playerId };
this.ownerId = playerId;
this.roomInfo = { owner: playerId }
}
} }
\ No newline at end of file
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "dc1bd45d-521c-4799-83f9-78f669cdcbe2", "uuid": "644bf9cf-63f6-4ebd-9c1d-257cf6ef895c",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_id": "20802889-5dc3-422e-972b-bbac02ca59d1" "_id": "52ec5dc6-7287-4414-a434-02e17db4c202"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "b7f30449-ba98-4ee8-b0bf-6fec93526ef4" "__uuid__": "470579f6-5216-44a6-bdd5-6ec66a2a8dc0"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "85bff1ed-d6df-4276-a5c9-1fa6437b9b19#95dd4bec-090d-46c9-b1b7-03bd656dc549", "_armatureKey": "6b9c4a35-bb0d-4166-9583-aff3d416081c#aeae569f-642a-4a16-a2c6-64a6c440ea14",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -554,10 +554,10 @@ ...@@ -554,10 +554,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "85bff1ed-d6df-4276-a5c9-1fa6437b9b19" "__uuid__": "6b9c4a35-bb0d-4166-9583-aff3d416081c"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "95dd4bec-090d-46c9-b1b7-03bd656dc549" "__uuid__": "aeae569f-642a-4a16-a2c6-64a6c440ea14"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -772,7 +772,7 @@ ...@@ -772,7 +772,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "7d721fc0-9ea3-4a57-8edf-b47fe412e051#9a2b53ed-9896-4335-85fa-e88df1497bf0", "_armatureKey": "a6f05574-f8cf-454c-b4d6-6a3661aa888e#e1864b30-be8b-4734-8848-8f1ce924dff6",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -780,10 +780,10 @@ ...@@ -780,10 +780,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "7d721fc0-9ea3-4a57-8edf-b47fe412e051" "__uuid__": "a6f05574-f8cf-454c-b4d6-6a3661aa888e"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "9a2b53ed-9896-4335-85fa-e88df1497bf0" "__uuid__": "e1864b30-be8b-4734-8848-8f1ce924dff6"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -809,7 +809,7 @@ ...@@ -809,7 +809,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6161c7f6-5213-4b98-86c8-ff01881c717e" "__uuid__": "e10b99d7-293d-4b18-a818-6854663fd3cc"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -972,7 +972,7 @@ ...@@ -972,7 +972,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "7d721fc0-9ea3-4a57-8edf-b47fe412e051#9a2b53ed-9896-4335-85fa-e88df1497bf0", "_armatureKey": "a6f05574-f8cf-454c-b4d6-6a3661aa888e#e1864b30-be8b-4734-8848-8f1ce924dff6",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -980,10 +980,10 @@ ...@@ -980,10 +980,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "7d721fc0-9ea3-4a57-8edf-b47fe412e051" "__uuid__": "a6f05574-f8cf-454c-b4d6-6a3661aa888e"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "9a2b53ed-9896-4335-85fa-e88df1497bf0" "__uuid__": "e1864b30-be8b-4734-8848-8f1ce924dff6"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -1009,7 +1009,7 @@ ...@@ -1009,7 +1009,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6161c7f6-5213-4b98-86c8-ff01881c717e" "__uuid__": "e10b99d7-293d-4b18-a818-6854663fd3cc"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -1172,7 +1172,7 @@ ...@@ -1172,7 +1172,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "7d721fc0-9ea3-4a57-8edf-b47fe412e051#9a2b53ed-9896-4335-85fa-e88df1497bf0", "_armatureKey": "a6f05574-f8cf-454c-b4d6-6a3661aa888e#e1864b30-be8b-4734-8848-8f1ce924dff6",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -1180,10 +1180,10 @@ ...@@ -1180,10 +1180,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "7d721fc0-9ea3-4a57-8edf-b47fe412e051" "__uuid__": "a6f05574-f8cf-454c-b4d6-6a3661aa888e"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "9a2b53ed-9896-4335-85fa-e88df1497bf0" "__uuid__": "e1864b30-be8b-4734-8848-8f1ce924dff6"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -1209,7 +1209,7 @@ ...@@ -1209,7 +1209,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6161c7f6-5213-4b98-86c8-ff01881c717e" "__uuid__": "e10b99d7-293d-4b18-a818-6854663fd3cc"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -1309,7 +1309,7 @@ ...@@ -1309,7 +1309,7 @@
"_srcBlendFactor": 1, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "202541ce-057f-483a-8c88-badc60f3774e" "__uuid__": "aafde45e-6ae8-4e8d-88ec-cf8126cdd7de"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1504,7 +1504,7 @@ ...@@ -1504,7 +1504,7 @@
"_srcBlendFactor": 1, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "21f1e1f1-2cc2-47d0-aadc-73487d78f184" "__uuid__": "23eae794-5bae-4963-a5a0-39d2630e28cb"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1851,7 +1851,7 @@ ...@@ -1851,7 +1851,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "f5057793-a92d-4f73-a9cf-c161645b5adb#d2f430b5-11c7-40b5-a964-75bd09fbac02", "_armatureKey": "fba5ea68-8717-494b-a31e-ba25e50e14c3#789cf448-753f-4a29-83ec-63d2cfac49fa",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -1859,10 +1859,10 @@ ...@@ -1859,10 +1859,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "f5057793-a92d-4f73-a9cf-c161645b5adb" "__uuid__": "fba5ea68-8717-494b-a31e-ba25e50e14c3"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "d2f430b5-11c7-40b5-a964-75bd09fbac02" "__uuid__": "789cf448-753f-4a29-83ec-63d2cfac49fa"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 3, "_N$_animationIndex": 3,
...@@ -2328,7 +2328,7 @@ ...@@ -2328,7 +2328,7 @@
"__id__": 42 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "a2lcBX6axJcYgWizPAwXJQ", "fileId": "a2lcBX6axJcYgWizPAwXJQ",
"sync": false "sync": false
...@@ -2490,7 +2490,7 @@ ...@@ -2490,7 +2490,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "67819cbe-5ddd-40b9-8718-6381169e8e11" "__uuid__": "198c0583-7af2-4ddb-a687-654af1686fc1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2607,7 +2607,7 @@ ...@@ -2607,7 +2607,7 @@
"__id__": 42 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "2dFg2BRxNDIbzNQUJzInwD", "fileId": "2dFg2BRxNDIbzNQUJzInwD",
"sync": false "sync": false
...@@ -2698,7 +2698,7 @@ ...@@ -2698,7 +2698,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "15f1ce1d-faec-44e9-a132-050e05c87cf3" "__uuid__": "86aa7240-8156-45d5-bb57-5c35533d2788"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2815,7 +2815,7 @@ ...@@ -2815,7 +2815,7 @@
"__id__": 42 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "426YGeaQ1GSqxAl0es/FZ5", "fileId": "426YGeaQ1GSqxAl0es/FZ5",
"sync": false "sync": false
...@@ -2836,7 +2836,7 @@ ...@@ -2836,7 +2836,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c3212e1e-c907-4b5d-90c8-d2f5d7bd01ee" "__uuid__": "bdcfd97e-d9c1-4508-baf0-4d8796a211a9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2858,7 +2858,7 @@ ...@@ -2858,7 +2858,7 @@
"__id__": 42 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "1bsWjap9JK84XN2hkYfXDb", "fileId": "1bsWjap9JK84XN2hkYfXDb",
"sync": false "sync": false
...@@ -2891,7 +2891,7 @@ ...@@ -2891,7 +2891,7 @@
"_id": "9fHreXss9DBalXrxCH8QSS" "_id": "9fHreXss9DBalXrxCH8QSS"
}, },
{ {
"__type__": "6f9a1BFxYdMVrf7qBAsrDKu", "__type__": "b36acbJuAhFhIS8phbI8Cwt",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -2906,7 +2906,7 @@ ...@@ -2906,7 +2906,7 @@
"__id__": 42 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "32554152-8099-4085-b27c-f30a54f8e8f3" "__uuid__": "6cc19183-e95f-4001-8b22-404e52ae989c"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
...@@ -2956,7 +2956,7 @@ ...@@ -2956,7 +2956,7 @@
"_id": "6czk8/W9VNE4K3atfEBi/6" "_id": "6czk8/W9VNE4K3atfEBi/6"
}, },
{ {
"__type__": "54441jhizNAJLuuRTZaCQ9O", "__type__": "8a240ZqeqpETY61IRt+HE9W",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -2964,7 +2964,7 @@ ...@@ -2964,7 +2964,7 @@
}, },
"_enabled": true, "_enabled": true,
"loadingLayerProfab": { "loadingLayerProfab": {
"__uuid__": "67388d6d-3094-4a49-9cb5-66c4e834140c" "__uuid__": "51f33b9a-a281-4852-9079-471392dbfb0e"
}, },
"_id": "833ScIBRhDeqHYyC9n5aro" "_id": "833ScIBRhDeqHYyC9n5aro"
}, },
...@@ -3128,7 +3128,7 @@ ...@@ -3128,7 +3128,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "554e1884-51b9-4ffb-8dce-c4edb80b1e41" "__uuid__": "d28d69c0-6282-497d-9802-0179c28a687a"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3209,7 +3209,7 @@ ...@@ -3209,7 +3209,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "80ce9fe2-232d-48da-9298-8f721bfefc2f" "__uuid__": "e9e72e34-d9c0-4d8c-ba3c-2e58e056cc67"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3290,7 +3290,7 @@ ...@@ -3290,7 +3290,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "ee8e6a36-5f73-4545-9e8b-e791894d2a88" "__uuid__": "3bda5716-2de2-4425-b3f4-3f48693dd3f0"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3371,7 +3371,7 @@ ...@@ -3371,7 +3371,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "2714b4c3-7f50-4c28-8b5a-031a0a3812a5" "__uuid__": "572bc374-76d3-4916-8137-d8215d125e2c"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3452,7 +3452,7 @@ ...@@ -3452,7 +3452,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "307d8f53-6425-48a5-8dc5-262b03408d47" "__uuid__": "18dacbde-03e9-4106-838e-7cd4d6afbbb5"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3533,7 +3533,7 @@ ...@@ -3533,7 +3533,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "711a80d1-36b4-46a2-a201-4a36f7d3dcfb" "__uuid__": "c9408214-f92f-45aa-b355-10a51c703cb9"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3614,7 +3614,7 @@ ...@@ -3614,7 +3614,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "37f8998c-5fbe-45c6-880f-feda41765983" "__uuid__": "311ba2d9-5c7f-4509-bdd9-ee3fb361fe6e"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3695,7 +3695,7 @@ ...@@ -3695,7 +3695,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "6987f0d0-8fb2-4cf1-aebd-8155035ea77b" "__uuid__": "e5485690-99a9-418c-a136-e638c1ceffb2"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3776,7 +3776,7 @@ ...@@ -3776,7 +3776,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "c75b9114-9f11-4753-a591-ea3779961074" "__uuid__": "e231fbcd-a97c-4780-a755-f1d87649e37a"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3857,7 +3857,7 @@ ...@@ -3857,7 +3857,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "b767b3a2-208b-4790-935a-e83276a8277b" "__uuid__": "b4157452-9460-488e-b670-4e51e3e3b7fe"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -4116,7 +4116,7 @@ ...@@ -4116,7 +4116,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ae48dcb1-fc27-45e9-afdb-79d3f6fbde3c" "__uuid__": "fdbaf8b2-2277-4078-9a7b-a27abdd834c6"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4512,7 +4512,7 @@ ...@@ -4512,7 +4512,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "e4fe5fd2-9e66-40b9-b42d-9d9f5ba49b6d" "__uuid__": "87c509f8-3b61-49c2-a5bd-a810b8eee108"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4606,7 +4606,7 @@ ...@@ -4606,7 +4606,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "89fc1b5f-4bf1-4faf-b4b5-d5da0d5e1b2b" "__uuid__": "a507d8b9-5500-42dd-83c6-412278fc072e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4700,7 +4700,7 @@ ...@@ -4700,7 +4700,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8d9f703d-8c0d-479c-a6c8-f3034137cb8f" "__uuid__": "42ffe1ba-6864-48b3-a0af-94a2233af7ef"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4961,7 +4961,7 @@ ...@@ -4961,7 +4961,7 @@
} }
], ],
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3667da55-ee6a-46c4-9abd-ce869b8c9d42" "__uuid__": "c3787ca0-e1a1-4cc0-a2c6-8a834ad9a532"
}, },
"_type": 2, "_type": 2,
"_segments": 64, "_segments": 64,
...@@ -5047,7 +5047,7 @@ ...@@ -5047,7 +5047,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f7f0b4c9-b8fe-4bff-abba-a831bf6cac71" "__uuid__": "6ab949c3-52e8-40ea-8b09-c0ec3dcab902"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5146,7 +5146,7 @@ ...@@ -5146,7 +5146,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "fdc70fe1-3f0a-485e-9c1f-658f708043e2" "__uuid__": "db944dd7-18fd-4997-b751-b11d687c676e"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -5238,7 +5238,7 @@ ...@@ -5238,7 +5238,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cded2a19-d8ca-4093-b96e-aa845f615a65" "__uuid__": "a5369a5a-17fd-46bc-bd42-986fec7ad3cc"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5499,7 +5499,7 @@ ...@@ -5499,7 +5499,7 @@
} }
], ],
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3667da55-ee6a-46c4-9abd-ce869b8c9d42" "__uuid__": "c3787ca0-e1a1-4cc0-a2c6-8a834ad9a532"
}, },
"_type": 2, "_type": 2,
"_segments": 64, "_segments": 64,
...@@ -5585,7 +5585,7 @@ ...@@ -5585,7 +5585,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0f5865b4-a0cb-43ad-b7ba-d6121795a6b1" "__uuid__": "c7b6effc-9a32-430c-9301-9f556ab199cf"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5684,7 +5684,7 @@ ...@@ -5684,7 +5684,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "fdc70fe1-3f0a-485e-9c1f-658f708043e2" "__uuid__": "db944dd7-18fd-4997-b751-b11d687c676e"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -5776,7 +5776,7 @@ ...@@ -5776,7 +5776,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cded2a19-d8ca-4093-b96e-aa845f615a65" "__uuid__": "a5369a5a-17fd-46bc-bd42-986fec7ad3cc"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6037,7 +6037,7 @@ ...@@ -6037,7 +6037,7 @@
} }
], ],
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3667da55-ee6a-46c4-9abd-ce869b8c9d42" "__uuid__": "c3787ca0-e1a1-4cc0-a2c6-8a834ad9a532"
}, },
"_type": 2, "_type": 2,
"_segments": 64, "_segments": 64,
...@@ -6123,7 +6123,7 @@ ...@@ -6123,7 +6123,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "986e5ab9-4fe3-49e3-ba22-332421eb1bb9" "__uuid__": "946e40c9-8061-4814-981b-7186aae2689c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6222,7 +6222,7 @@ ...@@ -6222,7 +6222,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "fdc70fe1-3f0a-485e-9c1f-658f708043e2" "__uuid__": "db944dd7-18fd-4997-b751-b11d687c676e"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -6314,7 +6314,7 @@ ...@@ -6314,7 +6314,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cded2a19-d8ca-4093-b96e-aa845f615a65" "__uuid__": "a5369a5a-17fd-46bc-bd42-986fec7ad3cc"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6575,7 +6575,7 @@ ...@@ -6575,7 +6575,7 @@
} }
], ],
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3667da55-ee6a-46c4-9abd-ce869b8c9d42" "__uuid__": "c3787ca0-e1a1-4cc0-a2c6-8a834ad9a532"
}, },
"_type": 2, "_type": 2,
"_segments": 64, "_segments": 64,
...@@ -6661,7 +6661,7 @@ ...@@ -6661,7 +6661,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "50d39a3b-d3b2-4479-bfb0-fcb85b70c6c4" "__uuid__": "e1293a5d-68a2-49a6-82db-7eec7c6be4e1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6760,7 +6760,7 @@ ...@@ -6760,7 +6760,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "fdc70fe1-3f0a-485e-9c1f-658f708043e2" "__uuid__": "db944dd7-18fd-4997-b751-b11d687c676e"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -6852,7 +6852,7 @@ ...@@ -6852,7 +6852,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cded2a19-d8ca-4093-b96e-aa845f615a65" "__uuid__": "a5369a5a-17fd-46bc-bd42-986fec7ad3cc"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7113,7 +7113,7 @@ ...@@ -7113,7 +7113,7 @@
} }
], ],
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3667da55-ee6a-46c4-9abd-ce869b8c9d42" "__uuid__": "c3787ca0-e1a1-4cc0-a2c6-8a834ad9a532"
}, },
"_type": 2, "_type": 2,
"_segments": 64, "_segments": 64,
...@@ -7199,7 +7199,7 @@ ...@@ -7199,7 +7199,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "50d39a3b-d3b2-4479-bfb0-fcb85b70c6c4" "__uuid__": "e1293a5d-68a2-49a6-82db-7eec7c6be4e1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7298,7 +7298,7 @@ ...@@ -7298,7 +7298,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "fdc70fe1-3f0a-485e-9c1f-658f708043e2" "__uuid__": "db944dd7-18fd-4997-b751-b11d687c676e"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -7390,7 +7390,7 @@ ...@@ -7390,7 +7390,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cded2a19-d8ca-4093-b96e-aa845f615a65" "__uuid__": "a5369a5a-17fd-46bc-bd42-986fec7ad3cc"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7553,7 +7553,7 @@ ...@@ -7553,7 +7553,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "f5057793-a92d-4f73-a9cf-c161645b5adb#d2f430b5-11c7-40b5-a964-75bd09fbac02", "_armatureKey": "fba5ea68-8717-494b-a31e-ba25e50e14c3#789cf448-753f-4a29-83ec-63d2cfac49fa",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -7561,10 +7561,10 @@ ...@@ -7561,10 +7561,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "f5057793-a92d-4f73-a9cf-c161645b5adb" "__uuid__": "fba5ea68-8717-494b-a31e-ba25e50e14c3"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "d2f430b5-11c7-40b5-a964-75bd09fbac02" "__uuid__": "789cf448-753f-4a29-83ec-63d2cfac49fa"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 3, "_N$_animationIndex": 3,
...@@ -7629,7 +7629,7 @@ ...@@ -7629,7 +7629,7 @@
"_id": "85qGKxpLJJQ4O7pS1xyn6m" "_id": "85qGKxpLJJQ4O7pS1xyn6m"
}, },
{ {
"__type__": "0c69eL9yUxIs5WytukYYPey", "__type__": "5acc9wLeLdHzqgDRXpKGWuO",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "20802889-5dc3-422e-972b-bbac02ca59d1", "uuid": "52ec5dc6-7287-4414-a434-02e17db4c202",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": false, "autoReleaseAssets": false,
"subMetas": {} "subMetas": {}
......
...@@ -168,14 +168,16 @@ cc.Class({ ...@@ -168,14 +168,16 @@ cc.Class({
this.log("preload"); this.log("preload");
cc.assetManager.loadAny(preloadArr, null, null, (err, data) => { cc.assetManager.loadAny(preloadArr, null, null, (err, data) => {
if (window && window["air"]) { if (window && window["air"]) {
cc.find("Canvas").opacity = 0; // cc.find("Canvas").opacity = 0;
window.air.onCourseInScreen = (next) => { // window.air.onCourseInScreen = (next) => {
cc.find("Canvas").opacity = 255; // cc.find("Canvas").opacity = 255;
this.log("loadEnd1"); // this.log("loadEnd1");
// this.loadEnd();
// next();
// };
// window.air.hideAirClassLoading();
this.loadEnd(); this.loadEnd();
next(); window["air"].hideAirClassLoading();
};
window.air.hideAirClassLoading();
} else { } else {
this.log("loadEnd2"); this.log("loadEnd2");
this.loadEnd(); this.loadEnd();
...@@ -205,7 +207,7 @@ cc.Class({ ...@@ -205,7 +207,7 @@ cc.Class({
const loadingLayerNode = cc.instantiate(this.loadingLayerProfab); const loadingLayerNode = cc.instantiate(this.loadingLayerProfab);
loadingLayerBase.addChild(loadingLayerNode); loadingLayerBase.addChild(loadingLayerNode);
this.loadingLayer = loadingLayerNode.getComponent("LoadingLayer"); this.loadingLayer = loadingLayerNode.getComponent("OP33_PLUS_LoadingLayer");
this.loadingLayer.setMaxPlayerNumber(5); this.loadingLayer.setMaxPlayerNumber(5);
this.loadingLayer.onLoadFinished(() => { this.loadingLayer.onLoadFinished(() => {
...@@ -419,7 +421,7 @@ cc.Class({ ...@@ -419,7 +421,7 @@ cc.Class({
this.networkHelper.on("playerJoin", (event) => { this.networkHelper.on("playerJoin", (event) => {
if (this.server) { if (this.server) {
this.server.onPlayerJoin(event); this.server.onPlayerJoin({ data: { joinPlayerId: event.playerId } });
} }
cc.log("playerJoin" + JSON.stringify(event)); cc.log("playerJoin" + JSON.stringify(event));
}); });
...@@ -435,6 +437,9 @@ cc.Class({ ...@@ -435,6 +437,9 @@ cc.Class({
this.networkHelper.on("frameEvent", (event) => { this.networkHelper.on("frameEvent", (event) => {
event.data.frame.items.forEach((item) => { event.data.frame.items.forEach((item) => {
if (this.server) {
this.server.onFrameEvent(item.data);
}
if (item.data.type == "all_player_info") { if (item.data.type == "all_player_info") {
item.data.playerData.forEach((player) => { item.data.playerData.forEach((player) => {
if (!this.allPlayerList) { if (!this.allPlayerList) {
...@@ -463,7 +468,7 @@ cc.Class({ ...@@ -463,7 +468,7 @@ cc.Class({
} else if (item.data.type == "player_complete") { } else if (item.data.type == "player_complete") {
this.log("player_complete"); this.log("player_complete");
const resultNode = cc.find("resultNode"); const resultNode = cc.find("resultNode");
const resultLayer = resultNode.getComponent("resultLayer"); const resultLayer = resultNode.getComponent("OP33_PLUS_resultLayer");
item.data.playerData.forEach((player) => { item.data.playerData.forEach((player) => {
if (player.complete) { if (player.complete) {
resultLayer.addPlayerResult( resultLayer.addPlayerResult(
...@@ -475,9 +480,15 @@ cc.Class({ ...@@ -475,9 +480,15 @@ cc.Class({
); );
} }
}); });
} else if (item.data.type == "complete") { if (item.data.playerData.find(player => player.uuid == this.playerId && player.complete)) {
if (this.server) { item.data.playerData.sort((a, b) => {
this.server.onPlayerComplete(item.data.uuid, item.data.duration); return a.duration - b.duration;
});
const idx = item.data.playerData.findIndex(player => player.uuid == this.playerId);
this.onHomeworkFinish({
rank: idx + 1,
duration: this._gameDuration
});
} }
} }
}); });
...@@ -485,7 +496,7 @@ cc.Class({ ...@@ -485,7 +496,7 @@ cc.Class({
try { try {
this.log("喵喵喵1"); this.log("喵喵喵1");
this.playerId = await this.networkHelper.init("op_09_plus", 5); this.playerId = await this.networkHelper.init("OP33_PLUS", 5);
this.log("喵喵喵2"); this.log("喵喵喵2");
const room = this.networkHelper.room; const room = this.networkHelper.room;
if (this.playerId == room.roomInfo.owner) { if (this.playerId == room.roomInfo.owner) {
...@@ -502,22 +513,48 @@ cc.Class({ ...@@ -502,22 +513,48 @@ cc.Class({
} catch (e) { } catch (e) {
this.log(e.toString()); this.log(e.toString());
} }
await this.initHeadImgAndName();
},
async initHeadImgAndName() {
const playerInfo = {
playerHeadUrl: "http://staging-teach.cdn.ireadabc.com/0751c28419a0e8ffb1f0e84435b081ce.png",
playerName: "test",
};
const middleLayer = cc.find("middleLayer");
if (middleLayer) {
const middleLayerComponent = middleLayer.getComponent("middleLayer");
if (middleLayerComponent.getUserInfo && middleLayerComponent.getHeadUrl) {
const kidInfo = await middleLayerComponent.getUserInfo();
const playerHeadUrl = middleLayerComponent.getHeadUrl(kidInfo.avatar_url || kidInfo.id);
playerInfo.playerHeadUrl = playerHeadUrl;
playerInfo.playerName = kidInfo.nick_name || '拼读达人';
}
}
this.networkHelper.sendFrame({
type: "playerInfo",
playerId: this.playerId,
playerName: playerInfo.playerName,
playerHeadUrl: playerInfo.playerHeadUrl,
});
}, },
//TODO:copy---start //TODO:copy---start
firstCar() { firstCar() {
let pos1 = cc.v2(-30, -440); let posCenter = cc.v2(-30, -440);
let pos2 = cc.v2(2500, -440); let posRight = cc.v2(2500, -440);
let pos3 = cc.v2(-2500, -440); let posLeft = cc.v2(-2500, -440);
const car1 = cc.find('Canvas/bg/car_1'); const car1 = cc.find('Canvas/bg/car_1');
const car2 = cc.find('Canvas/bg/car_2'); const car2 = cc.find('Canvas/bg/car_2');
const car3 = cc.find('Canvas/bg/car_3'); const car3 = cc.find('Canvas/bg/car_3');
car1.x = pos2.x;
car1.y = pos2.y; car3.active = false;
car2.x = pos2.x; car1.x = posRight.x;
car2.y = pos2.y; car1.y = posRight.y;
cc.tween(car1).to(1, { x: pos1.x }).start(); car2.x = posRight.x;
car2.y = posRight.y;
cc.tween(car1).to(1, { x: posCenter.x }).start();
}, },
showFlower() { showFlower() {
for (let i = 1; i <= 2; i++) { for (let i = 1; i <= 2; i++) {
...@@ -527,20 +564,26 @@ cc.Class({ ...@@ -527,20 +564,26 @@ cc.Class({
flower.active = true; flower.active = true;
} }
let pos1 = cc.v2(-30, -440); let posCenter = cc.v2(-30, -440);
let pos2 = cc.v2(2500, -440); let posRight = cc.v2(2500, -440);
let pos3 = cc.v2(-2500, -440); let posLeft = cc.v2(-2500, -440);
const car1 = cc.find('Canvas/bg/car_1'); const car1 = cc.find('Canvas/bg/car_1');
const car2 = cc.find('Canvas/bg/car_2'); const car2 = cc.find('Canvas/bg/car_2');
car1.x = pos1.x; car1.x = posCenter.x;
car1.y = pos2.y; car1.y = posRight.y;
cc.tween(car1).by(0.2, { x: -60 }).by(0.2, { x: -100 }).by(0.2, { x: -120 }).by(0.2, { x: -140 }).by(0.2, { x: -180 }).to(1, { x: pos3.x }, cc.easing.quadIn).start(); cc.tween(car1)
.by(0.2, { x: -60 })
.by(0.2, { x: -100 })
.by(0.2, { x: -120 })
.by(0.2, { x: -140 })
.by(0.2, { x: -180 })
.to(1, { x: posLeft.x }, cc.easing.quadIn)
.start();
car2.x = posRight.x;
car2.y = posRight.y;
if (this.status.currentQuestionIdx + 1 < this.data.question_arr.length) { if (this.status.currentQuestionIdx + 1 < this.data.question_arr.length) {
car2.x = pos2.x; cc.tween(car2).delay(1).to(1, { x: posCenter.x }).start();
car2.y = pos2.y;
cc.tween(car2).delay(1).to(1, { x: pos1.x }).start();
} }
this.optionNodes.forEach(optionNode => { this.optionNodes.forEach(optionNode => {
...@@ -560,18 +603,25 @@ cc.Class({ ...@@ -560,18 +603,25 @@ cc.Class({
flower.active = false; flower.active = false;
} }
let pos1 = cc.v2(-30, -440); let posCenter = cc.v2(-30, -440);
let pos2 = cc.v2(2500, -440); let posRight = cc.v2(2500, -440);
let pos3 = cc.v2(-2500, -440); let posLeft = cc.v2(-2500, -440);
const car1 = cc.find('Canvas/bg/car_1'); const car1 = cc.find('Canvas/bg/car_1');
const car2 = cc.find('Canvas/bg/car_2'); const car2 = cc.find('Canvas/bg/car_2');
car1.x = pos1.x; car1.x = posRight.x;
car1.y = pos2.y; car1.y = posRight.y;
car2.x = pos2.x; car2.x = posRight.x;
car2.y = pos2.y; car2.y = posRight.y;
}, },
//TODO:copy---end //TODO:copy---end
finish: false,
onHomeworkFinish(data) {
if (!this.finish) {
onHomeworkFinish(data);
this.finish = true;
}
},
onAnswerRight() { onAnswerRight() {
//TODO:copy //TODO:copy
...@@ -623,7 +673,6 @@ cc.Class({ ...@@ -623,7 +673,6 @@ cc.Class({
this.submitBtnMoveOut(); this.submitBtnMoveOut();
this.showNextBtn(); this.showNextBtn();
this.stopCountTime(); this.stopCountTime();
onHomeworkFinish();
this.showResultLayer(); this.showResultLayer();
this.sendServerData(); this.sendServerData();
}); });
...@@ -641,21 +690,21 @@ cc.Class({ ...@@ -641,21 +690,21 @@ cc.Class({
showResultLayer() { showResultLayer() {
const resultNode = cc.find("resultNode"); const resultNode = cc.find("resultNode");
resultNode.active = true; resultNode.active = true;
const resultLayer = resultNode.getComponent("resultLayer"); const resultLayer = resultNode.getComponent("OP33_PLUS_resultLayer");
resultLayer.setFinishAudioList(this.data.finishAudioList); resultLayer.setFinishAudioList(this.data.finishAudioList);
}, },
boxJump() { boxJump() {
const boxBehind = cc.find("Canvas/bg/box_behind"); const car1 = cc.find('Canvas/bg/car_1');
const boxFront = cc.find("Canvas/bg/box_front"); const car2 = cc.find('Canvas/bg/car_2');
this.playEffect("boxJump"); this.playEffect("boxJump");
cc.tween(boxFront) cc.tween(car1)
.to(0.1, { scaleX: 1.02, scaleY: 1.02 }) .to(0.1, { scaleX: 1.02, scaleY: 1.02 })
.to(0.1, { scaleX: 1.0, scaleY: 1.0 }) .to(0.1, { scaleX: 1.0, scaleY: 1.0 })
.start(); .start();
cc.tween(boxBehind) cc.tween(car2)
.to(0.1, { scaleX: 1.02, scaleY: 1.02 }) .to(0.1, { scaleX: 1.02, scaleY: 1.02 })
.to(0.1, { scaleX: 1.0, scaleY: 1.0 }) .to(0.1, { scaleX: 1.0, scaleY: 1.0 })
.start(); .start();
...@@ -806,8 +855,4 @@ cc.Class({ ...@@ -806,8 +855,4 @@ cc.Class({
cc.log(str); cc.log(str);
} }
}, },
// 生命周期
onDestroy() {
this.networkHelper.onDestroy();
},
}); });
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "544418e1-8b33-4024-bbae-45365a090f4e", "uuid": "8a24066a-7aaa-444d-8eb5-211b7e1c4f56",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "6f9a1045-c587-4c56-b7fb-a8102cac32ae", "uuid": "5acc9c0b-78b7-47ce-a803-457a4a196b8e",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -40,6 +40,7 @@ export class GameServer { ...@@ -40,6 +40,7 @@ export class GameServer {
duration: null duration: null
}); });
if (player.isAI) {
if (this.playerList.length == this.playerMaxNumber) { if (this.playerList.length == this.playerMaxNumber) {
this.networkHelper.closeRoom(); this.networkHelper.closeRoom();
this.startAIDuration(); this.startAIDuration();
...@@ -50,6 +51,25 @@ export class GameServer { ...@@ -50,6 +51,25 @@ export class GameServer {
playerData: this.playerList playerData: this.playerList
}); });
} }
}
onFrameEvent(event) {
if (event.type == "complete") {
this.onPlayerComplete(event.uuid, event.duration);
} else if (event.type == "playerInfo") {
const player = this.playerList.find(p => p.uuid == event.playerId);
player.name = event.playerName;
player.headUrl = event.playerHeadUrl;
if (this.playerList.length == this.playerMaxNumber) {
this.networkHelper.closeRoom();
this.startAIDuration();
}
this.networkHelper.sendFrame({
type: 'all_player_info',
playerData: this.playerList
});
}
}
onPlayerComplete(uuid: string, duration: number) { onPlayerComplete(uuid: string, duration: number) {
const player = this.playerList.find(player => player.uuid == uuid); const player = this.playerList.find(player => player.uuid == uuid);
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "062893e4-b723-4cfc-ac69-0341e2d3920f", "uuid": "df540200-8d6f-4012-b7f4-ae4c3f732566",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "6abf9ff8-6f0c-4b44-9944-37dd28b44b10", "uuid": "ff6b5daa-1320-4cc7-b500-3baf1caed42e",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "61360c2e-957f-4ba9-84ad-2706a0f7d94f", "uuid": "6b1eca23-ae80-479d-b5fa-a67164fff840",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "bb87c8d5-7860-4cd8-89b9-12aba87b27a8", "uuid": "2a98996d-92a5-4e9e-b628-e3353574ec0b",
"isPlugin": true, "isPlugin": true,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "fb37aa09-a284-49f3-b4fc-0abb13e40ad0", "uuid": "158157f5-1b4c-4933-96d1-cffbc5218777",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "c586a986-a1ac-4941-a105-d138d97a9826", "uuid": "6e1ea381-6936-4489-a365-1517684c63d8",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "55061d98-b02e-4681-b587-a3e994d9d44a", "uuid": "1d5affae-6c86-4f9e-bd48-6d51256975e6",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_bg": { "bg_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "2927f6dd-35ac-4981-95c3-d53119b984eb", "uuid": "3c45e954-7e7c-424e-95aa-c1cb8e574370",
"rawTextureUuid": "55061d98-b02e-4681-b587-a3e994d9d44a", "rawTextureUuid": "1d5affae-6c86-4f9e-bd48-6d51256975e6",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d9da4856-513c-42bf-a872-5a67ff02c1f9", "uuid": "dea2c824-0601-47ea-b641-18a2e99d95e1",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_box_behind": { "bg_box_behind": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "963c5bfd-6d58-497e-a353-bc3f6e604bf2", "uuid": "fd108b6a-d51a-4868-bdc7-2336fce5af97",
"rawTextureUuid": "d9da4856-513c-42bf-a872-5a67ff02c1f9", "rawTextureUuid": "dea2c824-0601-47ea-b641-18a2e99d95e1",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "41fe50b5-ef5b-46d7-91b7-3cba5c4a27c4", "uuid": "0fab684b-6b59-4bfc-a5cb-0998d73dfe21",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_box_front": { "bg_box_front": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "7350af6b-f282-4658-a08c-f5f3e2fe109a", "uuid": "bdac40b0-230f-4ce1-808c-72e666e16f8c",
"rawTextureUuid": "41fe50b5-ef5b-46d7-91b7-3cba5c4a27c4", "rawTextureUuid": "0fab684b-6b59-4bfc-a5cb-0998d73dfe21",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "bf1bc519-b53d-4b66-b770-22d548474c12", "uuid": "76712cd6-07cf-45fa-9470-b2ab44ef6fd0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_deck": { "bg_deck": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "9fe79c9e-ec28-4461-88ed-3d08331ae0d0", "uuid": "59dfd5c4-c40b-4be7-a1ee-0e46e2733766",
"rawTextureUuid": "bf1bc519-b53d-4b66-b770-22d548474c12", "rawTextureUuid": "76712cd6-07cf-45fa-9470-b2ab44ef6fd0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b57c846d-0130-4864-8713-b0c60503eda5", "uuid": "e7d4d6f4-0fd4-48db-9536-05b629430161",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_next": { "btn_next": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "21f1e1f1-2cc2-47d0-aadc-73487d78f184", "uuid": "23eae794-5bae-4963-a5a0-39d2630e28cb",
"rawTextureUuid": "b57c846d-0130-4864-8713-b0c60503eda5", "rawTextureUuid": "e7d4d6f4-0fd4-48db-9536-05b629430161",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "7c71c8a3-69d6-4c84-a016-2f24602e5086", "uuid": "90da07b2-6fd1-4cda-8e69-6c357b464ae1",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_return": { "btn_return": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "6b00a306-c9a7-48f7-92ed-1a50b479f6b7", "uuid": "d4f8a74b-1f78-43a2-bed2-2cc1eeb43640",
"rawTextureUuid": "7c71c8a3-69d6-4c84-a016-2f24602e5086", "rawTextureUuid": "90da07b2-6fd1-4cda-8e69-6c357b464ae1",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4bc5f5de-6198-4942-88f4-fd21f2db3b10", "uuid": "846c14db-1141-430c-8703-5d5a22551955",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_submit": { "btn_submit": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "202541ce-057f-483a-8c88-badc60f3774e", "uuid": "aafde45e-6ae8-4e8d-88ec-cf8126cdd7de",
"rawTextureUuid": "4bc5f5de-6198-4942-88f4-fd21f2db3b10", "rawTextureUuid": "846c14db-1141-430c-8703-5d5a22551955",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "6aff82b0-0010-43e7-a563-248fb30543fd", "uuid": "fe4049ff-fd02-4a4d-9a34-a48c19a2514e",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "7e73cf0e-aa49-4b92-8de0-fdc192b43af7", "uuid": "1a4970e6-2536-4d96-808f-01ec527c982e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_bg": { "bg_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "b7f30449-ba98-4ee8-b0bf-6fec93526ef4", "uuid": "470579f6-5216-44a6-bdd5-6ec66a2a8dc0",
"rawTextureUuid": "7e73cf0e-aa49-4b92-8de0-fdc192b43af7", "rawTextureUuid": "1a4970e6-2536-4d96-808f-01ec527c982e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "fedb32bc-79f6-4fb8-bf00-1165a6848eec", "uuid": "462a783e-d4fd-4d03-b765-233dd51571c6",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_box_behind": { "bg_box_behind": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "69f75381-0e32-43eb-9a14-f4628d425f05", "uuid": "73136959-08d9-44f8-a9c5-e786fb568a62",
"rawTextureUuid": "fedb32bc-79f6-4fb8-bf00-1165a6848eec", "rawTextureUuid": "462a783e-d4fd-4d03-b765-233dd51571c6",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "0a19f267-c6a4-430c-8a1a-b07b9ac83ec4", "uuid": "85c6b851-4531-4763-950f-0a6a96c442a8",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_box_front": { "bg_box_front": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "6161c7f6-5213-4b98-86c8-ff01881c717e", "uuid": "e10b99d7-293d-4b18-a818-6854663fd3cc",
"rawTextureUuid": "0a19f267-c6a4-430c-8a1a-b07b9ac83ec4", "rawTextureUuid": "85c6b851-4531-4763-950f-0a6a96c442a8",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3dccc3e9-1269-4cad-98ba-a819a4bb53eb", "uuid": "24783b4e-1cdd-4591-815b-9f8ae099eab0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_deck": { "bg_deck": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a5829e01-a23d-4041-b4c0-b5ed95daffd0", "uuid": "b0b5a901-beea-4f69-a5ce-bf7280379611",
"rawTextureUuid": "3dccc3e9-1269-4cad-98ba-a819a4bb53eb", "rawTextureUuid": "24783b4e-1cdd-4591-815b-9f8ae099eab0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "156fec7e-30d5-4658-b4a6-6193fc9d6da9", "uuid": "2c23743a-2f04-4d53-988a-cf1059b48736",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_left": { "bg_left": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "4627cbc4-8f18-4512-b22f-0f1741b07df4", "uuid": "e25cd08b-1090-4faa-b380-6714e5abc1ff",
"rawTextureUuid": "156fec7e-30d5-4658-b4a6-6193fc9d6da9", "rawTextureUuid": "2c23743a-2f04-4d53-988a-cf1059b48736",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "42803541-616f-4434-9ef7-6070a5620529", "uuid": "a0082161-756d-48b3-a300-a3db2e683cd1",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_right": { "bg_right": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e4fef2cb-d9fc-47bf-bfa5-0709e69d08e1", "uuid": "4fc5e674-d2ad-4730-8f88-623d286e5c2f",
"rawTextureUuid": "42803541-616f-4434-9ef7-6070a5620529", "rawTextureUuid": "a0082161-756d-48b3-a300-a3db2e683cd1",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "35dea2db-f61a-4b1e-8659-24cfe6e6c7f8", "uuid": "ba511ec6-4cc9-44ed-ab47-d47784db62ef",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_top": { "bg_top": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "62d22232-4fa9-42aa-b0cd-444d9ff2ae4a", "uuid": "a40cf66b-0792-4353-8d3c-6dc282bc5353",
"rawTextureUuid": "35dea2db-f61a-4b1e-8659-24cfe6e6c7f8", "rawTextureUuid": "ba511ec6-4cc9-44ed-ab47-d47784db62ef",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "a66dd242-e4c3-423d-9283-a43345715723", "uuid": "e0370ebb-aa7a-46d0-9ef3-51a3120a8740",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "ac4546dd-45c6-4911-97bf-0413e3b66e9f", "uuid": "2d047141-93fb-44de-ab74-3b9ce349fd48",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"arrow": { "arrow": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "cded2a19-d8ca-4093-b96e-aa845f615a65", "uuid": "a5369a5a-17fd-46bc-bd42-986fec7ad3cc",
"rawTextureUuid": "ac4546dd-45c6-4911-97bf-0413e3b66e9f", "rawTextureUuid": "2d047141-93fb-44de-ab74-3b9ce349fd48",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5a0b908e-b0e9-410d-bf63-027e66cae69a", "uuid": "0aa1b536-eeb5-4465-839e-b19fdc5d29e0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"head_0": { "head_0": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "f7f0b4c9-b8fe-4bff-abba-a831bf6cac71", "uuid": "6ab949c3-52e8-40ea-8b09-c0ec3dcab902",
"rawTextureUuid": "5a0b908e-b0e9-410d-bf63-027e66cae69a", "rawTextureUuid": "0aa1b536-eeb5-4465-839e-b19fdc5d29e0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3c9089f5-b3b6-4dd3-895e-2ecade51ba5d", "uuid": "32b0e7f2-08d3-4561-8f80-ef1b050b45db",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"head_1": { "head_1": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0f5865b4-a0cb-43ad-b7ba-d6121795a6b1", "uuid": "c7b6effc-9a32-430c-9301-9f556ab199cf",
"rawTextureUuid": "3c9089f5-b3b6-4dd3-895e-2ecade51ba5d", "rawTextureUuid": "32b0e7f2-08d3-4561-8f80-ef1b050b45db",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e6f76be3-066e-4f7d-9dee-52298d6ad21f", "uuid": "a8b099d6-bf4a-46c1-9fae-17ec12544937",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"head_2": { "head_2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "986e5ab9-4fe3-49e3-ba22-332421eb1bb9", "uuid": "946e40c9-8061-4814-981b-7186aae2689c",
"rawTextureUuid": "e6f76be3-066e-4f7d-9dee-52298d6ad21f", "rawTextureUuid": "a8b099d6-bf4a-46c1-9fae-17ec12544937",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "47afc41d-b137-4c69-a6e2-595609958ae1", "uuid": "d18ce248-84c3-4404-a58f-c8fb27647fb3",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"head_3": { "head_3": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "50d39a3b-d3b2-4479-bfb0-fcb85b70c6c4", "uuid": "e1293a5d-68a2-49a6-82db-7eec7c6be4e1",
"rawTextureUuid": "47afc41d-b137-4c69-a6e2-595609958ae1", "rawTextureUuid": "d18ce248-84c3-4404-a58f-c8fb27647fb3",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e0064fc4-3a34-41ae-965c-11653ea2dfca", "uuid": "854930c8-c780-4590-96f7-5b6f9af9e0f5",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"jiangtai": { "jiangtai": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "8d9f703d-8c0d-479c-a6c8-f3034137cb8f", "uuid": "42ffe1ba-6864-48b3-a0af-94a2233af7ef",
"rawTextureUuid": "e0064fc4-3a34-41ae-965c-11653ea2dfca", "rawTextureUuid": "854930c8-c780-4590-96f7-5b6f9af9e0f5",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "8880a9e2-b214-46ee-b3e4-d94770085c44", "uuid": "d5daf550-751f-4cf2-9bdf-7408c6e0f7b2",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"lj_guangxiao01": { "lj_guangxiao01": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "89fc1b5f-4bf1-4faf-b4b5-d5da0d5e1b2b", "uuid": "a507d8b9-5500-42dd-83c6-412278fc072e",
"rawTextureUuid": "8880a9e2-b214-46ee-b3e4-d94770085c44", "rawTextureUuid": "d5daf550-751f-4cf2-9bdf-7408c6e0f7b2",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "35b9d6b0-8646-4719-b8e5-24e5bc0b8349", "uuid": "887492ba-7fd8-467a-a997-16bf9592f17f",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"lj_guangxiao02": { "lj_guangxiao02": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e4fe5fd2-9e66-40b9-b42d-9d9f5ba49b6d", "uuid": "87c509f8-3b61-49c2-a5bd-a810b8eee108",
"rawTextureUuid": "35b9d6b0-8646-4719-b8e5-24e5bc0b8349", "rawTextureUuid": "887492ba-7fd8-467a-a997-16bf9592f17f",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "2de107d6-c994-4a3f-b3e0-fa58ca5f4d7d", "uuid": "53eba6c7-dc18-48db-84fa-e98d2a4aae63",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"lj_tx_zw": { "lj_tx_zw": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "3667da55-ee6a-46c4-9abd-ce869b8c9d42", "uuid": "c3787ca0-e1a1-4cc0-a2c6-8a834ad9a532",
"rawTextureUuid": "2de107d6-c994-4a3f-b3e0-fa58ca5f4d7d", "rawTextureUuid": "53eba6c7-dc18-48db-84fa-e98d2a4aae63",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5ea3ad42-b4e7-43d6-ac36-271b8f8aef41", "uuid": "d4c978bd-ca62-4fcb-b07e-b077bd815cec",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"star": { "star": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ae48dcb1-fc27-45e9-afdb-79d3f6fbde3c", "uuid": "fdbaf8b2-2277-4078-9a7b-a27abdd834c6",
"rawTextureUuid": "5ea3ad42-b4e7-43d6-ac36-271b8f8aef41", "rawTextureUuid": "d4c978bd-ca62-4fcb-b07e-b077bd815cec",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "21f3ad87-8caa-420e-9851-d332b95c9c54", "uuid": "fc4474ee-2f5a-491b-902f-acb872f8c065",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"texiao_01": { "texiao_01": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c04d9a9f-da23-4f34-a602-ad9214d8b372", "uuid": "39949b16-158f-41dd-8a5d-9cb5f6e0ad55",
"rawTextureUuid": "21f3ad87-8caa-420e-9851-d332b95c9c54", "rawTextureUuid": "fc4474ee-2f5a-491b-902f-acb872f8c065",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
...@@ -52,7 +52,7 @@ function execCmd(cmd, params, path) { ...@@ -52,7 +52,7 @@ function execCmd(cmd, params, path) {
} }
let creatorBasePath = 'D:\\work\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\CocosCreator.exe'; let creatorBasePath = 'CocosCreator';
if (process.platform !== 'win32') { if (process.platform !== 'win32') {
creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator"; creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator";
} }
...@@ -330,6 +330,84 @@ async function replaceUuids() { ...@@ -330,6 +330,84 @@ async function replaceUuids() {
} }
console.log('build_step_0 完成~!'); console.log('build_step_0 完成~!');
const sceneName = getFolderName(path);
let scriptUUids = [];
await fileForEach(path, (path) => {
const nameList = path.split('.');
if (nameList[nameList.length - 1] == 'meta') {
if (['js', 'ts'].includes(nameList[nameList.length - 2])) {
const scriptNameList = nameList[nameList.length - 3].split('/');
const scriptName = scriptNameList[scriptNameList.length - 1];
const data = JSON.parse(fs.readFileSync(path));
scriptUUids.push({
uuid: data.uuid,
shortUuid: getShortUuid(data.uuid),
scriptName: scriptName,
fileName: nameList[nameList.length - 3] + '.' + nameList[nameList.length - 2],
});
}
}
});
await fileForEach(path, (path) => {
const nameList = path.split('.');
const expectNameList = ['fire', 'prefab'];
if (expectNameList.includes(nameList[nameList.length - 1])) {
const data = fs.readFileSync(path);
scriptUUids.forEach(uuiddata => {
if (uuiddata.scriptName.includes(sceneName)) {
uuiddata.includes = false;
return;
}
if (uuiddata.includes == true) {
return;
}
if (data.includes(uuiddata.shortUuid)) {
uuiddata.includes = true;
}
});
}
});
scriptUUids = scriptUUids.filter(uuiddata => uuiddata.includes);
await fileForEach(path, (path) => {
const nameList = path.split('.');
const expectNameList = ['js', 'ts'];
if (expectNameList.includes(nameList[nameList.length - 1])) {
const data = fs.readFileSync(path);
scriptUUids.forEach(uuiddata => {
const strList = [
`.getComponent("${uuiddata.scriptName}")`,
`.getComponent('${uuiddata.scriptName}')`,
`.getComponent(\`${uuiddata.scriptName}\`)`
];
strList.forEach(str => {
if (data.includes(str)) {
fileReplace(path, str, `.getComponent("${sceneName}_${uuiddata.scriptName}")`);
}
});
});
}
});
scriptUUids.forEach((uuiddata) => {
const data = fs.readFileSync(uuiddata.fileName);
const metaData = fs.readFileSync(uuiddata.fileName + '.meta');
const new_fileName = `${sceneName}_${uuiddata.scriptName}`;
const newPath = uuiddata.fileName.split('/').map((str, idx, arr) => {
if (idx == arr.length - 1) {
const nameList = str.split('.');
return `${new_fileName}.${nameList[nameList.length - 1]}`;
}
return str;
}).join('/');
fs.writeFileSync(newPath, data);
fs.rmSync(uuiddata.fileName);
fs.writeFileSync(newPath + '.meta', metaData);
fs.rmSync(uuiddata.fileName + '.meta');
});
console.log(scriptUUids.map(uuiddata => uuiddata.scriptName));
} }
function replaceIndexHtml() { function replaceIndexHtml() {
...@@ -339,6 +417,8 @@ function replaceIndexHtml() { ...@@ -339,6 +417,8 @@ function replaceIndexHtml() {
module.exports = { module.exports = {
replaceUuids: replaceUuids,
build: async function () { build: async function () {
const startTime = new Date().getTime(); const startTime = new Date().getTime();
...@@ -349,56 +429,56 @@ module.exports = { ...@@ -349,56 +429,56 @@ module.exports = {
// 清理旧文件 // 清理旧文件
// 构建form // 构建form
// await removeDir('dist/form'); await removeDir('dist/form');
// await buildForm(); await buildForm();
// 替换uuid // 替换uuid
await replaceUuids(); await replaceUuids();
// 改设置为非bundle // 改设置为非bundle
// changeSettingToWebDesktop(); changeSettingToWebDesktop();
// // 构建play // 构建play
// await removeDir('dist/play'); await removeDir('dist/play');
// await buildWebDesktop(); await buildWebDesktop();
// await copyDir('build/web-desktop', 'dist/play'); await copyDir('build/web-desktop', 'dist/play');
// replaceIndexHtml(); replaceIndexHtml();
// console.log('构建 web desktop 成功!'); console.log('构建 web desktop 成功!');
// // 改设置为bundle // 改设置为bundle
// changeSettingsToBundle(); changeSettingsToBundle();
// await removeDir('dist/android'); await removeDir('dist/android');
// await buildAndroidBundle(); await buildAndroidBundle();
// await copyDir('build_android/jsb-link/remote', 'dist/android'); await copyDir('build_android/jsb-link/remote', 'dist/android');
// console.log('构建 android bundle 成功!'); console.log('构建 android bundle 成功!');
// await removeDir('dist/ios'); await removeDir('dist/ios');
// await buildIosBundle(); await buildIosBundle();
// await copyDir('build_ios/jsb-link/remote', 'dist/ios'); await copyDir('build_ios/jsb-link/remote', 'dist/ios');
// console.log('构建 ios bundle 成功!'); console.log('构建 ios bundle 成功!');
// await removeDir('dist/web_desktop'); await removeDir('dist/web_desktop');
// await buildWebBundle(); await buildWebBundle();
// await copyDir(`build_web_desktop/web-desktop/assets/${projectName}`, 'dist/web_desktop'); await copyDir(`build_web_desktop/web-desktop/assets/${projectName}`, 'dist/web_desktop');
// console.log('构建 web bundle 成功!'); console.log('构建 web bundle 成功!');
// // 改设置为非bundle // 改设置为非bundle
// changeSettingToWebDesktop(); changeSettingToWebDesktop();
// createConfigFile(projectName); createConfigFile(projectName);
// compressAll(projectName); compressAll(projectName);
// await removeDir('build'); await removeDir('build');
// await removeDir('build_android'); await removeDir('build_android');
// await removeDir('build_ios'); await removeDir('build_ios');
// await removeDir('build_web_desktop'); await removeDir('build_web_desktop');
// const endTime = new Date().getTime(); const endTime = new Date().getTime();
// const duration = new Date(endTime - startTime); const duration = new Date(endTime - startTime);
// console.log(`打包完成!`); console.log(`打包完成!`);
// console.log(`用时${duration.getMinutes()}分${duration.getSeconds()}秒。`); console.log(`用时${duration.getMinutes()}${duration.getSeconds()}秒。`);
}, },
buildAndroid: async function () { buildAndroid: async function () {
......
...@@ -1778,6 +1778,11 @@ ...@@ -1778,6 +1778,11 @@
"through": ">=2.2.7 <3" "through": ">=2.2.7 <3"
} }
}, },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
},
"accepts": { "accepts": {
"version": "1.3.7", "version": "1.3.7",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
...@@ -1900,6 +1905,11 @@ ...@@ -1900,6 +1905,11 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true "dev": true
}, },
"amdefine": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
"integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="
},
"ansi-colors": { "ansi-colors": {
"version": "3.2.4", "version": "3.2.4",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
...@@ -1924,14 +1934,12 @@ ...@@ -1924,14 +1934,12 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
"dev": true
}, },
"ansi-styles": { "ansi-styles": {
"version": "3.2.1", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": { "requires": {
"color-convert": "^1.9.0" "color-convert": "^1.9.0"
} }
...@@ -1969,8 +1977,16 @@ ...@@ -1969,8 +1977,16 @@
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
"dev": true },
"are-we-there-yet": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
}
}, },
"arg": { "arg": {
"version": "4.1.3", "version": "4.1.3",
...@@ -2015,6 +2031,11 @@ ...@@ -2015,6 +2031,11 @@
"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
"dev": true "dev": true
}, },
"array-find-index": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
"integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="
},
"array-flatten": { "array-flatten": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
...@@ -2064,7 +2085,6 @@ ...@@ -2064,7 +2085,6 @@
"version": "0.2.4", "version": "0.2.4",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
"dev": true,
"requires": { "requires": {
"safer-buffer": "~2.1.0" "safer-buffer": "~2.1.0"
} }
...@@ -2118,8 +2138,7 @@ ...@@ -2118,8 +2138,7 @@
"assert-plus": { "assert-plus": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
"dev": true
}, },
"assign-symbols": { "assign-symbols": {
"version": "1.0.0", "version": "1.0.0",
...@@ -2153,6 +2172,11 @@ ...@@ -2153,6 +2172,11 @@
"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
"dev": true "dev": true
}, },
"async-foreach": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
"integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA=="
},
"async-limiter": { "async-limiter": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
...@@ -2162,8 +2186,7 @@ ...@@ -2162,8 +2186,7 @@
"asynckit": { "asynckit": {
"version": "0.4.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
"dev": true
}, },
"atob": { "atob": {
"version": "2.1.2", "version": "2.1.2",
...@@ -2189,14 +2212,12 @@ ...@@ -2189,14 +2212,12 @@
"aws-sign2": { "aws-sign2": {
"version": "0.7.0", "version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
"dev": true
}, },
"aws4": { "aws4": {
"version": "1.10.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
"integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==", "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
"dev": true
}, },
"axobject-query": { "axobject-query": {
"version": "2.0.2", "version": "2.0.2",
...@@ -2335,7 +2356,6 @@ ...@@ -2335,7 +2356,6 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"dev": true,
"requires": { "requires": {
"tweetnacl": "^0.14.3" "tweetnacl": "^0.14.3"
} }
...@@ -2386,6 +2406,14 @@ ...@@ -2386,6 +2406,14 @@
"integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==", "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
"dev": true "dev": true
}, },
"block-stream": {
"version": "0.0.9",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
"integrity": "sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==",
"requires": {
"inherits": "~2.0.0"
}
},
"blocking-proxy": { "blocking-proxy": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz", "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
...@@ -2806,8 +2834,23 @@ ...@@ -2806,8 +2834,23 @@
"camelcase": { "camelcase": {
"version": "5.3.1", "version": "5.3.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
"dev": true },
"camelcase-keys": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
"requires": {
"camelcase": "^2.0.0",
"map-obj": "^1.0.0"
},
"dependencies": {
"camelcase": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
"integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw=="
}
}
}, },
"caniuse-api": { "caniuse-api": {
"version": "3.0.0", "version": "3.0.0",
...@@ -2836,8 +2879,7 @@ ...@@ -2836,8 +2879,7 @@
"caseless": { "caseless": {
"version": "0.12.0", "version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
"dev": true
}, },
"chalk": { "chalk": {
"version": "2.4.2", "version": "2.4.2",
...@@ -3033,8 +3075,7 @@ ...@@ -3033,8 +3075,7 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
"dev": true
}, },
"codelyzer": { "codelyzer": {
"version": "5.2.2", "version": "5.2.2",
...@@ -3091,7 +3132,6 @@ ...@@ -3091,7 +3132,6 @@
"version": "1.9.3", "version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
"dev": true,
"requires": { "requires": {
"color-name": "1.1.3" "color-name": "1.1.3"
} }
...@@ -3099,8 +3139,7 @@ ...@@ -3099,8 +3139,7 @@
"color-name": { "color-name": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
"dev": true
}, },
"color-string": { "color-string": {
"version": "1.5.3", "version": "1.5.3",
...@@ -3122,7 +3161,6 @@ ...@@ -3122,7 +3161,6 @@
"version": "1.0.8", "version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"dev": true,
"requires": { "requires": {
"delayed-stream": "~1.0.0" "delayed-stream": "~1.0.0"
} }
...@@ -3262,6 +3300,11 @@ ...@@ -3262,6 +3300,11 @@
"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
"dev": true "dev": true
}, },
"console-control-strings": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
},
"constants-browserify": { "constants-browserify": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
...@@ -3755,6 +3798,14 @@ ...@@ -3755,6 +3798,14 @@
} }
} }
}, },
"currently-unhandled": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
"integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
"requires": {
"array-find-index": "^1.0.1"
}
},
"custom-event": { "custom-event": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
...@@ -3777,7 +3828,6 @@ ...@@ -3777,7 +3828,6 @@
"version": "1.14.1", "version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"dev": true,
"requires": { "requires": {
"assert-plus": "^1.0.0" "assert-plus": "^1.0.0"
} }
...@@ -3827,8 +3877,7 @@ ...@@ -3827,8 +3877,7 @@
"decamelize": { "decamelize": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
"dev": true
}, },
"decode-uri-component": { "decode-uri-component": {
"version": "0.2.0", "version": "0.2.0",
...@@ -4006,8 +4055,12 @@ ...@@ -4006,8 +4055,12 @@
"delayed-stream": { "delayed-stream": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
"dev": true },
"delegates": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
}, },
"depd": { "depd": {
"version": "1.1.2", "version": "1.1.2",
...@@ -4211,7 +4264,6 @@ ...@@ -4211,7 +4264,6 @@
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"dev": true,
"requires": { "requires": {
"jsbn": "~0.1.0", "jsbn": "~0.1.0",
"safer-buffer": "^2.1.0" "safer-buffer": "^2.1.0"
...@@ -4458,7 +4510,6 @@ ...@@ -4458,7 +4510,6 @@
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
"dev": true,
"requires": { "requires": {
"is-arrayish": "^0.2.1" "is-arrayish": "^0.2.1"
} }
...@@ -4520,8 +4571,7 @@ ...@@ -4520,8 +4571,7 @@
"escape-string-regexp": { "escape-string-regexp": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
"dev": true
}, },
"escodegen": { "escodegen": {
"version": "1.14.3", "version": "1.14.3",
...@@ -4795,8 +4845,7 @@ ...@@ -4795,8 +4845,7 @@
"extsprintf": { "extsprintf": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
"dev": true
}, },
"fast-deep-equal": { "fast-deep-equal": {
"version": "2.0.1", "version": "2.0.1",
...@@ -4807,8 +4856,7 @@ ...@@ -4807,8 +4856,7 @@
"fast-json-stable-stringify": { "fast-json-stable-stringify": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
"dev": true
}, },
"fast-levenshtein": { "fast-levenshtein": {
"version": "2.0.6", "version": "2.0.6",
...@@ -5008,7 +5056,6 @@ ...@@ -5008,7 +5056,6 @@
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
"dev": true,
"requires": { "requires": {
"locate-path": "^3.0.0" "locate-path": "^3.0.0"
} }
...@@ -5049,14 +5096,12 @@ ...@@ -5049,14 +5096,12 @@
"forever-agent": { "forever-agent": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
"dev": true
}, },
"form-data": { "form-data": {
"version": "2.3.3", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
"dev": true,
"requires": { "requires": {
"asynckit": "^0.4.0", "asynckit": "^0.4.0",
"combined-stream": "^1.0.6", "combined-stream": "^1.0.6",
...@@ -5160,6 +5205,17 @@ ...@@ -5160,6 +5205,17 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"fstream": {
"version": "1.0.12",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
"requires": {
"graceful-fs": "^4.1.2",
"inherits": "~2.0.0",
"mkdirp": ">=0.5 0",
"rimraf": "2"
}
},
"ftp": { "ftp": {
"version": "0.3.10", "version": "0.3.10",
"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz", "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
...@@ -5198,6 +5254,49 @@ ...@@ -5198,6 +5254,49 @@
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true "dev": true
}, },
"gauge": {
"version": "2.7.4",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
"requires": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
"has-unicode": "^2.0.0",
"object-assign": "^4.1.0",
"signal-exit": "^3.0.0",
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
},
"dependencies": {
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
"requires": {
"number-is-nan": "^1.0.0"
}
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
"strip-ansi": "^3.0.0"
}
}
}
},
"gaze": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
"requires": {
"globule": "^1.0.0"
}
},
"genfun": { "genfun": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz", "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
...@@ -5215,6 +5314,11 @@ ...@@ -5215,6 +5314,11 @@
"resolved": "https://registry.npmjs.org/get-ready/-/get-ready-1.0.0.tgz", "resolved": "https://registry.npmjs.org/get-ready/-/get-ready-1.0.0.tgz",
"integrity": "sha1-+RgX8emt7P6hOlYq38jeiDqzR4I=" "integrity": "sha1-+RgX8emt7P6hOlYq38jeiDqzR4I="
}, },
"get-stdin": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
"integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="
},
"get-stream": { "get-stream": {
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
...@@ -5247,7 +5351,6 @@ ...@@ -5247,7 +5351,6 @@
"version": "0.1.7", "version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"dev": true,
"requires": { "requires": {
"assert-plus": "^1.0.0" "assert-plus": "^1.0.0"
} }
...@@ -5314,11 +5417,27 @@ ...@@ -5314,11 +5417,27 @@
} }
} }
}, },
"globule": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
"integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
"requires": {
"glob": "~7.1.1",
"lodash": "^4.17.21",
"minimatch": "~3.0.2"
},
"dependencies": {
"lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
}
}
},
"graceful-fs": { "graceful-fs": {
"version": "4.2.4", "version": "4.2.4",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
"dev": true
}, },
"handle-thing": { "handle-thing": {
"version": "2.0.1", "version": "2.0.1",
...@@ -5329,14 +5448,12 @@ ...@@ -5329,14 +5448,12 @@
"har-schema": { "har-schema": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
"dev": true
}, },
"har-validator": { "har-validator": {
"version": "5.1.5", "version": "5.1.5",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
"dev": true,
"requires": { "requires": {
"ajv": "^6.12.3", "ajv": "^6.12.3",
"har-schema": "^2.0.0" "har-schema": "^2.0.0"
...@@ -5346,7 +5463,6 @@ ...@@ -5346,7 +5463,6 @@
"version": "6.12.3", "version": "6.12.3",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
"integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
"dev": true,
"requires": { "requires": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0", "fast-json-stable-stringify": "^2.0.0",
...@@ -5357,8 +5473,7 @@ ...@@ -5357,8 +5473,7 @@
"fast-deep-equal": { "fast-deep-equal": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
"dev": true
} }
} }
}, },
...@@ -5375,7 +5490,6 @@ ...@@ -5375,7 +5490,6 @@
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"dev": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -5415,6 +5529,11 @@ ...@@ -5415,6 +5529,11 @@
"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
"dev": true "dev": true
}, },
"has-unicode": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
},
"has-value": { "has-value": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
...@@ -5673,7 +5792,6 @@ ...@@ -5673,7 +5792,6 @@
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"dev": true,
"requires": { "requires": {
"assert-plus": "^1.0.0", "assert-plus": "^1.0.0",
"jsprim": "^1.2.2", "jsprim": "^1.2.2",
...@@ -5805,6 +5923,11 @@ ...@@ -5805,6 +5923,11 @@
"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
"dev": true "dev": true
}, },
"in-publish": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
"integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="
},
"indent-string": { "indent-string": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
...@@ -6000,8 +6123,7 @@ ...@@ -6000,8 +6123,7 @@
"is-arrayish": { "is-arrayish": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
"dev": true
}, },
"is-binary-path": { "is-binary-path": {
"version": "2.1.0", "version": "2.1.0",
...@@ -6111,11 +6233,15 @@ ...@@ -6111,11 +6233,15 @@
"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
"dev": true "dev": true
}, },
"is-finite": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
"integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="
},
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
"dev": true
}, },
"is-glob": { "is-glob": {
"version": "4.0.1", "version": "4.0.1",
...@@ -6235,8 +6361,12 @@ ...@@ -6235,8 +6361,12 @@
"is-typedarray": { "is-typedarray": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
"dev": true },
"is-utf8": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
"integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="
}, },
"is-windows": { "is-windows": {
"version": "1.0.2", "version": "1.0.2",
...@@ -6270,8 +6400,7 @@ ...@@ -6270,8 +6400,7 @@
"isexe": { "isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
"dev": true
}, },
"isobject": { "isobject": {
"version": "3.0.1", "version": "3.0.1",
...@@ -6535,8 +6664,7 @@ ...@@ -6535,8 +6664,7 @@
"jsbn": { "jsbn": {
"version": "0.1.1", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
"dev": true
}, },
"jsesc": { "jsesc": {
"version": "2.5.2", "version": "2.5.2",
...@@ -6553,20 +6681,17 @@ ...@@ -6553,20 +6681,17 @@
"json-schema": { "json-schema": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
"dev": true
}, },
"json-schema-traverse": { "json-schema-traverse": {
"version": "0.4.1", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
"dev": true
}, },
"json-stringify-safe": { "json-stringify-safe": {
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
"dev": true
}, },
"json3": { "json3": {
"version": "3.3.3", "version": "3.3.3",
...@@ -6602,7 +6727,6 @@ ...@@ -6602,7 +6727,6 @@
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
"dev": true,
"requires": { "requires": {
"assert-plus": "1.0.0", "assert-plus": "1.0.0",
"extsprintf": "1.3.0", "extsprintf": "1.3.0",
...@@ -6799,6 +6923,41 @@ ...@@ -6799,6 +6923,41 @@
"immediate": "~3.0.5" "immediate": "~3.0.5"
} }
}, },
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
"requires": {
"graceful-fs": "^4.1.2",
"parse-json": "^2.2.0",
"pify": "^2.0.0",
"pinkie-promise": "^2.0.0",
"strip-bom": "^2.0.0"
},
"dependencies": {
"parse-json": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
"integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
"requires": {
"error-ex": "^1.2.0"
}
},
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
},
"strip-bom": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
"requires": {
"is-utf8": "^0.2.0"
}
}
}
},
"loader-runner": { "loader-runner": {
"version": "2.4.0", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
...@@ -6820,7 +6979,6 @@ ...@@ -6820,7 +6979,6 @@
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
"dev": true,
"requires": { "requires": {
"p-locate": "^3.0.0", "p-locate": "^3.0.0",
"path-exists": "^3.0.0" "path-exists": "^3.0.0"
...@@ -6829,8 +6987,7 @@ ...@@ -6829,8 +6987,7 @@
"lodash": { "lodash": {
"version": "4.17.19", "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
"dev": true
}, },
"lodash.clonedeep": { "lodash.clonedeep": {
"version": "4.5.0", "version": "4.5.0",
...@@ -6898,6 +7055,15 @@ ...@@ -6898,6 +7055,15 @@
"js-tokens": "^3.0.0 || ^4.0.0" "js-tokens": "^3.0.0 || ^4.0.0"
} }
}, },
"loud-rejection": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
"integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
"requires": {
"currently-unhandled": "^0.4.1",
"signal-exit": "^3.0.0"
}
},
"lru-cache": { "lru-cache": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
...@@ -7024,6 +7190,11 @@ ...@@ -7024,6 +7190,11 @@
"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
"dev": true "dev": true
}, },
"map-obj": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="
},
"map-visit": { "map-visit": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
...@@ -7077,6 +7248,23 @@ ...@@ -7077,6 +7248,23 @@
"readable-stream": "^2.0.1" "readable-stream": "^2.0.1"
} }
}, },
"meow": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
"requires": {
"camelcase-keys": "^2.0.0",
"decamelize": "^1.1.2",
"loud-rejection": "^1.0.0",
"map-obj": "^1.0.1",
"minimist": "^1.1.3",
"normalize-package-data": "^2.3.4",
"object-assign": "^4.0.1",
"read-pkg-up": "^1.0.1",
"redent": "^1.0.0",
"trim-newlines": "^1.0.0"
}
},
"merge-descriptors": { "merge-descriptors": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
...@@ -7255,14 +7443,12 @@ ...@@ -7255,14 +7443,12 @@
"mime-db": { "mime-db": {
"version": "1.44.0", "version": "1.44.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
"integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
"dev": true
}, },
"mime-types": { "mime-types": {
"version": "2.1.27", "version": "2.1.27",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
"integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
"dev": true,
"requires": { "requires": {
"mime-db": "1.44.0" "mime-db": "1.44.0"
} }
...@@ -7502,9 +7688,7 @@ ...@@ -7502,9 +7688,7 @@
"nan": { "nan": {
"version": "2.14.1", "version": "2.14.1",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
"integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
"dev": true,
"optional": true
}, },
"nanomatch": { "nanomatch": {
"version": "1.2.13", "version": "1.2.13",
...@@ -7597,6 +7781,42 @@ ...@@ -7597,6 +7781,42 @@
"integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==", "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
"dev": true "dev": true
}, },
"node-gyp": {
"version": "3.8.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
"requires": {
"fstream": "^1.0.0",
"glob": "^7.0.3",
"graceful-fs": "^4.1.2",
"mkdirp": "^0.5.0",
"nopt": "2 || 3",
"npmlog": "0 || 1 || 2 || 3 || 4",
"osenv": "0",
"request": "^2.87.0",
"rimraf": "2",
"semver": "~5.3.0",
"tar": "^2.0.0",
"which": "1"
},
"dependencies": {
"semver": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="
},
"tar": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
"requires": {
"block-stream": "*",
"fstream": "^1.0.12",
"inherits": "2"
}
}
}
},
"node-libs-browser": { "node-libs-browser": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
...@@ -7642,11 +7862,89 @@ ...@@ -7642,11 +7862,89 @@
"integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==", "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==",
"dev": true "dev": true
}, },
"node-sass": {
"version": "4.14.1",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
"integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
"requires": {
"async-foreach": "^0.1.3",
"chalk": "^1.1.1",
"cross-spawn": "^3.0.0",
"gaze": "^1.0.0",
"get-stdin": "^4.0.1",
"glob": "^7.0.3",
"in-publish": "^2.0.0",
"lodash": "^4.17.15",
"meow": "^3.7.0",
"mkdirp": "^0.5.1",
"nan": "^2.13.2",
"node-gyp": "^3.8.0",
"npmlog": "^4.0.0",
"request": "^2.88.0",
"sass-graph": "2.2.5",
"stdout-stream": "^1.4.0",
"true-case-path": "^1.0.2"
},
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
}
},
"cross-spawn": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
"integrity": "sha512-eZ+m1WNhSZutOa/uRblAc9Ut5MQfukFrFMtPSm3bZCA888NmMd5AWXWdgRZ80zd+pTk1P2JrGjg9pUPTvl2PWQ==",
"requires": {
"lru-cache": "^4.0.1",
"which": "^1.2.9"
}
},
"lru-cache": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
"requires": {
"pseudomap": "^1.0.2",
"yallist": "^2.1.2"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="
},
"yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
}
}
},
"nopt": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
"requires": {
"abbrev": "1"
}
},
"normalize-package-data": { "normalize-package-data": {
"version": "2.5.0", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
"dev": true,
"requires": { "requires": {
"hosted-git-info": "^2.1.4", "hosted-git-info": "^2.1.4",
"resolve": "^1.10.0", "resolve": "^1.10.0",
...@@ -7657,8 +7955,7 @@ ...@@ -7657,8 +7955,7 @@
"hosted-git-info": { "hosted-git-info": {
"version": "2.8.8", "version": "2.8.8",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
"integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
"dev": true
} }
} }
}, },
...@@ -7769,6 +8066,17 @@ ...@@ -7769,6 +8066,17 @@
"path-key": "^2.0.0" "path-key": "^2.0.0"
} }
}, },
"npmlog": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
"gauge": "~2.7.3",
"set-blocking": "~2.0.0"
}
},
"nth-check": { "nth-check": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
...@@ -7787,14 +8095,12 @@ ...@@ -7787,14 +8095,12 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
"dev": true
}, },
"oauth-sign": { "oauth-sign": {
"version": "0.9.0", "version": "0.9.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
"dev": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -8057,8 +8363,7 @@ ...@@ -8057,8 +8363,7 @@
"os-homedir": { "os-homedir": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
"dev": true
}, },
"os-locale": { "os-locale": {
"version": "3.1.0", "version": "3.1.0",
...@@ -8083,14 +8388,12 @@ ...@@ -8083,14 +8388,12 @@
"os-tmpdir": { "os-tmpdir": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
"dev": true
}, },
"osenv": { "osenv": {
"version": "0.1.5", "version": "0.1.5",
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"dev": true,
"requires": { "requires": {
"os-homedir": "^1.0.0", "os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0" "os-tmpdir": "^1.0.0"
...@@ -8126,7 +8429,6 @@ ...@@ -8126,7 +8429,6 @@
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": { "requires": {
"p-try": "^2.0.0" "p-try": "^2.0.0"
} }
...@@ -8135,7 +8437,6 @@ ...@@ -8135,7 +8437,6 @@
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
"dev": true,
"requires": { "requires": {
"p-limit": "^2.0.0" "p-limit": "^2.0.0"
} }
...@@ -8161,8 +8462,7 @@ ...@@ -8161,8 +8462,7 @@
"p-try": { "p-try": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
"dev": true
}, },
"pac-proxy-agent": { "pac-proxy-agent": {
"version": "3.0.1", "version": "3.0.1",
...@@ -8374,8 +8674,7 @@ ...@@ -8374,8 +8674,7 @@
"path-exists": { "path-exists": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
"dev": true
}, },
"path-is-absolute": { "path-is-absolute": {
"version": "1.0.1", "version": "1.0.1",
...@@ -8397,8 +8696,7 @@ ...@@ -8397,8 +8696,7 @@
"path-parse": { "path-parse": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
"dev": true
}, },
"path-to-regexp": { "path-to-regexp": {
"version": "0.1.7", "version": "0.1.7",
...@@ -8452,8 +8750,7 @@ ...@@ -8452,8 +8750,7 @@
"performance-now": { "performance-now": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
"dev": true
}, },
"picomatch": { "picomatch": {
"version": "2.2.2", "version": "2.2.2",
...@@ -8470,14 +8767,12 @@ ...@@ -8470,14 +8767,12 @@
"pinkie": { "pinkie": {
"version": "2.0.4", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
"dev": true
}, },
"pinkie-promise": { "pinkie-promise": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"dev": true,
"requires": { "requires": {
"pinkie": "^2.0.0" "pinkie": "^2.0.0"
} }
...@@ -9359,14 +9654,12 @@ ...@@ -9359,14 +9654,12 @@
"pseudomap": { "pseudomap": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
"dev": true
}, },
"psl": { "psl": {
"version": "1.8.0", "version": "1.8.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
"dev": true
}, },
"public-encrypt": { "public-encrypt": {
"version": "4.0.3", "version": "4.0.3",
...@@ -9425,8 +9718,7 @@ ...@@ -9425,8 +9718,7 @@
"punycode": { "punycode": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
"dev": true
}, },
"q": { "q": {
"version": "1.5.1", "version": "1.5.1",
...@@ -9591,6 +9883,61 @@ ...@@ -9591,6 +9883,61 @@
"util-promisify": "^2.1.0" "util-promisify": "^2.1.0"
} }
}, },
"read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
"requires": {
"load-json-file": "^1.0.0",
"normalize-package-data": "^2.3.2",
"path-type": "^1.0.0"
},
"dependencies": {
"path-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
"requires": {
"graceful-fs": "^4.1.2",
"pify": "^2.0.0",
"pinkie-promise": "^2.0.0"
}
},
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
}
}
},
"read-pkg-up": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
"requires": {
"find-up": "^1.0.0",
"read-pkg": "^1.0.0"
},
"dependencies": {
"find-up": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
"requires": {
"path-exists": "^2.0.0",
"pinkie-promise": "^2.0.0"
}
},
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
"requires": {
"pinkie-promise": "^2.0.0"
}
}
}
},
"readable-stream": { "readable-stream": {
"version": "2.3.7", "version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
...@@ -9626,6 +9973,25 @@ ...@@ -9626,6 +9973,25 @@
"picomatch": "^2.2.1" "picomatch": "^2.2.1"
} }
}, },
"redent": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
"integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
"requires": {
"indent-string": "^2.1.0",
"strip-indent": "^1.0.1"
},
"dependencies": {
"indent-string": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
"integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
"requires": {
"repeating": "^2.0.0"
}
}
}
},
"reflect-metadata": { "reflect-metadata": {
"version": "0.1.13", "version": "0.1.13",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
...@@ -9758,11 +10124,18 @@ ...@@ -9758,11 +10124,18 @@
"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
"dev": true "dev": true
}, },
"repeating": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
"integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
"requires": {
"is-finite": "^1.0.0"
}
},
"request": { "request": {
"version": "2.88.2", "version": "2.88.2",
"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
"dev": true,
"requires": { "requires": {
"aws-sign2": "~0.7.0", "aws-sign2": "~0.7.0",
"aws4": "^1.8.0", "aws4": "^1.8.0",
...@@ -9789,16 +10162,14 @@ ...@@ -9789,16 +10162,14 @@
"qs": { "qs": {
"version": "6.5.2", "version": "6.5.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
"dev": true
} }
} }
}, },
"require-directory": { "require-directory": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
"dev": true
}, },
"require-main-filename": { "require-main-filename": {
"version": "1.0.1", "version": "1.0.1",
...@@ -9816,7 +10187,6 @@ ...@@ -9816,7 +10187,6 @@
"version": "1.17.0", "version": "1.17.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
"dev": true,
"requires": { "requires": {
"path-parse": "^1.0.6" "path-parse": "^1.0.6"
} }
...@@ -9962,6 +10332,103 @@ ...@@ -9962,6 +10332,103 @@
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=2.0.0 <4.0.0"
} }
}, },
"sass-graph": {
"version": "2.2.5",
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
"integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
"requires": {
"glob": "^7.0.0",
"lodash": "^4.0.0",
"scss-tokenizer": "^0.2.3",
"yargs": "^13.3.2"
},
"dependencies": {
"ansi-regex": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
},
"cliui": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
"requires": {
"string-width": "^3.1.0",
"strip-ansi": "^5.2.0",
"wrap-ansi": "^5.1.0"
}
},
"emoji-regex": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
},
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
},
"require-main-filename": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
},
"string-width": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
"requires": {
"emoji-regex": "^7.0.1",
"is-fullwidth-code-point": "^2.0.0",
"strip-ansi": "^5.1.0"
}
},
"strip-ansi": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
"requires": {
"ansi-regex": "^4.1.0"
}
},
"wrap-ansi": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
"requires": {
"ansi-styles": "^3.2.0",
"string-width": "^3.0.0",
"strip-ansi": "^5.0.0"
}
},
"yargs": {
"version": "13.3.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
"requires": {
"cliui": "^5.0.0",
"find-up": "^3.0.0",
"get-caller-file": "^2.0.1",
"require-directory": "^2.1.1",
"require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
"string-width": "^3.0.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
"yargs-parser": "^13.1.2"
}
},
"yargs-parser": {
"version": "13.1.2",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
"requires": {
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
}
}
}
},
"sass-loader": { "sass-loader": {
"version": "8.0.0", "version": "8.0.0",
"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz",
...@@ -10058,6 +10525,25 @@ ...@@ -10058,6 +10525,25 @@
"ajv-keywords": "^3.1.0" "ajv-keywords": "^3.1.0"
} }
}, },
"scss-tokenizer": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
"integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
"requires": {
"js-base64": "^2.1.8",
"source-map": "^0.4.2"
},
"dependencies": {
"source-map": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
"requires": {
"amdefine": ">=0.0.4"
}
}
}
},
"sdk-base": { "sdk-base": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/sdk-base/-/sdk-base-2.0.1.tgz", "resolved": "https://registry.npmjs.org/sdk-base/-/sdk-base-2.0.1.tgz",
...@@ -10224,8 +10710,7 @@ ...@@ -10224,8 +10710,7 @@
"set-blocking": { "set-blocking": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
"dev": true
}, },
"set-immediate-shim": { "set-immediate-shim": {
"version": "1.0.1", "version": "1.0.1",
...@@ -10293,8 +10778,7 @@ ...@@ -10293,8 +10778,7 @@
"signal-exit": { "signal-exit": {
"version": "3.0.3", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
"dev": true
}, },
"simple-swizzle": { "simple-swizzle": {
"version": "0.2.2", "version": "0.2.2",
...@@ -10696,7 +11180,6 @@ ...@@ -10696,7 +11180,6 @@
"version": "3.1.1", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
"dev": true,
"requires": { "requires": {
"spdx-expression-parse": "^3.0.0", "spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0" "spdx-license-ids": "^3.0.0"
...@@ -10705,14 +11188,12 @@ ...@@ -10705,14 +11188,12 @@
"spdx-exceptions": { "spdx-exceptions": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
"dev": true
}, },
"spdx-expression-parse": { "spdx-expression-parse": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
"dev": true,
"requires": { "requires": {
"spdx-exceptions": "^2.1.0", "spdx-exceptions": "^2.1.0",
"spdx-license-ids": "^3.0.0" "spdx-license-ids": "^3.0.0"
...@@ -10721,8 +11202,7 @@ ...@@ -10721,8 +11202,7 @@
"spdx-license-ids": { "spdx-license-ids": {
"version": "3.0.5", "version": "3.0.5",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
"integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
"dev": true
}, },
"spdy": { "spdy": {
"version": "4.0.2", "version": "4.0.2",
...@@ -10833,7 +11313,6 @@ ...@@ -10833,7 +11313,6 @@
"version": "1.16.1", "version": "1.16.1",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
"dev": true,
"requires": { "requires": {
"asn1": "~0.2.3", "asn1": "~0.2.3",
"assert-plus": "^1.0.0", "assert-plus": "^1.0.0",
...@@ -10888,6 +11367,14 @@ ...@@ -10888,6 +11367,14 @@
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
"integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
}, },
"stdout-stream": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
"integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
"requires": {
"readable-stream": "^2.0.1"
}
},
"stream-browserify": { "stream-browserify": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
...@@ -10981,7 +11468,6 @@ ...@@ -10981,7 +11468,6 @@
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"dev": true,
"requires": { "requires": {
"is-fullwidth-code-point": "^2.0.0", "is-fullwidth-code-point": "^2.0.0",
"strip-ansi": "^4.0.0" "strip-ansi": "^4.0.0"
...@@ -10990,14 +11476,12 @@ ...@@ -10990,14 +11476,12 @@
"ansi-regex": { "ansi-regex": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
"dev": true
}, },
"strip-ansi": { "strip-ansi": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": { "requires": {
"ansi-regex": "^3.0.0" "ansi-regex": "^3.0.0"
} }
...@@ -11036,7 +11520,6 @@ ...@@ -11036,7 +11520,6 @@
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -11053,6 +11536,14 @@ ...@@ -11053,6 +11536,14 @@
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
"dev": true "dev": true
}, },
"strip-indent": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
"integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
"requires": {
"get-stdin": "^4.0.1"
}
},
"style-loader": { "style-loader": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz",
...@@ -11583,7 +12074,6 @@ ...@@ -11583,7 +12074,6 @@
"version": "2.5.0", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
"dev": true,
"requires": { "requires": {
"psl": "^1.1.28", "psl": "^1.1.28",
"punycode": "^2.1.1" "punycode": "^2.1.1"
...@@ -11595,6 +12085,19 @@ ...@@ -11595,6 +12085,19 @@
"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
"dev": true "dev": true
}, },
"trim-newlines": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
"integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw=="
},
"true-case-path": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
"requires": {
"glob": "^7.1.2"
}
},
"ts-node": { "ts-node": {
"version": "8.3.0", "version": "8.3.0",
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz",
...@@ -11661,7 +12164,6 @@ ...@@ -11661,7 +12164,6 @@
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"dev": true,
"requires": { "requires": {
"safe-buffer": "^5.0.1" "safe-buffer": "^5.0.1"
} }
...@@ -11669,8 +12171,7 @@ ...@@ -11669,8 +12171,7 @@
"tweetnacl": { "tweetnacl": {
"version": "0.14.5", "version": "0.14.5",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
"dev": true
}, },
"type-check": { "type-check": {
"version": "0.3.2", "version": "0.3.2",
...@@ -11881,7 +12382,6 @@ ...@@ -11881,7 +12382,6 @@
"version": "4.2.2", "version": "4.2.2",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
"dev": true,
"requires": { "requires": {
"punycode": "^2.1.0" "punycode": "^2.1.0"
} }
...@@ -12040,14 +12540,12 @@ ...@@ -12040,14 +12540,12 @@
"uuid": { "uuid": {
"version": "3.4.0", "version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
"dev": true
}, },
"validate-npm-package-license": { "validate-npm-package-license": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
"dev": true,
"requires": { "requires": {
"spdx-correct": "^3.0.0", "spdx-correct": "^3.0.0",
"spdx-expression-parse": "^3.0.0" "spdx-expression-parse": "^3.0.0"
...@@ -12078,7 +12576,6 @@ ...@@ -12078,7 +12576,6 @@
"version": "1.10.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"dev": true,
"requires": { "requires": {
"assert-plus": "^1.0.0", "assert-plus": "^1.0.0",
"core-util-is": "1.0.2", "core-util-is": "1.0.2",
...@@ -12719,7 +13216,6 @@ ...@@ -12719,7 +13216,6 @@
"version": "1.3.1", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"dev": true,
"requires": { "requires": {
"isexe": "^2.0.0" "isexe": "^2.0.0"
} }
...@@ -12727,8 +13223,15 @@ ...@@ -12727,8 +13223,15 @@
"which-module": { "which-module": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
"dev": true },
"wide-align": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
"requires": {
"string-width": "^1.0.2 || 2 || 3 || 4"
}
}, },
"win-release": { "win-release": {
"version": "1.1.1", "version": "1.1.1",
...@@ -12846,8 +13349,7 @@ ...@@ -12846,8 +13349,7 @@
"y18n": { "y18n": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
"dev": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment