From 66f32a44aeba873b5317e71ef362d120c8138c82 Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Tue, 6 Aug 2024 16:42:03 +0800 Subject: [PATCH] dd --- assets/res.meta | 9 + assets/{resources/common => res}/common.meta | 0 .../common => res}/common/texture.meta | 0 .../common/texture/auto-atlas.pac | 0 .../common/texture/auto-atlas.pac.meta | 0 .../common/texture/bg_window.png | Bin .../common/texture/bg_window.png.meta | 0 .../common => res}/common/texture/btn_ok.png | Bin .../common/texture/btn_ok.png.meta | 0 .../common => res}/common/texture/loading.png | Bin .../common/texture/loading.png.meta | 0 .../common => res}/common/texture/role.meta | 0 .../common => res}/common/texture/toast.png | Bin .../common/texture/toast.png.meta | 0 .../{resources/loading => res}/loading.meta | 0 .../loading => res}/loading/texture.meta | 0 .../loading => res}/loading/texture/bg.png | Bin .../loading/texture/bg.png.meta | 0 .../loading/texture/icon_loading_bar.png | Bin .../loading/texture/icon_loading_bar.png.meta | 0 .../texture/panel_loading_bottom_frame.png | Bin .../panel_loading_bottom_frame.png.meta | 0 assets/resources/game/map/map_rpg.prefab | 14 +- assets/resources/game/monster/hero.prefab | 44 +- .../gui/prefab/role_controller.prefab | 2597 +++++++++++++---- assets/script/game/common/config/BoxSet.ts | 6 +- settings/v2/packages/project.json | 2 +- 27 files changed, 2013 insertions(+), 659 deletions(-) create mode 100644 assets/res.meta rename assets/{resources/common => res}/common.meta (100%) rename assets/{resources/common => res}/common/texture.meta (100%) rename assets/{resources/common => res}/common/texture/auto-atlas.pac (100%) rename assets/{resources/common => res}/common/texture/auto-atlas.pac.meta (100%) rename assets/{resources/common => res}/common/texture/bg_window.png (100%) rename assets/{resources/common => res}/common/texture/bg_window.png.meta (100%) rename assets/{resources/common => res}/common/texture/btn_ok.png (100%) rename assets/{resources/common => res}/common/texture/btn_ok.png.meta (100%) rename assets/{resources/common => res}/common/texture/loading.png (100%) rename assets/{resources/common => res}/common/texture/loading.png.meta (100%) rename assets/{resources/common => res}/common/texture/role.meta (100%) rename assets/{resources/common => res}/common/texture/toast.png (100%) rename assets/{resources/common => res}/common/texture/toast.png.meta (100%) rename assets/{resources/loading => res}/loading.meta (100%) rename assets/{resources/loading => res}/loading/texture.meta (100%) rename assets/{resources/loading => res}/loading/texture/bg.png (100%) rename assets/{resources/loading => res}/loading/texture/bg.png.meta (100%) rename assets/{resources/loading => res}/loading/texture/icon_loading_bar.png (100%) rename assets/{resources/loading => res}/loading/texture/icon_loading_bar.png.meta (100%) rename assets/{resources/loading => res}/loading/texture/panel_loading_bottom_frame.png (100%) rename assets/{resources/loading => res}/loading/texture/panel_loading_bottom_frame.png.meta (100%) diff --git a/assets/res.meta b/assets/res.meta new file mode 100644 index 00000000..39f1a0c0 --- /dev/null +++ b/assets/res.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "a1d00e33-05dc-4af3-b63c-50e2c1bc29ff", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/common/common.meta b/assets/res/common.meta similarity index 100% rename from assets/resources/common/common.meta rename to assets/res/common.meta diff --git a/assets/resources/common/common/texture.meta b/assets/res/common/texture.meta similarity index 100% rename from assets/resources/common/common/texture.meta rename to assets/res/common/texture.meta diff --git a/assets/resources/common/common/texture/auto-atlas.pac b/assets/res/common/texture/auto-atlas.pac similarity index 100% rename from assets/resources/common/common/texture/auto-atlas.pac rename to assets/res/common/texture/auto-atlas.pac diff --git a/assets/resources/common/common/texture/auto-atlas.pac.meta b/assets/res/common/texture/auto-atlas.pac.meta similarity index 100% rename from assets/resources/common/common/texture/auto-atlas.pac.meta rename to assets/res/common/texture/auto-atlas.pac.meta diff --git a/assets/resources/common/common/texture/bg_window.png b/assets/res/common/texture/bg_window.png similarity index 100% rename from assets/resources/common/common/texture/bg_window.png rename to assets/res/common/texture/bg_window.png diff --git a/assets/resources/common/common/texture/bg_window.png.meta b/assets/res/common/texture/bg_window.png.meta similarity index 100% rename from assets/resources/common/common/texture/bg_window.png.meta rename to assets/res/common/texture/bg_window.png.meta diff --git a/assets/resources/common/common/texture/btn_ok.png b/assets/res/common/texture/btn_ok.png similarity index 100% rename from assets/resources/common/common/texture/btn_ok.png rename to assets/res/common/texture/btn_ok.png diff --git a/assets/resources/common/common/texture/btn_ok.png.meta b/assets/res/common/texture/btn_ok.png.meta similarity index 100% rename from assets/resources/common/common/texture/btn_ok.png.meta rename to assets/res/common/texture/btn_ok.png.meta diff --git a/assets/resources/common/common/texture/loading.png b/assets/res/common/texture/loading.png similarity index 100% rename from assets/resources/common/common/texture/loading.png rename to assets/res/common/texture/loading.png diff --git a/assets/resources/common/common/texture/loading.png.meta b/assets/res/common/texture/loading.png.meta similarity index 100% rename from assets/resources/common/common/texture/loading.png.meta rename to assets/res/common/texture/loading.png.meta diff --git a/assets/resources/common/common/texture/role.meta b/assets/res/common/texture/role.meta similarity index 100% rename from assets/resources/common/common/texture/role.meta rename to assets/res/common/texture/role.meta diff --git a/assets/resources/common/common/texture/toast.png b/assets/res/common/texture/toast.png similarity index 100% rename from assets/resources/common/common/texture/toast.png rename to assets/res/common/texture/toast.png diff --git a/assets/resources/common/common/texture/toast.png.meta b/assets/res/common/texture/toast.png.meta similarity index 100% rename from assets/resources/common/common/texture/toast.png.meta rename to assets/res/common/texture/toast.png.meta diff --git a/assets/resources/loading/loading.meta b/assets/res/loading.meta similarity index 100% rename from assets/resources/loading/loading.meta rename to assets/res/loading.meta diff --git a/assets/resources/loading/loading/texture.meta b/assets/res/loading/texture.meta similarity index 100% rename from assets/resources/loading/loading/texture.meta rename to assets/res/loading/texture.meta diff --git a/assets/resources/loading/loading/texture/bg.png b/assets/res/loading/texture/bg.png similarity index 100% rename from assets/resources/loading/loading/texture/bg.png rename to assets/res/loading/texture/bg.png diff --git a/assets/resources/loading/loading/texture/bg.png.meta b/assets/res/loading/texture/bg.png.meta similarity index 100% rename from assets/resources/loading/loading/texture/bg.png.meta rename to assets/res/loading/texture/bg.png.meta diff --git a/assets/resources/loading/loading/texture/icon_loading_bar.png b/assets/res/loading/texture/icon_loading_bar.png similarity index 100% rename from assets/resources/loading/loading/texture/icon_loading_bar.png rename to assets/res/loading/texture/icon_loading_bar.png diff --git a/assets/resources/loading/loading/texture/icon_loading_bar.png.meta b/assets/res/loading/texture/icon_loading_bar.png.meta similarity index 100% rename from assets/resources/loading/loading/texture/icon_loading_bar.png.meta rename to assets/res/loading/texture/icon_loading_bar.png.meta diff --git a/assets/resources/loading/loading/texture/panel_loading_bottom_frame.png b/assets/res/loading/texture/panel_loading_bottom_frame.png similarity index 100% rename from assets/resources/loading/loading/texture/panel_loading_bottom_frame.png rename to assets/res/loading/texture/panel_loading_bottom_frame.png diff --git a/assets/resources/loading/loading/texture/panel_loading_bottom_frame.png.meta b/assets/res/loading/texture/panel_loading_bottom_frame.png.meta similarity index 100% rename from assets/resources/loading/loading/texture/panel_loading_bottom_frame.png.meta rename to assets/res/loading/texture/panel_loading_bottom_frame.png.meta diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 13b5195d..9f1ff23a 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -446,7 +446,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 309.596, + "y": 417.574, "z": 0 }, "_lrot": { @@ -707,7 +707,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -61.919, + "y": 46.059, "z": 0 }, "_lrot": { @@ -849,7 +849,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -498.303, + "y": -390.325, "z": 0 }, "_lrot": { @@ -1003,12 +1003,12 @@ "_offset": { "__type__": "cc.Vec2", "x": -1.1, - "y": -23.3 + "y": -24.5 }, "_size": { "__type__": "cc.Size", "width": 1177.9, - "height": 838.2 + "height": 835.9 }, "_id": "" }, @@ -1053,7 +1053,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -302.335, - "y": -98.022, + "y": 10.956, "z": 0 }, "_lrot": { @@ -1189,7 +1189,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 299.971, - "y": -98.022, + "y": 10.956, "z": 0 }, "_lrot": { diff --git a/assets/resources/game/monster/hero.prefab b/assets/resources/game/monster/hero.prefab index d174d415..6ae5add6 100644 --- a/assets/resources/game/monster/hero.prefab +++ b/assets/resources/game/monster/hero.prefab @@ -67,8 +67,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.9, - "y": 0.9, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -260,8 +260,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -351,15 +351,15 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0.393, - "y": 57.214, + "x": 8.394, + "y": 8.436, "z": 0 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0, + "z": -4.963083675318166e-24, "w": 1 }, "_lscale": { @@ -374,7 +374,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0 + "z": -5.687274959320158e-22 }, "_id": "" }, @@ -392,19 +392,19 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 79, + "height": 106 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dcU5E7bLRFnbO/m/Ni5Sfj" + "fileId": "2aAnQbe5pLIKBvQzTJ0dq4" }, { "__type__": "cc.Sprite", @@ -434,7 +434,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -449,7 +449,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e7JFDGNTZMQIcBkDXfQ33g" + "fileId": "4auXsUr7ND3Zsk8ermdUY5" }, { "__type__": "cc.PrefabInfo", @@ -459,7 +459,7 @@ "asset": { "__id__": 0 }, - "fileId": "58gGWhtitLVKR9TkMsdXHe", + "fileId": "7bxsCbRDxNwo1ZLTKjrgvA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -473,7 +473,7 @@ "__id__": 9 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 17 @@ -656,12 +656,12 @@ "_contentSize": { "__type__": "cc.Size", "width": 128, - "height": 134.2100067138672 + "height": 160.740005 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.49101561307907104, - "y": 0.023023617909185595 + "y": 0.08143585731770167 }, "_id": "" }, @@ -1198,13 +1198,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 2.2, - "y": 16 + "x": 1.7, + "y": 30.5 }, "_size": { "__type__": "cc.Size", - "width": 71.4, - "height": 85 + "width": 70.4, + "height": 130 }, "_id": "" }, diff --git a/assets/resources/gui/prefab/role_controller.prefab b/assets/resources/gui/prefab/role_controller.prefab index 9d745f14..7d00cf00 100644 --- a/assets/resources/gui/prefab/role_controller.prefab +++ b/assets/resources/gui/prefab/role_controller.prefab @@ -20,22 +20,28 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 60 + }, + { + "__id__": 118 } ], "_active": true, "_components": [ { - "__id__": 60 + "__id__": 122 }, { - "__id__": 62 + "__id__": 124 }, { - "__id__": 64 + "__id__": 126 } ], "_prefab": { - "__id__": 66 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", @@ -68,7 +74,7 @@ }, { "__type__": "cc.Node", - "_name": "Node", + "_name": "life", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -80,6 +86,15 @@ }, { "__id__": 19 + }, + { + "__id__": 27 + }, + { + "__id__": 37 + }, + { + "__id__": 47 } ], "_active": true, @@ -170,7 +185,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": 1, - "y": 0.6, + "y": 1, "z": 1 }, "_mobility": 0, @@ -247,8 +262,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 549, - "height": 47 + "width": 550, + "height": 48 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -284,7 +299,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "6914c629-5103-4b3d-b0a7-64e27b3be1f6@f9941", + "__uuid__": "ede971c5-e28a-4458-bf9f-4addf25fa9df@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 3, @@ -333,8 +348,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 567, - "height": 65 + "width": 560, + "height": 50 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -370,7 +385,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20d4c88f-d859-4182-86ae-97911159d643@f9941", + "__uuid__": "ea61fa55-a662-44f2-950b-4eb9550debba@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -466,31 +481,21 @@ "_parent": { "__id__": 2 }, - "_children": [ + "_children": [], + "_active": true, + "_components": [ { "__id__": 20 }, { - "__id__": 30 + "__id__": 22 }, { - "__id__": 40 - } - ], - "_active": true, - "_components": [ - { - "__id__": 48 - }, - { - "__id__": 50 - }, - { - "__id__": 52 + "__id__": 24 } ], "_prefab": { - "__id__": 54 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -521,600 +526,6 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "hp_min", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 19 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 21 - }, - { - "__id__": 23 - }, - { - "__id__": 25 - }, - { - "__id__": 27 - } - ], - "_prefab": { - "__id__": 29 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 137.29266666666663, - "y": 2.0665333333332683, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.6666666666666666, - "y": 0.39999999999999997, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "lab_progress", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 20 - }, - "_enabled": true, - "__prefab": { - "__id__": 22 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 70.73828125, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6aPgtWoMBPd6mp2RRfqO+a" - }, - { - "__type__": "cc.Label", - "_name": "lab_progress