diff --git a/.creator/asset-template/typescript/Custom Script Template Help Documentation.url b/.creator/asset-template/typescript/Custom Script Template Help Documentation.url new file mode 100644 index 0000000..4ee54dc --- /dev/null +++ b/.creator/asset-template/typescript/Custom Script Template Help Documentation.url @@ -0,0 +1,4 @@ + + [InternetShortcut] + URL=https://docs.cocos.com/creator/manual/en/scripting/setup.html#custom-script-template + \ No newline at end of file diff --git a/assets/resources/common/prefab/netinstable.prefab.meta b/assets/resources/common/prefab/netinstable.prefab.meta index fa81488..e7cddc0 100644 --- a/assets/resources/common/prefab/netinstable.prefab.meta +++ b/assets/resources/common/prefab/netinstable.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "prefab", "imported": true, "uuid": "9cc71d8c-192a-4234-8204-352f42b95c65", diff --git a/assets/resources/common/prefab/notify.prefab.meta b/assets/resources/common/prefab/notify.prefab.meta index 6b535c0..1117cd2 100644 --- a/assets/resources/common/prefab/notify.prefab.meta +++ b/assets/resources/common/prefab/notify.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "prefab", "imported": true, "uuid": "10285c1d-979d-4a7e-80c0-86e0dc2a65d8", diff --git a/assets/resources/common/prefab/window.prefab.meta b/assets/resources/common/prefab/window.prefab.meta index f9416d9..024c722 100644 --- a/assets/resources/common/prefab/window.prefab.meta +++ b/assets/resources/common/prefab/window.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "prefab", "imported": true, "uuid": "2501cdfd-ca13-49a6-9c23-ea51586c54c4", diff --git a/assets/resources/common/texture/bg_window.png.meta b/assets/resources/common/texture/bg_window.png.meta index 36aea71..6398845 100644 --- a/assets/resources/common/texture/bg_window.png.meta +++ b/assets/resources/common/texture/bg_window.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "f9cfbca9-9f35-4dda-8925-64e34e6e9802", @@ -70,6 +70,7 @@ "userData": { "type": "sprite-frame", "redirect": "f9cfbca9-9f35-4dda-8925-64e34e6e9802@f9941", - "hasAlpha": true + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/common/texture/btn_ok.png.meta b/assets/resources/common/texture/btn_ok.png.meta index e1209b9..8d4b6ac 100644 --- a/assets/resources/common/texture/btn_ok.png.meta +++ b/assets/resources/common/texture/btn_ok.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06", @@ -70,6 +70,7 @@ "userData": { "type": "sprite-frame", "redirect": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06@f9941", - "hasAlpha": true + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/common/texture/loading.png.meta b/assets/resources/common/texture/loading.png.meta index 6499ca4..7c90173 100644 --- a/assets/resources/common/texture/loading.png.meta +++ b/assets/resources/common/texture/loading.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "06942a20-0474-4385-9a85-293366d2473e", @@ -70,6 +70,7 @@ "userData": { "type": "sprite-frame", "redirect": "06942a20-0474-4385-9a85-293366d2473e@f9941", - "hasAlpha": true + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/common/texture/toast.png.meta b/assets/resources/common/texture/toast.png.meta index 5d321be..2c45dec 100644 --- a/assets/resources/common/texture/toast.png.meta +++ b/assets/resources/common/texture/toast.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc", @@ -70,6 +70,7 @@ "userData": { "type": "sprite-frame", "redirect": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc@f9941", - "hasAlpha": true + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/content/role/model1.png.meta b/assets/resources/content/role/model1.png.meta index 5c310dc..5f12c00 100644 --- a/assets/resources/content/role/model1.png.meta +++ b/assets/resources/content/role/model1.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "f1358af2-8b3d-4816-ae38-bc2a2d38105f", @@ -69,6 +69,7 @@ "userData": { "type": "sprite-frame", "hasAlpha": true, - "redirect": "f1358af2-8b3d-4816-ae38-bc2a2d38105f@f9941" + "redirect": "f1358af2-8b3d-4816-ae38-bc2a2d38105f@f9941", + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/game/battle/role.prefab.meta b/assets/resources/game/battle/role.prefab.meta index 4100f0d..60de8b7 100644 --- a/assets/resources/game/battle/role.prefab.meta +++ b/assets/resources/game/battle/role.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "prefab", "imported": true, "uuid": "6b14b71e-74ef-4af5-9375-546472b45751", diff --git a/assets/resources/gui/prefab/demo.prefab.meta b/assets/resources/gui/prefab/demo.prefab.meta index cbb0971..90446f5 100644 --- a/assets/resources/gui/prefab/demo.prefab.meta +++ b/assets/resources/gui/prefab/demo.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "prefab", "imported": true, "uuid": "5b6511a4-181b-4c81-9f9c-51e4c21b4d64", diff --git a/assets/resources/gui/prefab/role_info.prefab.meta b/assets/resources/gui/prefab/role_info.prefab.meta index c402e25..2cc5623 100644 --- a/assets/resources/gui/prefab/role_info.prefab.meta +++ b/assets/resources/gui/prefab/role_info.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "prefab", "imported": true, "uuid": "5d143d96-858f-4478-8bb4-f8279e87b509", diff --git a/assets/resources/gui/prefab/role_info_base.prefab.meta b/assets/resources/gui/prefab/role_info_base.prefab.meta index d88ec9c..15416b8 100644 --- a/assets/resources/gui/prefab/role_info_base.prefab.meta +++ b/assets/resources/gui/prefab/role_info_base.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "prefab", "imported": true, "uuid": "3ca889da-d664-4591-a123-063073c6609b", diff --git a/assets/resources/language/texture/en/image.jpg.meta b/assets/resources/language/texture/en/image.jpg.meta index 3ad6bd5..c263709 100644 --- a/assets/resources/language/texture/en/image.jpg.meta +++ b/assets/resources/language/texture/en/image.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "3d5b607a-face-426b-8200-acf8384108db", @@ -69,6 +69,7 @@ "userData": { "hasAlpha": true, "type": "sprite-frame", - "redirect": "3d5b607a-face-426b-8200-acf8384108db@f9941" + "redirect": "3d5b607a-face-426b-8200-acf8384108db@f9941", + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/language/texture/zh/image.jpg.meta b/assets/resources/language/texture/zh/image.jpg.meta index a38af44..88b7bd1 100644 --- a/assets/resources/language/texture/zh/image.jpg.meta +++ b/assets/resources/language/texture/zh/image.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "a65eaaec-d315-4134-a79e-23bb817d1939", @@ -69,6 +69,7 @@ "userData": { "hasAlpha": true, "type": "sprite-frame", - "redirect": "a65eaaec-d315-4134-a79e-23bb817d1939@f9941" + "redirect": "a65eaaec-d315-4134-a79e-23bb817d1939@f9941", + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/loading/prefab/loading.prefab.meta b/assets/resources/loading/prefab/loading.prefab.meta index 00a8fa9..25c8ff5 100644 --- a/assets/resources/loading/prefab/loading.prefab.meta +++ b/assets/resources/loading/prefab/loading.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "prefab", "imported": true, "uuid": "b3142304-c27f-4492-b94f-551d154a2bf4", diff --git a/assets/resources/loading/texture/bg.png.meta b/assets/resources/loading/texture/bg.png.meta index d965b24..6e20282 100644 --- a/assets/resources/loading/texture/bg.png.meta +++ b/assets/resources/loading/texture/bg.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "0021cb5a-e4f0-4709-b0b6-5e21875720b7", @@ -70,6 +70,7 @@ "userData": { "type": "sprite-frame", "redirect": "0021cb5a-e4f0-4709-b0b6-5e21875720b7@f9941", - "hasAlpha": false + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/loading/texture/icon_loading_bar.png.meta b/assets/resources/loading/texture/icon_loading_bar.png.meta index f7c90a9..e69b38d 100644 --- a/assets/resources/loading/texture/icon_loading_bar.png.meta +++ b/assets/resources/loading/texture/icon_loading_bar.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "1ac049d7-c899-492a-89a7-4e8d85ce4cb1", @@ -70,6 +70,7 @@ "userData": { "type": "sprite-frame", "redirect": "1ac049d7-c899-492a-89a7-4e8d85ce4cb1@f9941", - "hasAlpha": true + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/loading/texture/panel_loading_bottom_frame.png.meta b/assets/resources/loading/texture/panel_loading_bottom_frame.png.meta index 9e7bcf1..614b844 100644 --- a/assets/resources/loading/texture/panel_loading_bottom_frame.png.meta +++ b/assets/resources/loading/texture/panel_loading_bottom_frame.png.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "a2001856-24f5-4ac7-9309-1207a3210cd8", @@ -70,6 +70,7 @@ "userData": { "type": "sprite-frame", "redirect": "a2001856-24f5-4ac7-9309-1207a3210cd8@f9941", - "hasAlpha": true + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/skybox/texture/Sky0000.jpg.meta b/assets/resources/skybox/texture/Sky0000.jpg.meta index 4878083..f19d325 100644 --- a/assets/resources/skybox/texture/Sky0000.jpg.meta +++ b/assets/resources/skybox/texture/Sky0000.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "9aa4f5e1-bbc0-4475-90e8-59ddc0a29076", @@ -36,6 +36,7 @@ "userData": { "type": "texture", "redirect": "9aa4f5e1-bbc0-4475-90e8-59ddc0a29076@6c48a", - "hasAlpha": false + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/skybox/texture/Sky0001.jpg.meta b/assets/resources/skybox/texture/Sky0001.jpg.meta index 779e818..4453ce7 100644 --- a/assets/resources/skybox/texture/Sky0001.jpg.meta +++ b/assets/resources/skybox/texture/Sky0001.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "17b56b7b-6cbb-4677-a0b8-5233a7d92025", @@ -36,6 +36,7 @@ "userData": { "type": "texture", "redirect": "17b56b7b-6cbb-4677-a0b8-5233a7d92025@6c48a", - "hasAlpha": false + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/skybox/texture/Sky0002.jpg.meta b/assets/resources/skybox/texture/Sky0002.jpg.meta index ad5a5dd..8a7a071 100644 --- a/assets/resources/skybox/texture/Sky0002.jpg.meta +++ b/assets/resources/skybox/texture/Sky0002.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "57e65ba3-6de2-4e11-af02-4853f1076b34", @@ -36,6 +36,7 @@ "userData": { "type": "texture", "redirect": "57e65ba3-6de2-4e11-af02-4853f1076b34@6c48a", - "hasAlpha": false + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/skybox/texture/Sky0003.jpg.meta b/assets/resources/skybox/texture/Sky0003.jpg.meta index 3ac8afa..9239026 100644 --- a/assets/resources/skybox/texture/Sky0003.jpg.meta +++ b/assets/resources/skybox/texture/Sky0003.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "48df8ed8-0de9-4516-acb0-2512d7e87d30", @@ -36,6 +36,7 @@ "userData": { "type": "texture", "redirect": "48df8ed8-0de9-4516-acb0-2512d7e87d30@6c48a", - "hasAlpha": false + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/skybox/texture/Sky0004.jpg.meta b/assets/resources/skybox/texture/Sky0004.jpg.meta index 20791a7..40d9986 100644 --- a/assets/resources/skybox/texture/Sky0004.jpg.meta +++ b/assets/resources/skybox/texture/Sky0004.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "c9f98a59-18a1-4040-ab46-867da392fdae", @@ -36,6 +36,7 @@ "userData": { "type": "texture", "redirect": "c9f98a59-18a1-4040-ab46-867da392fdae@6c48a", - "hasAlpha": false + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/resources/skybox/texture/Sky0005.jpg.meta b/assets/resources/skybox/texture/Sky0005.jpg.meta index 9cf40b2..1ef5671 100644 --- a/assets/resources/skybox/texture/Sky0005.jpg.meta +++ b/assets/resources/skybox/texture/Sky0005.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.22", + "ver": "1.0.23", "importer": "image", "imported": true, "uuid": "68b36d20-2281-41ed-aaee-aa61963ef1a3", @@ -36,6 +36,7 @@ "userData": { "type": "texture", "redirect": "68b36d20-2281-41ed-aaee-aa61963ef1a3@6c48a", - "hasAlpha": false + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false } } diff --git a/assets/scene/main.scene b/assets/scene/main.scene index 3b821b0..f4002fc 100644 --- a/assets/scene/main.scene +++ b/assets/scene/main.scene @@ -227,7 +227,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 422.90748898678413, + "_orthoHeight": 364.7035175879397, "_near": 1, "_far": 2000, "_color": { @@ -427,8 +427,8 @@ }, { "__type__": "cc.ShadowsInfo", - "_type": 0, "_enabled": false, + "_type": 0, "_normal": { "__type__": "cc.Vec3", "x": 0, @@ -443,34 +443,22 @@ "b": 0, "a": 128 }, - "_firstSetCSM": false, - "_fixedArea": false, - "_pcf": 2, - "_bias": 0.1, - "_normalBias": 0, - "_near": 1, - "_far": 30, - "_shadowDistance": 14.31455196025922, - "_invisibleOcclusionRange": 200, - "_orthoSize": 5, "_maxReceived": 4, "_size": { "__type__": "cc.Vec2", "x": 512, "y": 512 - }, - "_saturation": 0.5019607843137255 + } }, { "__type__": "cc.SkyboxInfo", - "_applyDiffuseMap": false, + "_envLightingType": 0, "_envmapHDR": null, "_envmap": null, "_envmapLDR": null, "_diffuseMapHDR": null, "_diffuseMapLDR": null, "_enabled": false, - "_useIBL": false, "_useHDR": false }, { diff --git a/assets/scene/main.scene.meta b/assets/scene/main.scene.meta index 3b37825..82bb146 100644 --- a/assets/scene/main.scene.meta +++ b/assets/scene/main.scene.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.35", + "ver": "1.1.38", "importer": "scene", "imported": true, "uuid": "ba0b085f-f8d5-40b0-9964-2fd25728d707", diff --git a/assets/script/core/common/loader/ResLoader.ts b/assets/script/core/common/loader/ResLoader.ts index 8f3387e..125d4b8 100644 --- a/assets/script/core/common/loader/ResLoader.ts +++ b/assets/script/core/common/loader/ResLoader.ts @@ -1,8 +1,8 @@ import { Asset, AssetManager, assetManager, Constructor, error, js, resources, __private } from "cc"; -export type ProgressCallback = __private.cocos_core_asset_manager_shared_ProgressCallback; -export type CompleteCallback = __private.cocos_core_asset_manager_shared_CompleteCallbackWithData; -export type IRemoteOptions = __private.cocos_core_asset_manager_shared_IRemoteOptions; +export type ProgressCallback = __private._cocos_core_asset_manager_shared__ProgressCallback; +export type CompleteCallback = __private._cocos_core_asset_manager_shared__CompleteCallbackWithData; +export type IRemoteOptions = __private._cocos_core_asset_manager_shared__IRemoteOptions; export type AssetType = Constructor; interface ILoadResArgs { @@ -174,7 +174,7 @@ export default class ResLoader { } } - public get(path: string, type?: __private.cocos_core_asset_manager_shared_AssetType | null, bundleName: string = "resources"): T | null { + public get(path: string, type?: __private._cocos_core_asset_manager_shared__AssetType | null, bundleName: string = "resources"): T | null { var bundle: AssetManager.Bundle | null = assetManager.getBundle(bundleName); return bundle!.get(path, type); }