From aca32fd5c870b868775be7441856963fc491cdf7 Mon Sep 17 00:00:00 2001 From: pan Date: Wed, 26 Aug 2026 09:39:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E5=8D=A1=E7=89=8C=E7=B3=BB=E7=BB=9F=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=92=8C=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 删除MSkillBoxComp组件文件及对应的meta配置 2. 从UI配置中移除SkillBox相关注册项 3. 删除MSkillBox.prefab及其meta配置 4. 新增winbox和winboxbg弹窗预制体资源 5. 优化CardLiteComp的注释描述 --- .../{MSkillBox.prefab => winbox.prefab} | 905 ++++-------------- ...killBox.prefab.meta => winbox.prefab.meta} | 4 +- assets/resources/gui/element/winboxbg.prefab | 319 ++++++ .../gui/element/winboxbg.prefab.meta | 13 + .../script/game/common/config/GameUIConfig.ts | 3 - assets/script/game/map/CardLiteComp.ts | 2 +- assets/script/game/map/MSkillBoxComp.ts | 83 -- assets/script/game/map/MSkillBoxComp.ts.meta | 9 - 8 files changed, 523 insertions(+), 815 deletions(-) rename assets/resources/gui/element/{MSkillBox.prefab => winbox.prefab} (69%) rename assets/resources/gui/element/{MSkillBox.prefab.meta => winbox.prefab.meta} (62%) create mode 100644 assets/resources/gui/element/winboxbg.prefab create mode 100644 assets/resources/gui/element/winboxbg.prefab.meta delete mode 100644 assets/script/game/map/MSkillBoxComp.ts delete mode 100644 assets/script/game/map/MSkillBoxComp.ts.meta diff --git a/assets/resources/gui/element/MSkillBox.prefab b/assets/resources/gui/element/winbox.prefab similarity index 69% rename from assets/resources/gui/element/MSkillBox.prefab rename to assets/resources/gui/element/winbox.prefab index 0558b5ec..d8d8d9f8 100644 --- a/assets/resources/gui/element/MSkillBox.prefab +++ b/assets/resources/gui/element/winbox.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "MSkillBox", + "_name": "winbox", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "MSkillBox", + "_name": "winbox", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -23,22 +23,28 @@ }, { "__id__": 10 + }, + { + "__id__": 54 } ], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 60 }, { - "__id__": 86 + "__id__": 62 }, { - "__id__": 88 + "__id__": 64 + }, + { + "__id__": 66 } ], "_prefab": { - "__id__": 90 + "__id__": 68 }, "_lpos": { "__type__": "cc.Vec3", @@ -71,185 +77,119 @@ }, { "__type__": "cc.Node", - "_name": "bg", "_objFlags": 0, - "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "fa3905e2-e4b8-4b97-8133-f6012983b023", + "__expectedType__": "cc.Prefab" + }, + "fileId": "a7x2ngYBBCDZGBGSnpC09G", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "6em3K2ycdNO6BOc8dfKGMj", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ { "__id__": 5 }, { "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 } ], - "_prefab": { - "__id__": 9 + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 }, - "_lpos": { + "propertyPath": [ + "_name" + ], + "value": "winboxbg" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "a7x2ngYBBCDZGBGSnpC09G" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 57.432, "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 }, - "_lrot": { + "propertyPath": [ + "_lrot" + ], + "value": { "__type__": "cc.Quat", "x": 0, "y": 0, "z": 0, "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1.8, - "y": 1.8, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { + "propertyPath": [ + "_euler" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 432, - "height": 936 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ffaOwWRglJkoL4j/8u9neK" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@1e2d6", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": true, - "_atlas": { - "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "53M7FgPI5MCLRxtx62a5KJ" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": false, - "__prefab": { - "__id__": 8 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 800, - "_originalHeight": 800, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "faH6JwKDVNuJMOMFsEhKc1" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "38yz8e6ORDuZoyucW/cL37", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + } }, { "__type__": "cc.Node", - "_name": "cards", + "_name": "btns", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -260,34 +200,28 @@ "__id__": 11 }, { - "__id__": 25 - }, - { - "__id__": 69 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 75 + "__id__": 47 }, { - "__id__": 77 + "__id__": 49 }, { - "__id__": 79 - }, - { - "__id__": 81 + "__id__": 51 } ], "_prefab": { - "__id__": 83 + "__id__": 53 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -237.659, "z": 0 }, "_lrot": { @@ -315,7 +249,7 @@ }, { "__type__": "cc.Node", - "_name": "bg2", + "_name": "re", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -324,24 +258,30 @@ "_children": [ { "__id__": 12 + }, + { + "__id__": 18 } ], "_active": true, "_components": [ { - "__id__": 20 + "__id__": 24 }, { - "__id__": 22 + "__id__": 26 + }, + { + "__id__": 28 } ], "_prefab": { - "__id__": 24 + "__id__": 31 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 57.432, + "x": -115, + "y": 0, "z": 0 }, "_lrot": { @@ -369,7 +309,7 @@ }, { "__type__": "cc.Node", - "_name": "btn_sky", + "_name": "Label", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -383,18 +323,15 @@ }, { "__id__": 15 - }, - { - "__id__": 17 } ], "_prefab": { - "__id__": 19 + "__id__": 17 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 2, "z": 0 }, "_lrot": { @@ -432,378 +369,6 @@ "__prefab": { "__id__": 14 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 700.0000000000006, - "height": 700 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "08WRaUTRtBoLZDLT2cN4Mc" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 12 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@a7b3a", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "03RfLB07VFR5uklShb2x26" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 12 - }, - "_enabled": true, - "__prefab": { - "__id__": 18 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": -50.00000000000004, - "_bottom": -50, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 185, - "_originalHeight": 81, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a3cPcPwhJD0b1a42pOaLxy" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "70TAIG6KROq7YtmAV7TB6O", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 11 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 700.0000000000006, - "height": 600 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "efn7IzyGtCJIFV50y3xcMm" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 11 - }, - "_enabled": false, - "__prefab": { - "__id__": 23 - }, - "_alignFlags": 42, - "_target": null, - "_left": 10, - "_right": 10, - "_top": 590, - "_bottom": 300, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 100, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "fc2EpaVB1BrppLfezSkGbe" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a7x2ngYBBCDZGBGSnpC09G", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "btns", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 10 - }, - "_children": [ - { - "__id__": 26 - }, - { - "__id__": 47 - } - ], - "_active": true, - "_components": [ - { - "__id__": 62 - }, - { - "__id__": 64 - }, - { - "__id__": 66 - } - ], - "_prefab": { - "__id__": 68 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -237.659, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "re", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 25 - }, - "_children": [ - { - "__id__": 27 - }, - { - "__id__": 33 - } - ], - "_active": true, - "_components": [ - { - "__id__": 39 - }, - { - "__id__": 41 - }, - { - "__id__": 43 - } - ], - "_prefab": { - "__id__": 46 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -115, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 26 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 28 - }, - { - "__id__": 30 - } - ], - "_prefab": { - "__id__": 32 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 2, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 27 - }, - "_enabled": true, - "__prefab": { - "__id__": 29 - }, "_contentSize": { "__type__": "cc.Size", "width": 64, @@ -826,11 +391,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -907,20 +472,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 26 + "__id__": 11 }, "_children": [], "_active": true, "_components": [ { - "__id__": 34 + "__id__": 19 }, { - "__id__": 36 + "__id__": 21 } ], "_prefab": { - "__id__": 38 + "__id__": 23 }, "_lpos": { "__type__": "cc.Vec3", @@ -957,11 +522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 18 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 20 }, "_contentSize": { "__type__": "cc.Size", @@ -985,11 +550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 18 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 22 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1066,11 +631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -1094,11 +659,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1142,15 +707,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 29 }, "clickEvents": [ { - "__id__": 45 + "__id__": 30 } ], "_interactable": true, @@ -1198,12 +763,10 @@ }, { "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, + "target": null, "component": "", - "_componentId": "463c7iN7clDbLBuuJ6fqWQv", - "handler": "victory_end", + "_componentId": "", + "handler": "", "customEventData": "" }, { @@ -1225,27 +788,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 25 + "__id__": 10 }, "_children": [ { - "__id__": 48 + "__id__": 33 } ], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 39 }, { - "__id__": 56 + "__id__": 41 }, { - "__id__": 58 + "__id__": 43 } ], "_prefab": { - "__id__": 61 + "__id__": 46 }, "_lpos": { "__type__": "cc.Vec3", @@ -1282,20 +845,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 47 + "__id__": 32 }, "_children": [], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 34 }, { - "__id__": 51 + "__id__": 36 } ], "_prefab": { - "__id__": 53 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -1332,11 +895,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -1360,11 +923,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1441,11 +1004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 40 }, "_contentSize": { "__type__": "cc.Size", @@ -1469,11 +1032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 42 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1517,15 +1080,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 44 }, "clickEvents": [ { - "__id__": 60 + "__id__": 45 } ], "_interactable": true, @@ -1573,12 +1136,10 @@ }, { "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, + "target": null, "component": "", - "_componentId": "463c7iN7clDbLBuuJ6fqWQv", - "handler": "victory_end", + "_componentId": "", + "handler": "", "customEventData": "" }, { @@ -1600,11 +1161,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1628,11 +1189,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 50 }, "_resizeMode": 1, "_layoutType": 1, @@ -1666,11 +1227,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 10 }, "_enabled": false, "__prefab": { - "__id__": 67 + "__id__": 52 }, "_alignFlags": 4, "_target": null, @@ -1715,20 +1276,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 1 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 55 }, { - "__id__": 72 + "__id__": 57 } ], "_prefab": { - "__id__": 74 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -1765,11 +1326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1793,11 +1354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 58 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1874,11 +1435,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1902,11 +1463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 63 }, "_alignFlags": 42, "_target": null, @@ -1938,11 +1499,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 1 }, "_enabled": false, "__prefab": { - "__id__": 80 + "__id__": 65 }, "_resizeMode": 1, "_layoutType": 1, @@ -1976,11 +1537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 67 }, "_id": "" }, @@ -1999,100 +1560,10 @@ "fileId": "b4GJN4ZRpIzYQpKL0g1hXM", "instance": null, "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 85 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 720, - "height": 1280 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c0Apg0815FSpo5Nv0dXi2I" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 87 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": false, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 100, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "20N3saNnNERbP8SNI6KMUs" - }, - { - "__type__": "cc.BlockInputEvents", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 89 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "70LpxnB7lHI4GDHRk70zbm" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d0FqR3MNdHHKbJYj7BXmc4", - "instance": null, - "targetOverrides": [] + "nestedPrefabInstanceRoots": [ + { + "__id__": 2 + } + ] } ] \ No newline at end of file diff --git a/assets/resources/gui/element/MSkillBox.prefab.meta b/assets/resources/gui/element/winbox.prefab.meta similarity index 62% rename from assets/resources/gui/element/MSkillBox.prefab.meta rename to assets/resources/gui/element/winbox.prefab.meta index e954ccbc..c70ec1bb 100644 --- a/assets/resources/gui/element/MSkillBox.prefab.meta +++ b/assets/resources/gui/element/winbox.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "053b0528-ec69-4ff8-85d7-99f128440121", + "uuid": "500f0ef4-720a-4f2e-931d-470bf11ce111", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "MSkillBox" + "syncNodeName": "winbox" } } diff --git a/assets/resources/gui/element/winboxbg.prefab b/assets/resources/gui/element/winboxbg.prefab new file mode 100644 index 00000000..9b1ed221 --- /dev/null +++ b/assets/resources/gui/element/winboxbg.prefab @@ -0,0 +1,319 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "winboxbg", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "winboxbg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + }, + { + "__id__": 12 + } + ], + "_prefab": { + "__id__": 14 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 57.432, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "btn_sky", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_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": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700.0000000000006, + "height": 700 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "08WRaUTRtBoLZDLT2cN4Mc" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@a7b3a", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "03RfLB07VFR5uklShb2x26" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": -50.00000000000004, + "_bottom": -50, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 185, + "_originalHeight": 81, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a3cPcPwhJD0b1a42pOaLxy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "70TAIG6KROq7YtmAV7TB6O", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700.0000000000006, + "height": 600 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "efn7IzyGtCJIFV50y3xcMm" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": false, + "__prefab": { + "__id__": 13 + }, + "_alignFlags": 42, + "_target": null, + "_left": 10, + "_right": 10, + "_top": 590, + "_bottom": 300, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fc2EpaVB1BrppLfezSkGbe" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a7x2ngYBBCDZGBGSnpC09G", + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/gui/element/winboxbg.prefab.meta b/assets/resources/gui/element/winboxbg.prefab.meta new file mode 100644 index 00000000..4c09c746 --- /dev/null +++ b/assets/resources/gui/element/winboxbg.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "fa3905e2-e4b8-4b97-8133-f6012983b023", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "winboxbg" + } +} diff --git a/assets/script/game/common/config/GameUIConfig.ts b/assets/script/game/common/config/GameUIConfig.ts index 57c9a578..a13097ef 100644 --- a/assets/script/game/common/config/GameUIConfig.ts +++ b/assets/script/game/common/config/GameUIConfig.ts @@ -23,8 +23,6 @@ export enum UIID { // Heros, // Talents, Mission, - /** 技能卡牌系统核心控制器 */ - SkillBox, } /** 打开界面方式的配置数据 */ @@ -40,6 +38,5 @@ export var UIConfigData: { [key: number]: UIConfig } = { // [UIID.Heros]: { layer: LayerType.UI, prefab: "gui/element/heros" }, // [UIID.Talents]: { layer: LayerType.UI, prefab: "gui/element/talents" }, [UIID.Mission]: { layer: LayerType.UI, prefab: "gui/element/mission" }, - [UIID.SkillBox]: { layer: LayerType.UI, prefab: "gui/element/skillbox" }, } \ No newline at end of file diff --git a/assets/script/game/map/CardLiteComp.ts b/assets/script/game/map/CardLiteComp.ts index 4d8ac6a5..9326c998 100644 --- a/assets/script/game/map/CardLiteComp.ts +++ b/assets/script/game/map/CardLiteComp.ts @@ -8,7 +8,7 @@ * 3. 点击卡牌时通过事件通知父组件（HerosListComp）切换选中英雄详情。 * * 关键设计： - * - 轻量版 CardComp，仅用于英雄展示，无拖拽使用、无锁定、无费用扣除等交互。 + * - 轻量展示组件，仅用于英雄展示，无拖拽使用、无锁定、无费用扣除等交互。 * - 英雄卡图标加载 idle 动画剪辑并提取首帧静态展示。 * - 通过 iconVisualToken 防止异步加载竞态。 * diff --git a/assets/script/game/map/MSkillBoxComp.ts b/assets/script/game/map/MSkillBoxComp.ts deleted file mode 100644 index 4ac768b3..00000000 --- a/assets/script/game/map/MSkillBoxComp.ts +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @file MSkillBoxComp.ts - * @description 技能卡牌选择器 - * - * 职责： - - * - * 关键设计： - - * - * 依赖： - - */ -import { mLogger } from "../common/Logger"; -import { _decorator, instantiate, Label, Node, NodeEventType, Prefab, SpriteAtlas, Tween, tween, Vec3, Widget } from "cc"; -import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; -import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; - -const { ccclass, property } = _decorator; - - -/** - * MSkillBoxComp —— 技能卡牌系统核心控制器 - * - * 管理 3 个卡牌槽位的抽卡分发、卡池升级、金币费用、 - * 在 1,5,10,15,20 回合弹出技能卡牌三选一 - */ -@ccclass('MSkillBoxComp') -@ecs.register('MissionCard', false) -export class MSkillBoxComp extends CCComp { - /** 是否启用调试日志 */ - private debugMode: boolean = false; - - // ======================== 编辑器绑定节点 ======================== - - /** 卡牌槽位 1 节点 */ - @property(Node) - card1: Node = null! - /** 卡牌槽位 2 节点 */ - @property(Node) - card2: Node = null! - /** 卡牌槽位 3 节点 */ - @property(Node) - card3: Node = null! - /** 刷新按钮 */ - @property(Node) - refreshBtn: Node = null! - /** 看广告刷新按钮 */ - @property(Node) - adRefreshBtn: Node = null! - - - /** - * 组件加载： - */ - onLoad() { - - } - onAdded(args: any) { - - } - onDestroy() { - - } - - init() { - } - - - - update(dt: number) { - } - - - private bindEvents() { - - } - - - reset() { - - } -} diff --git a/assets/script/game/map/MSkillBoxComp.ts.meta b/assets/script/game/map/MSkillBoxComp.ts.meta deleted file mode 100644 index 88ae9795..00000000 --- a/assets/script/game/map/MSkillBoxComp.ts.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "4.0.24", - "importer": "typescript", - "imported": true, - "uuid": "85b247fa-1f22-411a-b3a6-82e9797512e1", - "files": [], - "subMetas": {}, - "userData": {} -}