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 diff is collapsed.
{ {
"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,
......
This diff is collapsed.
{ {
"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,
......
This diff is collapsed.
{ {
"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,
......
This diff is collapsed.
This diff is collapsed.
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