diff --git a/assets/Scene/example_empty.fire b/assets/Scene/example_empty.fire index 19a2967..649be0e 100644 --- a/assets/Scene/example_empty.fire +++ b/assets/Scene/example_empty.fire @@ -95,6 +95,9 @@ }, { "__id__": 8 + }, + { + "__id__": 13 } ], "_prefab": null, @@ -404,5 +407,31 @@ }, "_enabled": true, "_id": "7cZvQY2GZOGYh+cqZuK5gx" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0 } ] \ No newline at end of file diff --git a/assets/Scene/example_empty.fire.meta b/assets/Scene/example_empty.fire.meta index edafc75..28ba62e 100644 --- a/assets/Scene/example_empty.fire.meta +++ b/assets/Scene/example_empty.fire.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "a18214d2-f37c-41d3-908b-0a859a46c913", "asyncLoadAssets": false, "autoReleaseAssets": false, diff --git a/assets/Scene/example_net.fire b/assets/Scene/example_net.fire index b463c84..018d244 100755 --- a/assets/Scene/example_net.fire +++ b/assets/Scene/example_net.fire @@ -110,6 +110,9 @@ }, { "__id__": 59 + }, + { + "__id__": 60 } ], "_prefab": null, @@ -2669,5 +2672,31 @@ "__id__": 57 }, "_id": "0bpgf5DdFHd43ZDy0vkFUX" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0 } ] \ No newline at end of file diff --git a/assets/Scene/example_net.fire.meta b/assets/Scene/example_net.fire.meta index f010144..bc65510 100755 --- a/assets/Scene/example_net.fire.meta +++ b/assets/Scene/example_net.fire.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "1cbee229-fdef-44ac-ae41-10f976bb1d77", "asyncLoadAssets": false, "autoReleaseAssets": false, diff --git a/assets/Scene/example_res.fire b/assets/Scene/example_res.fire index 2337e82..e6003f3 100644 --- a/assets/Scene/example_res.fire +++ b/assets/Scene/example_res.fire @@ -125,6 +125,9 @@ }, { "__id__": 74 + }, + { + "__id__": 75 } ], "_prefab": null, @@ -3513,5 +3516,31 @@ "__id__": 53 }, "_id": "fa+x7C84lHqrIn1vJzGW9n" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0 } ] \ No newline at end of file diff --git a/assets/Scene/example_res.fire.meta b/assets/Scene/example_res.fire.meta index 852a3d0..9c6225c 100644 --- a/assets/Scene/example_res.fire.meta +++ b/assets/Scene/example_res.fire.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "95a253de-483f-4725-aacb-10f85609785e", "asyncLoadAssets": false, "autoReleaseAssets": false, diff --git a/assets/Scene/example_res_keeper.fire b/assets/Scene/example_res_keeper.fire index 44a82ed..1ac3de0 100644 --- a/assets/Scene/example_res_keeper.fire +++ b/assets/Scene/example_res_keeper.fire @@ -125,6 +125,9 @@ }, { "__id__": 72 + }, + { + "__id__": 76 } ], "_prefab": null, @@ -3468,5 +3471,31 @@ }, "_enabled": true, "_id": "f4PbLvouBNQ5r8sb2i/crl" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0 } ] \ No newline at end of file diff --git a/assets/Scene/example_res_keeper.fire.meta b/assets/Scene/example_res_keeper.fire.meta index b77f46b..e8da7b1 100644 --- a/assets/Scene/example_res_keeper.fire.meta +++ b/assets/Scene/example_res_keeper.fire.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "4753fa27-55ac-44df-94a5-a91c50b1cd4d", "asyncLoadAssets": false, "autoReleaseAssets": false, diff --git a/assets/Scene/example_ui.fire b/assets/Scene/example_ui.fire index f0b9d01..d8126a6 100644 --- a/assets/Scene/example_ui.fire +++ b/assets/Scene/example_ui.fire @@ -86,6 +86,9 @@ }, { "__id__": 6 + }, + { + "__id__": 7 } ], "_prefab": null, @@ -258,5 +261,31 @@ }, "_enabled": true, "_id": "e2iDQEL+dHDKK4GSCMZ1tN" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0 } ] \ No newline at end of file diff --git a/assets/Scene/example_ui.fire.meta b/assets/Scene/example_ui.fire.meta index 2dbef88..46e5e1d 100644 --- a/assets/Scene/example_ui.fire.meta +++ b/assets/Scene/example_ui.fire.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "9cd929f4-07e5-466d-b5bf-a1036c927a6a", "asyncLoadAssets": false, "autoReleaseAssets": false, diff --git a/assets/Script/common/EventManager.ts.meta b/assets/Script/common/EventManager.ts.meta index 500f95b..e36e784 100644 --- a/assets/Script/common/EventManager.ts.meta +++ b/assets/Script/common/EventManager.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "e1b5ec32-35b4-4701-a596-365beeba9c18", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/common/TaskQueue.ts.meta b/assets/Script/common/TaskQueue.ts.meta index 80bbb29..ed64e0f 100644 --- a/assets/Script/common/TaskQueue.ts.meta +++ b/assets/Script/common/TaskQueue.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "26663ad3-2894-404f-9223-39337e184454", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/EmptyScene.ts.meta b/assets/Script/example/EmptyScene.ts.meta index c68db49..b813b88 100644 --- a/assets/Script/example/EmptyScene.ts.meta +++ b/assets/Script/example/EmptyScene.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "2d3e3e9a-b673-4d88-b784-aaeb04610066", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/NetExample.ts.meta b/assets/Script/example/NetExample.ts.meta index 01dc950..138497b 100644 --- a/assets/Script/example/NetExample.ts.meta +++ b/assets/Script/example/NetExample.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "55d2374d-6bd2-4345-a7dc-085a9e5c5547", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/ResExample.ts.meta b/assets/Script/example/ResExample.ts.meta index 2a464dc..3409e56 100644 --- a/assets/Script/example/ResExample.ts.meta +++ b/assets/Script/example/ResExample.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "35e3e9e5-c4f5-4d9d-b71d-14f429549015", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/ResKeeperExample.ts.meta b/assets/Script/example/ResKeeperExample.ts.meta index f634438..cdb978f 100644 --- a/assets/Script/example/ResKeeperExample.ts.meta +++ b/assets/Script/example/ResKeeperExample.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "44dffeac-521c-4e2b-9107-cbac1e6ce1ea", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/UIExample.ts.meta b/assets/Script/example/UIExample.ts.meta index cb8b47c..5d22281 100644 --- a/assets/Script/example/UIExample.ts.meta +++ b/assets/Script/example/UIExample.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "1ac134aa-f1cc-4b29-9b50-7b5842828af4", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/uiviews/UIBag.ts.meta b/assets/Script/example/uiviews/UIBag.ts.meta index 86e73f7..df15d41 100644 --- a/assets/Script/example/uiviews/UIBag.ts.meta +++ b/assets/Script/example/uiviews/UIBag.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "fca32edd-d4a8-4b8a-aea7-cc894b82d0a3", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/uiviews/UIHall.ts.meta b/assets/Script/example/uiviews/UIHall.ts.meta index 78700ab..5d91b1f 100644 --- a/assets/Script/example/uiviews/UIHall.ts.meta +++ b/assets/Script/example/uiviews/UIHall.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "f33533b6-6dcf-44b1-b345-90d71f0f9fcc", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/uiviews/UILogin.ts.meta b/assets/Script/example/uiviews/UILogin.ts.meta index f04091a..fa752c2 100644 --- a/assets/Script/example/uiviews/UILogin.ts.meta +++ b/assets/Script/example/uiviews/UILogin.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "969accd6-77d9-473a-95f7-c28bb820df79", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/example/uiviews/UINotice.ts.meta b/assets/Script/example/uiviews/UINotice.ts.meta index e265588..edfad92 100644 --- a/assets/Script/example/uiviews/UINotice.ts.meta +++ b/assets/Script/example/uiviews/UINotice.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "db8814dd-4cb8-4cd1-9fce-d9743f13d99c", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/network/NetInterface.ts.meta b/assets/Script/network/NetInterface.ts.meta index 5a8278f..7bd5c89 100644 --- a/assets/Script/network/NetInterface.ts.meta +++ b/assets/Script/network/NetInterface.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "d9f8bf82-57af-45c8-ac27-51d0a33ad69d", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/network/NetManager.ts.meta b/assets/Script/network/NetManager.ts.meta index 866fa47..ac7a7de 100644 --- a/assets/Script/network/NetManager.ts.meta +++ b/assets/Script/network/NetManager.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "d8cd57a5-e860-464d-84d6-f8df1bf04b89", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/network/NetNode.ts.meta b/assets/Script/network/NetNode.ts.meta index 3de281d..72efb18 100644 --- a/assets/Script/network/NetNode.ts.meta +++ b/assets/Script/network/NetNode.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "57f0f07d-d243-4150-9f7c-cb2bbe8f18f1", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/network/WebSock.ts.meta b/assets/Script/network/WebSock.ts.meta index fadbcb2..0b21ea6 100644 --- a/assets/Script/network/WebSock.ts.meta +++ b/assets/Script/network/WebSock.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "70df255b-214f-41eb-a16b-fa8a7c14a269", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/res/NodePool.ts.meta b/assets/Script/res/NodePool.ts.meta index 5e4c398..0794c6a 100644 --- a/assets/Script/res/NodePool.ts.meta +++ b/assets/Script/res/NodePool.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "7967025c-cf6e-441d-ba4f-cf6b1b18ee47", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/res/ResKeeper.ts.meta b/assets/Script/res/ResKeeper.ts.meta index 4ab008e..2f09e43 100644 --- a/assets/Script/res/ResKeeper.ts.meta +++ b/assets/Script/res/ResKeeper.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "e7548b8f-cc6d-481d-b240-1b924e8487ae", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/res/ResLeakChecker.ts.meta b/assets/Script/res/ResLeakChecker.ts.meta index be8c2f5..7759b2b 100644 --- a/assets/Script/res/ResLeakChecker.ts.meta +++ b/assets/Script/res/ResLeakChecker.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "9487ec79-2393-46de-a9ee-b3e7e4aa5df1", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/res/ResLoader.ts.meta b/assets/Script/res/ResLoader.ts.meta index d54aeeb..4bbc4e4 100644 --- a/assets/Script/res/ResLoader.ts.meta +++ b/assets/Script/res/ResLoader.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "6bb26b58-3dd7-464b-b61f-7921b26ac2fc", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/res/ResPool.ts.meta b/assets/Script/res/ResPool.ts.meta index 04986e7..b89deea 100644 --- a/assets/Script/res/ResPool.ts.meta +++ b/assets/Script/res/ResPool.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "4d239299-7b98-48e1-96f8-9328f16ab5a1", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/res/ResUtil.ts.meta b/assets/Script/res/ResUtil.ts.meta index badaa4a..ecf22ae 100644 --- a/assets/Script/res/ResUtil.ts.meta +++ b/assets/Script/res/ResUtil.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "8f5031d9-961c-4b4d-8e54-3da153c42d5e", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/ui/UIManager.ts.meta b/assets/Script/ui/UIManager.ts.meta index 353196f..6a636c3 100644 --- a/assets/Script/ui/UIManager.ts.meta +++ b/assets/Script/ui/UIManager.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "5355082f-5ce8-4116-b9f3-a8c7ea479bfd", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Script/ui/UIView.ts.meta b/assets/Script/ui/UIView.ts.meta index 64a903d..ce39846 100644 --- a/assets/Script/ui/UIView.ts.meta +++ b/assets/Script/ui/UIView.ts.meta @@ -1,5 +1,5 @@ { - "ver": "1.0.5", + "ver": "1.0.8", "uuid": "743a80d2-baa8-41af-8210-80de1adba222", "isPlugin": false, "loadPluginInWeb": true, diff --git a/assets/Spine/10000/10000.png.meta b/assets/Spine/10000/10000.png.meta index 3c68867..eaf24d6 100644 --- a/assets/Spine/10000/10000.png.meta +++ b/assets/Spine/10000/10000.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "57d9e2f8-e41e-47c0-a1fe-b4e081af3bf6", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 1024, + "height": 512, "platformSettings": {}, "subMetas": { "10000": { diff --git a/assets/Spine/10000/10000.skel.meta b/assets/Spine/10000/10000.skel.meta index 703805b..093e72b 100644 --- a/assets/Spine/10000/10000.skel.meta +++ b/assets/Spine/10000/10000.skel.meta @@ -1,5 +1,9 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "a465b0b7-331c-4a20-b131-644993815230", + "textures": [ + "57d9e2f8-e41e-47c0-a1fe-b4e081af3bf6" + ], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/10000/10000_Attack1.skel.meta b/assets/Spine/10000/10000_Attack1.skel.meta index 86e209f..21baee5 100644 --- a/assets/Spine/10000/10000_Attack1.skel.meta +++ b/assets/Spine/10000/10000_Attack1.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "93c27d1e-4693-4014-9357-eee65cff9998", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/10000/10000_Attack2.skel.meta b/assets/Spine/10000/10000_Attack2.skel.meta index bbd35f4..c725c58 100644 --- a/assets/Spine/10000/10000_Attack2.skel.meta +++ b/assets/Spine/10000/10000_Attack2.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "b866db2b-eea0-42ad-b96a-db5f87d8008a", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/10000/10000_Skill1.skel.meta b/assets/Spine/10000/10000_Skill1.skel.meta index 0254dd1..1acc7b7 100644 --- a/assets/Spine/10000/10000_Skill1.skel.meta +++ b/assets/Spine/10000/10000_Skill1.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "830c03ab-e899-44d4-a9af-210de96e5521", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11000/11000.png.meta b/assets/Spine/11000/11000.png.meta index 0b3916c..9f2d100 100644 --- a/assets/Spine/11000/11000.png.meta +++ b/assets/Spine/11000/11000.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "e8eb664b-eb54-4b4d-b0ff-3d162bd9f4d3", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 1024, + "height": 1024, "platformSettings": {}, "subMetas": { "11000": { diff --git a/assets/Spine/11000/11002.skel.meta b/assets/Spine/11000/11002.skel.meta index a559d52..67909d8 100644 --- a/assets/Spine/11000/11002.skel.meta +++ b/assets/Spine/11000/11002.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "3b8cc7eb-fcab-48e3-96bb-6ef854b7fedd", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11000/11002_Attack_Effect.skel.meta b/assets/Spine/11000/11002_Attack_Effect.skel.meta index 71a8978..9798ffe 100644 --- a/assets/Spine/11000/11002_Attack_Effect.skel.meta +++ b/assets/Spine/11000/11002_Attack_Effect.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "44eca472-ae8e-446d-9c34-6bd78673a070", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11000/11002_Skill2_Hit.skel.meta b/assets/Spine/11000/11002_Skill2_Hit.skel.meta index a9f0420..39847ca 100644 --- a/assets/Spine/11000/11002_Skill2_Hit.skel.meta +++ b/assets/Spine/11000/11002_Skill2_Hit.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "65c47d68-827d-493c-871b-e98e91ee6a6c", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11000/11003.skel.meta b/assets/Spine/11000/11003.skel.meta index c3148fa..7947147 100644 --- a/assets/Spine/11000/11003.skel.meta +++ b/assets/Spine/11000/11003.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "f970d73f-e529-4de9-977f-8d31bcc00b41", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11000/11003_Attack_Effect.skel.meta b/assets/Spine/11000/11003_Attack_Effect.skel.meta index fde8048..859782f 100644 --- a/assets/Spine/11000/11003_Attack_Effect.skel.meta +++ b/assets/Spine/11000/11003_Attack_Effect.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "b2d29012-f42b-4185-bee4-46abd103cd92", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11000/11003_Talent4.png.meta b/assets/Spine/11000/11003_Talent4.png.meta index b3e0929..6173b6e 100644 --- a/assets/Spine/11000/11003_Talent4.png.meta +++ b/assets/Spine/11000/11003_Talent4.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "f6a10d9d-9854-4616-83bf-2ce3733be591", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 512, + "height": 512, "platformSettings": {}, "subMetas": { "11003_Talent4": { diff --git a/assets/Spine/11000/11004.skel.meta b/assets/Spine/11000/11004.skel.meta index b764f07..d61c8e5 100644 --- a/assets/Spine/11000/11004.skel.meta +++ b/assets/Spine/11000/11004.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "14d3af2b-2f94-461a-a0a8-2a2e9b40f67b", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11000/11004_Attack_Effect.skel.meta b/assets/Spine/11000/11004_Attack_Effect.skel.meta index 5cfbebf..680bed4 100644 --- a/assets/Spine/11000/11004_Attack_Effect.skel.meta +++ b/assets/Spine/11000/11004_Attack_Effect.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "e0b2f940-f89a-4d88-8c4b-6f9e9db8675d", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11000/particle/ziliao_jiahao.png.meta b/assets/Spine/11000/particle/ziliao_jiahao.png.meta index 3c40d51..04a1f29 100644 --- a/assets/Spine/11000/particle/ziliao_jiahao.png.meta +++ b/assets/Spine/11000/particle/ziliao_jiahao.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "718a6da6-62b3-443f-83ce-9b578225a6b3", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 48, + "height": 48, "platformSettings": {}, "subMetas": { "ziliao_jiahao": { diff --git a/assets/Spine/11000/particle/ziliao_suduxian.png.meta b/assets/Spine/11000/particle/ziliao_suduxian.png.meta index 9c43ff2..ffa1bd3 100644 --- a/assets/Spine/11000/particle/ziliao_suduxian.png.meta +++ b/assets/Spine/11000/particle/ziliao_suduxian.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "166ddf26-7e22-43c6-9f4d-782ccb115e5f", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 64, + "height": 64, "platformSettings": {}, "subMetas": { "ziliao_suduxian": { diff --git a/assets/Spine/11200/11200.png.meta b/assets/Spine/11200/11200.png.meta index d31ec4c..5c145a2 100644 --- a/assets/Spine/11200/11200.png.meta +++ b/assets/Spine/11200/11200.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "fbac221e-05e9-4b66-a789-ed19c63a6b16", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 256, + "height": 256, "platformSettings": {}, "subMetas": { "11200": { diff --git a/assets/Spine/11200/11200.skel.meta b/assets/Spine/11200/11200.skel.meta index 0a7f03e..231d574 100644 --- a/assets/Spine/11200/11200.skel.meta +++ b/assets/Spine/11200/11200.skel.meta @@ -1,5 +1,9 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "e3866e1b-12b5-4e00-aa7c-430a886ce9c9", + "textures": [ + "fbac221e-05e9-4b66-a789-ed19c63a6b16" + ], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/11200/11200_Attack_Effect.skel.meta b/assets/Spine/11200/11200_Attack_Effect.skel.meta index 40dfb49..2ec0a15 100644 --- a/assets/Spine/11200/11200_Attack_Effect.skel.meta +++ b/assets/Spine/11200/11200_Attack_Effect.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "23b7a27d-9cb4-41de-bef9-5d058fa0385e", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/12200/12200.png.meta b/assets/Spine/12200/12200.png.meta index d49e36a..cda6c68 100644 --- a/assets/Spine/12200/12200.png.meta +++ b/assets/Spine/12200/12200.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "8bcde965-2cf5-49ac-b066-9db0f25f7bd8", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 2048, + "height": 1024, "platformSettings": {}, "subMetas": { "12200": { diff --git a/assets/Spine/12200/12200.skel.meta b/assets/Spine/12200/12200.skel.meta index 26763a3..809c289 100644 --- a/assets/Spine/12200/12200.skel.meta +++ b/assets/Spine/12200/12200.skel.meta @@ -1,5 +1,9 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "9d669663-0107-4e71-85cd-a26053ee07a2", + "textures": [ + "8bcde965-2cf5-49ac-b066-9db0f25f7bd8" + ], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/12200/12200_Change1.skel.meta b/assets/Spine/12200/12200_Change1.skel.meta index 1532875..8444f45 100644 --- a/assets/Spine/12200/12200_Change1.skel.meta +++ b/assets/Spine/12200/12200_Change1.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "2c96949b-f1f0-4c36-b889-839d655242ea", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Spine/12200/12200_Effect.skel.meta b/assets/Spine/12200/12200_Effect.skel.meta index 316c7f7..38dd93c 100644 --- a/assets/Spine/12200/12200_Effect.skel.meta +++ b/assets/Spine/12200/12200_Effect.skel.meta @@ -1,5 +1,7 @@ { - "ver": "1.0.1", + "ver": "1.2.3", "uuid": "9c016289-8f65-44db-a24c-ae4d23151d59", + "textures": [], + "scale": 1, "subMetas": {} } \ No newline at end of file diff --git a/assets/Texture/HelloWorld.png.meta b/assets/Texture/HelloWorld.png.meta index afb3eaf..655100b 100755 --- a/assets/Texture/HelloWorld.png.meta +++ b/assets/Texture/HelloWorld.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "01fe0a8a-8e5d-4b9b-9457-8e597a7eac61", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 195, + "height": 270, "platformSettings": {}, "subMetas": { "HelloWorld": { diff --git a/assets/Texture/icon.png.meta b/assets/Texture/icon.png.meta index 103423b..db52abf 100644 --- a/assets/Texture/icon.png.meta +++ b/assets/Texture/icon.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "0d0cb526-6f63-4aad-b565-e3ca6a7f1132", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 1024, + "height": 2048, "platformSettings": {}, "subMetas": { "icon": { diff --git a/assets/Texture/singleColor.png.meta b/assets/Texture/singleColor.png.meta index ba5b700..8d734e3 100755 --- a/assets/Texture/singleColor.png.meta +++ b/assets/Texture/singleColor.png.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "0daa775f-abea-4943-ba83-725729420212", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 2, + "height": 2, "platformSettings": {}, "subMetas": { "singleColor": { diff --git a/assets/resources/Prefab/Bag.prefab.meta b/assets/resources/Prefab/Bag.prefab.meta index 7624dbe..5bde9b1 100644 --- a/assets/resources/Prefab/Bag.prefab.meta +++ b/assets/resources/Prefab/Bag.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "d872ec51-e1d9-41dc-a947-fd96862a683a", "optimizationPolicy": "AUTO", "asyncLoadAssets": false, diff --git a/assets/resources/Prefab/Hall.prefab.meta b/assets/resources/Prefab/Hall.prefab.meta index 43aedf1..60daa77 100644 --- a/assets/resources/Prefab/Hall.prefab.meta +++ b/assets/resources/Prefab/Hall.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "cb6fb71a-9a7f-4197-b686-362c0521d8a1", "optimizationPolicy": "AUTO", "asyncLoadAssets": false, diff --git a/assets/resources/Prefab/Login.prefab.meta b/assets/resources/Prefab/Login.prefab.meta index 9ba6382..4dbbe8c 100644 --- a/assets/resources/Prefab/Login.prefab.meta +++ b/assets/resources/Prefab/Login.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "87ae3938-4c4c-4b0f-82e2-b10fbfda8e3e", "optimizationPolicy": "AUTO", "asyncLoadAssets": false, diff --git a/assets/resources/Prefab/Notice.prefab.meta b/assets/resources/Prefab/Notice.prefab.meta index 4ccffcf..9a32926 100644 --- a/assets/resources/Prefab/Notice.prefab.meta +++ b/assets/resources/Prefab/Notice.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "75ab7091-3f34-4b61-bd73-dbd5d7242e00", "optimizationPolicy": "AUTO", "asyncLoadAssets": false, diff --git a/assets/resources/images/test.jpg.meta b/assets/resources/images/test.jpg.meta index a0a00be..cf1f0c2 100644 --- a/assets/resources/images/test.jpg.meta +++ b/assets/resources/images/test.jpg.meta @@ -1,5 +1,5 @@ { - "ver": "2.3.3", + "ver": "2.3.4", "uuid": "afdd70a8-a4ef-4e4f-ad17-85bc6c89a570", "type": "sprite", "wrapMode": "clamp", @@ -7,6 +7,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, + "width": 198, + "height": 198, "platformSettings": {}, "subMetas": { "test": { diff --git a/assets/resources/prefabDir/HelloWorld.prefab.meta b/assets/resources/prefabDir/HelloWorld.prefab.meta index 6566fde..0ce0544 100644 --- a/assets/resources/prefabDir/HelloWorld.prefab.meta +++ b/assets/resources/prefabDir/HelloWorld.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "b1ee8f9d-deb2-4e0a-9389-b3800d785879", "optimizationPolicy": "AUTO", "asyncLoadAssets": false, diff --git a/assets/resources/prefabDir/Item.prefab.meta b/assets/resources/prefabDir/Item.prefab.meta index d30a6d8..c21a503 100644 --- a/assets/resources/prefabDir/Item.prefab.meta +++ b/assets/resources/prefabDir/Item.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.2.5", + "ver": "1.2.7", "uuid": "d42e69e2-ac81-48c9-93a4-d3e03cc1106a", "optimizationPolicy": "AUTO", "asyncLoadAssets": false, diff --git a/project.json b/project.json index e541b61..7a07b53 100755 --- a/project.json +++ b/project.json @@ -1,6 +1,7 @@ { "engine": "cocos2d-html5", "packages": "packages", - "version": "2.2.2", - "id": "85f98515-224f-475b-aa5e-4f80eaff955d" + "version": "2.3.4", + "id": "85f98515-224f-475b-aa5e-4f80eaff955d", + "isNew": false } \ No newline at end of file diff --git a/settings/project.json b/settings/project.json index 87f4871..71b72e0 100755 --- a/settings/project.json +++ b/settings/project.json @@ -7,7 +7,11 @@ ], "design-resolution-height": 640, "design-resolution-width": 960, - "excluded-modules": [], + "excluded-modules": [ + "3D Physics/cannon.js", + "3D Physics/Builtin", + "3D Particle" + ], "facebook": { "appID": "", "audience": { @@ -31,5 +35,8 @@ }, "start-scene": "current", "use-customize-simulator": false, - "use-project-simulator-setting": false + "use-project-simulator-setting": false, + "migrate-history": [ + "cloud-function" + ] }