diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 9f1ff23a..5eee37d0 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -998,7 +998,7 @@ "_group": 1, "_density": 1, "_sensor": false, - "_friction": 0.1, + "_friction": 1, "_restitution": 0, "_offset": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/monster/hero.prefab b/assets/resources/game/monster/hero.prefab index f6826a47..77dfc29b 100644 --- a/assets/resources/game/monster/hero.prefab +++ b/assets/resources/game/monster/hero.prefab @@ -843,7 +843,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 42.648, + "y": 14.6, "z": 0 }, "_lrot": { @@ -1376,8 +1376,8 @@ "_group": 2, "_density": 1, "_sensor": false, - "_friction": 0.2, - "_restitution": 0, + "_friction": 1, + "_restitution": 0.2, "_offset": { "__type__": "cc.Vec2", "x": 1.7, @@ -1421,7 +1421,7 @@ "y": 0 }, "_angularVelocity": 0, - "_fixedRotation": false, + "_fixedRotation": true, "_id": "" }, { diff --git a/assets/resources/loading.meta b/assets/resources/loading.meta index 8cd8d255..97c5cd33 100644 --- a/assets/resources/loading.meta +++ b/assets/resources/loading.meta @@ -2,18 +2,8 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "c2392cff-8a0b-4baa-95de-e3bfe2999f3c", + "uuid": "240eb21f-5342-45b5-8440-6b6828e539fa", "files": [], "subMetas": {}, - "userData": { - "compressionType": { - "wechatgame": "zip" - }, - "isRemoteBundle": { - "wechatgame": true, - "web-mobile": true, - "web-desktop": true - }, - "isBundle": false - } + "userData": {} } diff --git a/assets/resources/loading/prefab.meta b/assets/resources/loading/prefab.meta new file mode 100644 index 00000000..0df41c0d --- /dev/null +++ b/assets/resources/loading/prefab.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "9e4a59af-22c3-4c0b-b864-98193db88d5f", + "files": [], + "subMetas": {}, + "userData": { + "compressionType": {}, + "isRemoteBundle": {} + } +} diff --git a/assets/resources/game/monster/monster.prefab b/assets/resources/loading/prefab/loading.prefab similarity index 58% rename from assets/resources/game/monster/monster.prefab rename to assets/resources/loading/prefab/loading.prefab index ea56de52..4e5d4221 100644 --- a/assets/resources/game/monster/monster.prefab +++ b/assets/resources/loading/prefab/loading.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "monster", + "_name": "loading", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "monster", + "_name": "loading", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -23,34 +23,22 @@ }, { "__id__": 8 - }, - { - "__id__": 16 } ], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 46 }, { - "__id__": 32 + "__id__": 48 }, { - "__id__": 34 - }, - { - "__id__": 36 - }, - { - "__id__": 38 - }, - { - "__id__": 40 + "__id__": 50 } ], "_prefab": { - "__id__": 42 + "__id__": 52 }, "_lpos": { "__type__": "cc.Vec3", @@ -72,7 +60,7 @@ "z": 1 }, "_mobility": 0, - "_layer": 1, + "_layer": 33554432, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -83,14 +71,14 @@ }, { "__type__": "cc.Node", - "_name": "shader", + "_name": "bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 3 @@ -122,7 +110,7 @@ "z": 1 }, "_mobility": 0, - "_layer": 1, + "_layer": 33554432, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -145,8 +133,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 119 + "width": 720, + "height": 1280 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -182,7 +170,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b1745dc0-d78b-4443-a4fc-746ff6749b39@f9941", + "__uuid__": "591a4566-d2cc-4bb7-9f01-d5e0da5ca109@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -212,171 +200,14 @@ "asset": { "__id__": 0 }, - "fileId": "66VNgwnoRDmprg2mtbH825", + "fileId": "7cza7A3O1NDLUuQQdasqMx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "avatar", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 9 - }, - { - "__id__": 11 - }, - { - "__id__": 13 - } - ], - "_prefab": { - "__id__": 15 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 10 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 320, - "height": 320 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.53125, - "y": 0.53125 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "2epemEawRGPpO3vKyuHHBL" - }, - { - "__type__": "sp.Skeleton", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_skeletonData": { - "__uuid__": "6683952a-05cc-4103-9cfd-dbd67fea128a", - "__expectedType__": "sp.SkeletonData" - }, - "defaultSkin": "war", - "defaultAnimation": "idle", - "_premultipliedAlpha": false, - "_timeScale": 1, - "_preCacheMode": 1, - "_cacheMode": 1, - "_sockets": [], - "_useTint": false, - "_debugMesh": false, - "_debugBones": false, - "_debugSlots": false, - "_enableBatch": false, - "loop": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d6Qb8NhhhN1ascGn7UPZok" - }, - { - "__type__": "d3a79W3OpNBsL5WHT9mZqHd", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "69mhfaIZlB4rqXSUCD6dhL" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "48a+Hx9oREoZ7vqKgprKhT", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "top", + "_name": "pro_progress", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -384,25 +215,40 @@ }, "_children": [ { - "__id__": 17 + "__id__": 9 + }, + { + "__id__": 19 + }, + { + "__id__": 25 } ], "_active": true, "_components": [ { - "__id__": 25 + "__id__": 35 }, { - "__id__": 27 + "__id__": 37 + }, + { + "__id__": 39 + }, + { + "__id__": 41 + }, + { + "__id__": 43 } ], "_prefab": { - "__id__": 29 + "__id__": 45 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 60, + "y": -527.5, "z": 0 }, "_lrot": { @@ -419,7 +265,7 @@ "z": 1 }, "_mobility": 0, - "_layer": 1, + "_layer": 33554432, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -430,32 +276,35 @@ }, { "__type__": "cc.Node", - "_name": "lab_name", + "_name": "lab_prompt", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 16 + "__id__": 8 }, "_children": [], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 10 }, { - "__id__": 20 + "__id__": 12 }, { - "__id__": 22 + "__id__": 14 + }, + { + "__id__": 16 } ], "_prefab": { - "__id__": 24 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 17.12, + "y": 74.13, "z": 0 }, "_lrot": { @@ -472,7 +321,7 @@ "z": 1 }, "_mobility": 0, - "_layer": 1, + "_layer": 33554432, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -483,20 +332,20 @@ }, { "__type__": "cc.UITransform", - "_name": "", + "_name": "lab_progress", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 11 }, "_contentSize": { "__type__": "cc.Size", - "width": 90.6953125, - "height": 34.24 + "width": 164, + "height": 54.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -507,19 +356,19 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c68UOAlNhN171Umca6yVvF" + "fileId": "37WpHB35ZA8KJNfmflUmio" }, { "__type__": "cc.Label", - "_name": "", + "_name": "lab_progress