From c054209025e0c85d8bef9217f7f8a3035b77e231 Mon Sep 17 00:00:00 2001 From: walkpan Date: Sun, 5 Apr 2026 22:49:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BA=E5=8F=AC=E5=94=A4=E5=92=8C?= =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E8=A7=A6=E5=8F=91=E6=8A=80=E8=83=BD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 Hero、Monster 和 HeroAtkSystem 中分发技能触发事件时，增加 triggerType 参数以区分召唤和死亡 - 修改 SCastSystem 的 forceCastTriggerSkill 方法，根据 triggerType 播放对应的准备动画（黄色表示召唤，死亡动画表示死亡） - 调整 hnode.prefab 中按钮的布局和样式，移除特定精灵帧以使用默认样式 --- assets/resources/game/gui/Btn.prefab | 460 ----- assets/resources/game/gui/Btn.prefab.meta | 13 - assets/resources/game/heros/ha1.prefab | 156 +- .../game/skill/anm/ready/yellow.anim | 12 +- assets/resources/game/skill/ready/dead.prefab | 6 +- .../resources/game/skill/ready/yellow.prefab | 10 +- assets/resources/gui/element/btn_start.prefab | 543 ------ .../gui/element/btn_start.prefab.meta | 13 - assets/resources/gui/element/card.prefab | 1637 ++++------------- assets/resources/gui/element/hnode.prefab | 36 +- assets/resources/gui/role_controller.prefab | 7 +- assets/script/game/hero/Hero.ts | 3 +- assets/script/game/hero/HeroAtkSystem.ts | 3 +- assets/script/game/hero/HeroViewComp.ts | 18 +- assets/script/game/hero/Mon.ts | 3 +- assets/script/game/hero/SCastSystem.ts | 13 +- 16 files changed, 484 insertions(+), 2449 deletions(-) delete mode 100644 assets/resources/game/gui/Btn.prefab delete mode 100644 assets/resources/game/gui/Btn.prefab.meta delete mode 100644 assets/resources/gui/element/btn_start.prefab delete mode 100644 assets/resources/gui/element/btn_start.prefab.meta diff --git a/assets/resources/game/gui/Btn.prefab b/assets/resources/game/gui/Btn.prefab deleted file mode 100644 index 660b588b..00000000 --- a/assets/resources/game/gui/Btn.prefab +++ /dev/null @@ -1,460 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "Btn", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "Btn", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - }, - { - "__id__": 8 - } - ], - "_active": true, - "_components": [ - { - "__id__": 14 - }, - { - "__id__": 16 - } - ], - "_prefab": { - "__id__": 18 - }, - "_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.Node", - "_name": "btn_large_orange", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - } - ], - "_prefab": { - "__id__": 7 - }, - "_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.5, - "y": 0.4, - "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": 216, - "height": 106 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "32K2Dv7GFLo5C3I93vwlA4" - }, - { - "__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__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@3c9ae", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "84UBHGdD5K5pwHH/xHPJdv" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "12pgh5YidIzJQokhOGrMYU", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 9 - }, - { - "__id__": 11 - } - ], - "_prefab": { - "__id__": 13 - }, - "_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__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 10 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 49.576171875, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "84Ag0s0BpJpJkHkk/orDmF" - }, - { - "__type__": "cc.Label", - "_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 - }, - "_string": "label", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1evOHf4QlOqr4vCOCj1QKc" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "143Ez+pCBDuKgbef19Aeln", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "50yJWRtc1Nl6Swd/YuEIj6" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "clickEvents": [], - "_interactable": true, - "_transition": 0, - "_normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_normalSprite": null, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 1.2, - "_target": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e2bGXJ18VGC61P18szeioK" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/game/gui/Btn.prefab.meta b/assets/resources/game/gui/Btn.prefab.meta deleted file mode 100644 index f5f79222..00000000 --- a/assets/resources/game/gui/Btn.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "15cb03dd-c2be-47d4-a30f-aef7745f5ceb", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "Btn" - } -} diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index 7f133f14..6a9c9904 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -26,34 +26,31 @@ }, { "__id__": 26 - }, - { - "__id__": 37 } ], "_active": true, "_components": [ + { + "__id__": 37 + }, + { + "__id__": 39 + }, + { + "__id__": 41 + }, + { + "__id__": 43 + }, { "__id__": 45 }, { "__id__": 47 - }, - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 49 }, "_lpos": { "__type__": "cc.Vec3", @@ -634,118 +631,6 @@ "z": 1 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 38 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 37 - }, - "asset": { - "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", - "__expectedType__": "cc.Prefab" - }, - "fileId": "54R/aYBglLI4Jn5pm++Jx8", - "instance": { - "__id__": 39 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "83JAqLl/ZNzJIv+L012Q2q", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 40 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - }, - { - "__id__": 44 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_name" - ], - "value": "plus" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "54R/aYBglLI4Jn5pm++Jx8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, { "__type__": "cc.UITransform", "_name": "", @@ -756,7 +641,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 38 }, "_contentSize": { "__type__": "cc.Size", @@ -784,7 +669,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 40 }, "anm": { "__id__": 5 @@ -805,7 +690,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 42 }, "debugMode": false, "_id": "" @@ -824,7 +709,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 44 }, "enabledContactListener": true, "bullet": false, @@ -858,7 +743,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 46 }, "tag": 0, "_group": 4, @@ -892,7 +777,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 48 }, "playOnLoad": false, "_clips": [], @@ -915,9 +800,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 37 - }, { "__id__": 26 }, diff --git a/assets/resources/game/skill/anm/ready/yellow.anim b/assets/resources/game/skill/anm/ready/yellow.anim index 0b8b4f3c..de036151 100644 --- a/assets/resources/game/skill/anm/ready/yellow.anim +++ b/assets/resources/game/skill/anm/ready/yellow.anim @@ -7,11 +7,11 @@ "embeddedPlayerGroups": [] }, "_native": "", - "sample": 30, + "sample": 12, "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.16666666666666666, + "_duration": 0.4166666666666667, "_hash": 500763545, "_tracks": [ { @@ -69,10 +69,10 @@ "__type__": "cc.ObjectCurve", "_times": [ 0, - 0.03333333333333333, - 0.06666666666666667, - 0.1, - 0.13333333333333333 + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333 ], "_values": [ { diff --git a/assets/resources/game/skill/ready/dead.prefab b/assets/resources/game/skill/ready/dead.prefab index dfaad0f9..09664ac8 100644 --- a/assets/resources/game/skill/ready/dead.prefab +++ b/assets/resources/game/skill/ready/dead.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -35.811, + "y": -60, "z": 0 }, "_lrot": { @@ -99,8 +99,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/skill/ready/yellow.prefab b/assets/resources/game/skill/ready/yellow.prefab index 72d3cc04..3a216b35 100644 --- a/assets/resources/game/skill/ready/yellow.prefab +++ b/assets/resources/game/skill/ready/yellow.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -35.811, + "y": -60, "z": 0 }, "_lrot": { @@ -99,8 +99,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -159,7 +159,7 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 173, + "g": 255, "b": 0, "a": 255 }, @@ -178,7 +178,7 @@ "_fillStart": 0.2, "_fillRange": 1, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": { "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23", "__expectedType__": "cc.SpriteAtlas" diff --git a/assets/resources/gui/element/btn_start.prefab b/assets/resources/gui/element/btn_start.prefab deleted file mode 100644 index 9c385698..00000000 --- a/assets/resources/gui/element/btn_start.prefab +++ /dev/null @@ -1,543 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "btn_start", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "btn_start", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - }, - { - "__id__": 10 - } - ], - "_active": true, - "_components": [ - { - "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 - } - ], - "_prefab": { - "__id__": 22 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -565.033, - "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": "bg", - "_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": 200, - "height": 102 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "06atudk+BHR4nPzR3SmW4Z" - }, - { - "__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__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@ac343", - "__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__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "87x48JBkdLQ7whX1NTSH9o" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__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": 16, - "_originalHeight": 16, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d0LIiKWbRKu7mXFOw4d4nr" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "ccco1Tc0VOs40o2w+SsIiD", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 11 - }, - { - "__id__": 13 - } - ], - "_prefab": { - "__id__": 15 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 6, - "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__": 10 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 106.2265625, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "5fpQkh4FtN5aKXEKIsm8v/" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 10 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 238, - "g": 238, - "b": 238, - "a": 255 - }, - "_string": "开 始", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "14OjteCA5OkLMHKjcyDL86" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "dbtgiz4jZOgLAnCODHuANp", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 200, - "height": 102 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b6/HPesdpG8ZsWB4vg6xf2" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 19 - }, - "clickEvents": [], - "_interactable": true, - "_transition": 3, - "_normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_normalSprite": null, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 0.8, - "_target": { - "__id__": 1 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f5MsfCkARGFblbm0HvivL/" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "_alignFlags": 4, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 23.967, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "cbVDBK6OZPyqODAzd8DeXP" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "24rlgXRJ9AHLGpMW+aYyEx", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/gui/element/btn_start.prefab.meta b/assets/resources/gui/element/btn_start.prefab.meta deleted file mode 100644 index d388a1ca..00000000 --- a/assets/resources/gui/element/btn_start.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "btn_start" - } -} diff --git a/assets/resources/gui/element/card.prefab b/assets/resources/gui/element/card.prefab index 215dfdd0..f5a316be 100644 --- a/assets/resources/gui/element/card.prefab +++ b/assets/resources/gui/element/card.prefab @@ -40,41 +40,32 @@ "__id__": 108 }, { - "__id__": 120 + "__id__": 162 }, { - "__id__": 126 - }, - { - "__id__": 180 + "__id__": 232 }, { "__id__": 250 }, { - "__id__": 268 + "__id__": 272 }, { - "__id__": 290 - }, - { - "__id__": 352 - }, - { - "__id__": 367 + "__id__": 334 } ], "_active": true, "_components": [ { - "__id__": 395 + "__id__": 362 }, { - "__id__": 397 + "__id__": 364 } ], "_prefab": { - "__id__": 399 + "__id__": 366 }, "_lpos": { "__type__": "cc.Vec3", @@ -2472,7 +2463,7 @@ }, { "__type__": "cc.Node", - "_name": "lock", + "_name": "NF", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2481,24 +2472,39 @@ "_children": [ { "__id__": 109 - } - ], - "_active": false, - "_components": [ - { - "__id__": 115 }, { "__id__": 117 + }, + { + "__id__": 125 + }, + { + "__id__": 133 + }, + { + "__id__": 141 + }, + { + "__id__": 149 + } + ], + "_active": true, + "_components": [ + { + "__id__": 157 + }, + { + "__id__": 159 } ], "_prefab": { - "__id__": 119 + "__id__": 161 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -136.25, + "y": 0, "z": 0 }, "_lrot": { @@ -2510,8 +2516,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.6, - "y": 0.5, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -2526,24 +2532,27 @@ }, { "__type__": "cc.Node", - "_name": "Label", + "_name": "base", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 108 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 110 }, { "__id__": 112 + }, + { + "__id__": 114 } ], "_prefab": { - "__id__": 114 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -2586,465 +2595,6 @@ "__prefab": { "__id__": 111 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 54, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a9X6GIaERI46NwY71Ss5T0" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 109 - }, - "_enabled": true, - "__prefab": { - "__id__": 113 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "锁定", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 25, - "_fontSize": 25, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "96ekMnN+hK0reixHG7jXQQ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "7dGLlGLHxGzaLmbBqJlFCa", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 108 - }, - "_enabled": true, - "__prefab": { - "__id__": 116 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 120, - "height": 60 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6asm8orhZHkZ0qMZvGj56l" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 108 - }, - "_enabled": true, - "__prefab": { - "__id__": 118 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@15f3b", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6dw3NkpnJD1I6NIYHNYv6S" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f7mLir9m9HWZSE/eeEZX6p", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "unlock", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 121 - }, - { - "__id__": 123 - } - ], - "_prefab": { - "__id__": 125 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -136.25, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.6, - "y": 0.5, - "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__": 120 - }, - "_enabled": true, - "__prefab": { - "__id__": 122 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 71, - "height": 93 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "27e4xvL1xFE5W3UEjN+P2U" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 120 - }, - "_enabled": true, - "__prefab": { - "__id__": 124 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@cebb2", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a2AJSrmfZIGIP3eBo5ENul" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c6hfaCqT5C67MK1fH43cAk", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "NF", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 127 - }, - { - "__id__": 135 - }, - { - "__id__": 143 - }, - { - "__id__": 151 - }, - { - "__id__": 159 - }, - { - "__id__": 167 - } - ], - "_active": true, - "_components": [ - { - "__id__": 175 - }, - { - "__id__": 177 - } - ], - "_prefab": { - "__id__": 179 - }, - "_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.Node", - "_name": "base", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 126 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 128 - }, - { - "__id__": 130 - }, - { - "__id__": 132 - } - ], - "_prefab": { - "__id__": 134 - }, - "_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__": 127 - }, - "_enabled": true, - "__prefab": { - "__id__": 129 - }, "_contentSize": { "__type__": "cc.Size", "width": 170, @@ -3067,11 +2617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 113 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3115,11 +2665,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 115 }, "_alignFlags": 45, "_target": null, @@ -3164,23 +2714,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 108 }, "_children": [], "_active": true, "_components": [ { - "__id__": 136 + "__id__": 118 }, { - "__id__": 138 + "__id__": 120 }, { - "__id__": 140 + "__id__": 122 } ], "_prefab": { - "__id__": 142 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -3217,11 +2767,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -3245,11 +2795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 121 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3293,11 +2843,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 123 }, "_alignFlags": 45, "_target": null, @@ -3342,23 +2892,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 108 }, "_children": [], "_active": false, "_components": [ { - "__id__": 144 + "__id__": 126 }, { - "__id__": 146 + "__id__": 128 }, { - "__id__": 148 + "__id__": 130 } ], "_prefab": { - "__id__": 150 + "__id__": 132 }, "_lpos": { "__type__": "cc.Vec3", @@ -3395,11 +2945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 127 }, "_contentSize": { "__type__": "cc.Size", @@ -3423,11 +2973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 129 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3471,11 +3021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 131 }, "_alignFlags": 45, "_target": null, @@ -3520,23 +3070,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 108 }, "_children": [], "_active": false, "_components": [ { - "__id__": 152 + "__id__": 134 }, { - "__id__": 154 + "__id__": 136 }, { - "__id__": 156 + "__id__": 138 } ], "_prefab": { - "__id__": 158 + "__id__": 140 }, "_lpos": { "__type__": "cc.Vec3", @@ -3573,11 +3123,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 135 }, "_contentSize": { "__type__": "cc.Size", @@ -3601,11 +3151,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3649,11 +3199,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 139 }, "_alignFlags": 45, "_target": null, @@ -3698,23 +3248,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 108 }, "_children": [], "_active": false, "_components": [ { - "__id__": 160 + "__id__": 142 }, { - "__id__": 162 + "__id__": 144 }, { - "__id__": 164 + "__id__": 146 } ], "_prefab": { - "__id__": 166 + "__id__": 148 }, "_lpos": { "__type__": "cc.Vec3", @@ -3751,11 +3301,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 143 }, "_contentSize": { "__type__": "cc.Size", @@ -3779,11 +3329,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 145 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3827,11 +3377,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 147 }, "_alignFlags": 45, "_target": null, @@ -3876,23 +3426,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 108 }, "_children": [], "_active": false, "_components": [ { - "__id__": 168 + "__id__": 150 }, { - "__id__": 170 + "__id__": 152 }, { - "__id__": 172 + "__id__": 154 } ], "_prefab": { - "__id__": 174 + "__id__": 156 }, "_lpos": { "__type__": "cc.Vec3", @@ -3929,11 +3479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 149 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 151 }, "_contentSize": { "__type__": "cc.Size", @@ -3957,11 +3507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 149 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 153 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4005,11 +3555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 149 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 155 }, "_alignFlags": 45, "_target": null, @@ -4054,11 +3604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 158 }, "_contentSize": { "__type__": "cc.Size", @@ -4082,11 +3632,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 160 }, "_alignFlags": 45, "_target": null, @@ -4135,41 +3685,41 @@ }, "_children": [ { - "__id__": 181 + "__id__": 163 }, { - "__id__": 189 + "__id__": 171 }, { - "__id__": 197 + "__id__": 179 }, { - "__id__": 205 + "__id__": 187 }, { - "__id__": 213 + "__id__": 195 }, { - "__id__": 221 + "__id__": 203 }, { - "__id__": 229 + "__id__": 211 }, { - "__id__": 237 + "__id__": 219 } ], "_active": true, "_components": [ { - "__id__": 245 + "__id__": 227 }, { - "__id__": 247 + "__id__": 229 } ], "_prefab": { - "__id__": 249 + "__id__": 231 }, "_lpos": { "__type__": "cc.Vec3", @@ -4206,23 +3756,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 162 }, "_children": [], "_active": false, "_components": [ { - "__id__": 182 + "__id__": 164 }, { - "__id__": 184 + "__id__": 166 }, { - "__id__": 186 + "__id__": 168 } ], "_prefab": { - "__id__": 188 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -4259,11 +3809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 165 }, "_contentSize": { "__type__": "cc.Size", @@ -4287,11 +3837,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 167 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4335,11 +3885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 169 }, "_alignFlags": 45, "_target": null, @@ -4384,23 +3934,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 162 }, "_children": [], "_active": true, "_components": [ { - "__id__": 190 + "__id__": 172 }, { - "__id__": 192 + "__id__": 174 }, { - "__id__": 194 + "__id__": 176 } ], "_prefab": { - "__id__": 196 + "__id__": 178 }, "_lpos": { "__type__": "cc.Vec3", @@ -4437,11 +3987,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", @@ -4465,11 +4015,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 175 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4513,11 +4063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 177 }, "_alignFlags": 45, "_target": null, @@ -4562,23 +4112,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 162 }, "_children": [], "_active": false, "_components": [ { - "__id__": 198 + "__id__": 180 }, { - "__id__": 200 + "__id__": 182 }, { - "__id__": 202 + "__id__": 184 } ], "_prefab": { - "__id__": 204 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -4615,11 +4165,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 181 }, "_contentSize": { "__type__": "cc.Size", @@ -4643,11 +4193,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 183 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4691,11 +4241,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 185 }, "_alignFlags": 45, "_target": null, @@ -4740,23 +4290,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 162 }, "_children": [], "_active": false, "_components": [ { - "__id__": 206 + "__id__": 188 }, { - "__id__": 208 + "__id__": 190 }, { - "__id__": 210 + "__id__": 192 } ], "_prefab": { - "__id__": 212 + "__id__": 194 }, "_lpos": { "__type__": "cc.Vec3", @@ -4793,11 +4343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -4821,11 +4371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4869,11 +4419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 193 }, "_alignFlags": 45, "_target": null, @@ -4918,23 +4468,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 162 }, "_children": [], "_active": false, "_components": [ { - "__id__": 214 + "__id__": 196 }, { - "__id__": 216 + "__id__": 198 }, { - "__id__": 218 + "__id__": 200 } ], "_prefab": { - "__id__": 220 + "__id__": 202 }, "_lpos": { "__type__": "cc.Vec3", @@ -4971,11 +4521,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -4999,11 +4549,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5047,11 +4597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 201 }, "_alignFlags": 45, "_target": null, @@ -5096,23 +4646,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 162 }, "_children": [], "_active": false, "_components": [ { - "__id__": 222 + "__id__": 204 }, { - "__id__": 224 + "__id__": 206 }, { - "__id__": 226 + "__id__": 208 } ], "_prefab": { - "__id__": 228 + "__id__": 210 }, "_lpos": { "__type__": "cc.Vec3", @@ -5149,11 +4699,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 203 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 205 }, "_contentSize": { "__type__": "cc.Size", @@ -5177,11 +4727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 203 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 207 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5225,11 +4775,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 203 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 209 }, "_alignFlags": 45, "_target": null, @@ -5274,23 +4824,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 180 + "__id__": 162 }, "_children": [], "_active": false, "_components": [ { - "__id__": 230 + "__id__": 212 }, { - "__id__": 232 + "__id__": 214 }, { - "__id__": 234 + "__id__": 216 } ], "_prefab": { - "__id__": 236 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -5327,11 +4877,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -5355,11 +4905,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5400,11 +4950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 217 }, "_alignFlags": 44, "_target": null, @@ -5447,17 +4997,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 180 + "__id__": 162 }, "_prefab": { - "__id__": 238 + "__id__": 220 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 237 + "__id__": 219 }, "asset": { "__uuid__": "5aae4a6d-b697-4c4b-86d3-8ea91be92be6", @@ -5465,7 +5015,7 @@ }, "fileId": "7347RlFLBEdJZ/A06wfR5f", "instance": { - "__id__": 239 + "__id__": 221 }, "targetOverrides": null }, @@ -5479,16 +5029,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 240 + "__id__": 222 }, { - "__id__": 242 + "__id__": 224 }, { - "__id__": 243 + "__id__": 225 }, { - "__id__": 244 + "__id__": 226 } ], "removedComponents": [] @@ -5496,7 +5046,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 223 }, "propertyPath": [ "_name" @@ -5512,7 +5062,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 223 }, "propertyPath": [ "_lpos" @@ -5527,7 +5077,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 223 }, "propertyPath": [ "_lrot" @@ -5543,7 +5093,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 223 }, "propertyPath": [ "_euler" @@ -5561,11 +5111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 162 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", @@ -5589,11 +5139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 162 }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 230 }, "_alignFlags": 45, "_target": null, @@ -5642,23 +5192,23 @@ }, "_children": [ { - "__id__": 251 + "__id__": 233 }, { - "__id__": 257 + "__id__": 239 } ], "_active": true, "_components": [ { - "__id__": 263 + "__id__": 245 }, { - "__id__": 265 + "__id__": 247 } ], "_prefab": { - "__id__": 267 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -5695,20 +5245,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 250 + "__id__": 232 }, "_children": [], "_active": true, "_components": [ { - "__id__": 252 + "__id__": 234 }, { - "__id__": 254 + "__id__": 236 } ], "_prefab": { - "__id__": 256 + "__id__": 238 }, "_lpos": { "__type__": "cc.Vec3", @@ -5745,11 +5295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", @@ -5773,11 +5323,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 237 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5834,20 +5384,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 250 + "__id__": 232 }, "_children": [], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 240 }, { - "__id__": 260 + "__id__": 242 } ], "_prefab": { - "__id__": 262 + "__id__": 244 }, "_lpos": { "__type__": "cc.Vec3", @@ -5884,11 +5434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 241 }, "_contentSize": { "__type__": "cc.Size", @@ -5912,11 +5462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 243 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5993,11 +5543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -6021,11 +5571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6080,23 +5630,23 @@ }, "_children": [ { - "__id__": 269 + "__id__": 251 }, { - "__id__": 277 + "__id__": 259 } ], "_active": true, "_components": [ { - "__id__": 285 + "__id__": 267 }, { - "__id__": 287 + "__id__": 269 } ], "_prefab": { - "__id__": 289 + "__id__": 271 }, "_lpos": { "__type__": "cc.Vec3", @@ -6133,23 +5683,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 250 }, "_children": [], "_active": true, "_components": [ { - "__id__": 270 + "__id__": 252 }, { - "__id__": 272 + "__id__": 254 }, { - "__id__": 274 + "__id__": 256 } ], "_prefab": { - "__id__": 276 + "__id__": 258 }, "_lpos": { "__type__": "cc.Vec3", @@ -6186,11 +5736,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -6214,11 +5764,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6259,11 +5809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 257 }, "_alignFlags": 45, "_target": null, @@ -6308,23 +5858,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 250 }, "_children": [], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 260 }, { - "__id__": 280 + "__id__": 262 }, { - "__id__": 282 + "__id__": 264 } ], "_prefab": { - "__id__": 284 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -6361,11 +5911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 261 }, "_contentSize": { "__type__": "cc.Size", @@ -6389,11 +5939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 263 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6457,11 +6007,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 265 }, "_alignFlags": 45, "_target": null, @@ -6506,11 +6056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", @@ -6534,11 +6084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 270 }, "_alignFlags": 44, "_target": null, @@ -6587,23 +6137,23 @@ }, "_children": [ { - "__id__": 291 + "__id__": 273 }, { - "__id__": 319 + "__id__": 301 } ], "_active": true, "_components": [ { - "__id__": 347 + "__id__": 329 }, { - "__id__": 349 + "__id__": 331 } ], "_prefab": { - "__id__": 351 + "__id__": 333 }, "_lpos": { "__type__": "cc.Vec3", @@ -6640,33 +6190,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 272 }, "_children": [ { - "__id__": 292 + "__id__": 274 }, { - "__id__": 300 + "__id__": 282 }, { - "__id__": 306 + "__id__": 288 } ], "_active": true, "_components": [ { - "__id__": 312 + "__id__": 294 }, { - "__id__": 314 + "__id__": 296 }, { - "__id__": 316 + "__id__": 298 } ], "_prefab": { - "__id__": 318 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -6703,23 +6253,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 291 + "__id__": 273 }, "_children": [], "_active": true, "_components": [ { - "__id__": 293 + "__id__": 275 }, { - "__id__": 295 + "__id__": 277 }, { - "__id__": 297 + "__id__": 279 } ], "_prefab": { - "__id__": 299 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -6756,11 +6306,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 292 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 276 }, "_contentSize": { "__type__": "cc.Size", @@ -6784,11 +6334,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 292 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 278 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6829,11 +6379,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 292 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 280 }, "_alignFlags": 45, "_target": null, @@ -6878,20 +6428,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 291 + "__id__": 273 }, "_children": [], "_active": true, "_components": [ { - "__id__": 301 + "__id__": 283 }, { - "__id__": 303 + "__id__": 285 } ], "_prefab": { - "__id__": 305 + "__id__": 287 }, "_lpos": { "__type__": "cc.Vec3", @@ -6928,11 +6478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 300 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", @@ -6956,11 +6506,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 300 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 286 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7014,20 +6564,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 291 + "__id__": 273 }, "_children": [], "_active": true, "_components": [ { - "__id__": 307 + "__id__": 289 }, { - "__id__": 309 + "__id__": 291 } ], "_prefab": { - "__id__": 311 + "__id__": 293 }, "_lpos": { "__type__": "cc.Vec3", @@ -7064,11 +6614,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 290 }, "_contentSize": { "__type__": "cc.Size", @@ -7092,11 +6642,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 292 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7173,11 +6723,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 295 }, "_contentSize": { "__type__": "cc.Size", @@ -7201,11 +6751,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 273 }, "_enabled": false, "__prefab": { - "__id__": 315 + "__id__": 297 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7246,11 +6796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 299 }, "_alignFlags": 12, "_target": null, @@ -7295,33 +6845,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 272 }, "_children": [ { - "__id__": 320 + "__id__": 302 }, { - "__id__": 328 + "__id__": 310 }, { - "__id__": 334 + "__id__": 316 } ], "_active": true, "_components": [ { - "__id__": 340 + "__id__": 322 }, { - "__id__": 342 + "__id__": 324 }, { - "__id__": 344 + "__id__": 326 } ], "_prefab": { - "__id__": 346 + "__id__": 328 }, "_lpos": { "__type__": "cc.Vec3", @@ -7358,23 +6908,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 319 + "__id__": 301 }, "_children": [], "_active": true, "_components": [ { - "__id__": 321 + "__id__": 303 }, { - "__id__": 323 + "__id__": 305 }, { - "__id__": 325 + "__id__": 307 } ], "_prefab": { - "__id__": 327 + "__id__": 309 }, "_lpos": { "__type__": "cc.Vec3", @@ -7411,11 +6961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 304 }, "_contentSize": { "__type__": "cc.Size", @@ -7439,11 +6989,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 306 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7484,11 +7034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 308 }, "_alignFlags": 45, "_target": null, @@ -7533,20 +7083,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 319 + "__id__": 301 }, "_children": [], "_active": true, "_components": [ { - "__id__": 329 + "__id__": 311 }, { - "__id__": 331 + "__id__": 313 } ], "_prefab": { - "__id__": 333 + "__id__": 315 }, "_lpos": { "__type__": "cc.Vec3", @@ -7583,11 +7133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 310 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 312 }, "_contentSize": { "__type__": "cc.Size", @@ -7611,11 +7161,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 310 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 314 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7669,20 +7219,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 319 + "__id__": 301 }, "_children": [], "_active": true, "_components": [ { - "__id__": 335 + "__id__": 317 }, { - "__id__": 337 + "__id__": 319 } ], "_prefab": { - "__id__": 339 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -7719,11 +7269,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 318 }, "_contentSize": { "__type__": "cc.Size", @@ -7747,11 +7297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 320 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7828,11 +7378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -7856,11 +7406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 301 }, "_enabled": false, "__prefab": { - "__id__": 343 + "__id__": 325 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7901,11 +7451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 327 }, "_alignFlags": 12, "_target": null, @@ -7950,11 +7500,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 330 }, "_contentSize": { "__type__": "cc.Size", @@ -7978,11 +7528,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 332 }, "_alignFlags": 44, "_target": null, @@ -8021,381 +7571,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "use", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 353 - } - ], - "_active": false, - "_components": [ - { - "__id__": 359 - }, - { - "__id__": 361 - }, - { - "__id__": 363 - } - ], - "_prefab": { - "__id__": 366 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -140.805, - "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__": 352 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 354 - }, - { - "__id__": 356 - } - ], - "_prefab": { - "__id__": 358 - }, - "_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__": 353 - }, - "_enabled": true, - "__prefab": { - "__id__": 355 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 60.94580078125, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "eeZuu04rJFzoa4hbflZ24S" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 353 - }, - "_enabled": true, - "__prefab": { - "__id__": 357 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "召 唤", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 25, - "_fontSize": 25, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "20iOHSh+RE9I1iLzeZ3LBi" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "0bHU/Up11A8YP6z6eGMtQU", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 352 - }, - "_enabled": true, - "__prefab": { - "__id__": 360 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 160, - "height": 45 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "106cH+DGZAxooglHMvE045" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 352 - }, - "_enabled": true, - "__prefab": { - "__id__": 362 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@15f3b", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "81ukyY51tDrL2JwfvnGb6H" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 352 - }, - "_enabled": true, - "__prefab": { - "__id__": 364 - }, - "clickEvents": [ - { - "__id__": 365 - } - ], - "_interactable": true, - "_transition": 3, - "_normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_normalSprite": null, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 1.2, - "_target": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d5rlKxmj5A4Jw0V9vPZk0N" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, - "component": "", - "_componentId": "c4842RlEXFBsYWrZpIuY9c0", - "handler": "useCard", - "customEventData": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "ebG3ulmyZGU7zACc3IXmag", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "CKind", @@ -8406,26 +7581,26 @@ }, "_children": [ { - "__id__": 368 + "__id__": 335 }, { - "__id__": 374 + "__id__": 341 }, { - "__id__": 380 + "__id__": 347 }, { - "__id__": 386 + "__id__": 353 } ], "_active": true, "_components": [ { - "__id__": 392 + "__id__": 359 } ], "_prefab": { - "__id__": 394 + "__id__": 361 }, "_lpos": { "__type__": "cc.Vec3", @@ -8462,20 +7637,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 367 + "__id__": 334 }, "_children": [], "_active": true, "_components": [ { - "__id__": 369 + "__id__": 336 }, { - "__id__": 371 + "__id__": 338 } ], "_prefab": { - "__id__": 373 + "__id__": 340 }, "_lpos": { "__type__": "cc.Vec3", @@ -8512,11 +7687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", @@ -8540,11 +7715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 339 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8598,20 +7773,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 367 + "__id__": 334 }, "_children": [], "_active": true, "_components": [ { - "__id__": 375 + "__id__": 342 }, { - "__id__": 377 + "__id__": 344 } ], "_prefab": { - "__id__": 379 + "__id__": 346 }, "_lpos": { "__type__": "cc.Vec3", @@ -8648,11 +7823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 343 }, "_contentSize": { "__type__": "cc.Size", @@ -8676,11 +7851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 345 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8737,20 +7912,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 367 + "__id__": 334 }, "_children": [], "_active": true, "_components": [ { - "__id__": 381 + "__id__": 348 }, { - "__id__": 383 + "__id__": 350 } ], "_prefab": { - "__id__": 385 + "__id__": 352 }, "_lpos": { "__type__": "cc.Vec3", @@ -8787,11 +7962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 349 }, "_contentSize": { "__type__": "cc.Size", @@ -8815,11 +7990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 351 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8876,20 +8051,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 367 + "__id__": 334 }, "_children": [], "_active": true, "_components": [ { - "__id__": 387 + "__id__": 354 }, { - "__id__": 389 + "__id__": 356 } ], "_prefab": { - "__id__": 391 + "__id__": 358 }, "_lpos": { "__type__": "cc.Vec3", @@ -8926,11 +8101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 355 }, "_contentSize": { "__type__": "cc.Size", @@ -8954,11 +8129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 357 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9015,11 +8190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 367 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 360 }, "_contentSize": { "__type__": "cc.Size", @@ -9060,7 +8235,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 363 }, "_contentSize": { "__type__": "cc.Size", @@ -9088,19 +8263,15 @@ }, "_enabled": true, "__prefab": { - "__id__": 398 - }, - "Lock": { - "__id__": 108 - }, - "unLock": { - "__id__": 120 + "__id__": 365 }, + "Lock": null, + "unLock": null, "info_node": { - "__id__": 290 + "__id__": 272 }, "oinfo_node": { - "__id__": 268 + "__id__": 250 }, "name_node": { "__id__": 102 @@ -9109,19 +8280,19 @@ "__id__": 71 }, "cost_node": { - "__id__": 257 + "__id__": 239 }, "Ckind_node": { - "__id__": 367 + "__id__": 334 }, "BG_node": { "__id__": 10 }, "NF_node": { - "__id__": 126 + "__id__": 108 }, "HF_node": { - "__id__": 180 + "__id__": 162 }, "_id": "" }, @@ -9142,7 +8313,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 237 + "__id__": 219 } ] } diff --git a/assets/resources/gui/element/hnode.prefab b/assets/resources/gui/element/hnode.prefab index 1a878232..9c620cd8 100644 --- a/assets/resources/gui/element/hnode.prefab +++ b/assets/resources/gui/element/hnode.prefab @@ -4550,7 +4550,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 55, - "y": -95.647, + "y": -90, "z": 0 }, "_lrot": { @@ -4749,7 +4749,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 110, + "width": 104, "height": 40 }, "_anchorPoint": { @@ -4786,7 +4786,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7645f", + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@4a554", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -4858,22 +4858,10 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7645f", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, "_target": { @@ -4907,12 +4895,12 @@ "__prefab": { "__id__": 212 }, - "_alignFlags": 8, + "_alignFlags": 44, "_target": null, - "_left": 0, - "_right": 0, + "_left": 3, + "_right": 3, "_top": 0, - "_bottom": 0, + "_bottom": -35, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -4921,7 +4909,7 @@ "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, - "_originalWidth": 0, + "_originalWidth": 110, "_originalHeight": 0, "_alignMode": 2, "_lockFlags": 0, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 381101aa..ca357f6a 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -607,7 +607,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@15f3b", + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@8e2b9", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -622,7 +622,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": true, - "_atlas": null, + "_atlas": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 435e8850..51969b8f 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -148,7 +148,8 @@ export class Hero extends ecs.Entity { oops.message.dispatchEvent(GameEvent.TriggerSkill, { s_uuid: hero.call, heroAttrs: model, - heroView: hv + heroView: hv, + triggerType: 'call' }); } diff --git a/assets/script/game/hero/HeroAtkSystem.ts b/assets/script/game/hero/HeroAtkSystem.ts index 0f86a629..88ce26f5 100644 --- a/assets/script/game/hero/HeroAtkSystem.ts +++ b/assets/script/game/hero/HeroAtkSystem.ts @@ -261,7 +261,8 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd oops.message.dispatchEvent(GameEvent.TriggerSkill, { s_uuid: heroInfo.dead, heroAttrs: TAttrsComp, - heroView: view + heroView: view, + triggerType: 'dead' }); } } diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index e1a7d9b5..061bb5b3 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -6,6 +6,7 @@ import { HeroSpine } from "./HeroSpine"; import { BoxSet, FacSet, FightSet, NumberFormatter, TooltipTypes } from "../common/config/GameSet"; import { smc } from "../common/SingletonModuleComp"; import { SkillSet,} from "../common/config/SkillSet"; +import { HeroInfo } from "../common/config/heroSet"; import { oops } from "db://oops-framework/core/Oops"; import { HeroAttrsComp } from "./HeroAttrsComp"; import { Tooltip } from "../skill/Tooltip"; @@ -300,7 +301,11 @@ export class HeroViewComp extends CCComp { var path = "game/skill/ready/" + anm; this.spawnAnimEndFx(path, this.node, undefined); } - + public playOther(anm: string = ""){ + if(anm==="") return; + var path = "game/skill/ready/" + anm; + this.spawnAnimEndFx(path, this.node.parent, undefined); + } public playEnd(anm: string = ""){ if(anm==="") return; var path = "game/skill/end/" + anm; @@ -417,9 +422,14 @@ export class HeroViewComp extends CCComp { this.realDeadTime = this.monDeadTime; } - // 播放死亡特效 - this.deaded(); - + // 如果角色带有死亡触发技能，则由 SCastSystem 播放 playReady("dead")，不播放原有的 deaded 特效 + const heroInfo = HeroInfo[this.model.hero_uuid]; + if (heroInfo && heroInfo.dead) { + // SCastSystem will handle the "dead" ready animation + } else { + // 播放默认死亡特效 + this.deaded(); + } } realDead(){ // 🔥 修复：添加model安全检查，防止实体销毁过程中的空指针异常 diff --git a/assets/script/game/hero/Mon.ts b/assets/script/game/hero/Mon.ts index f8d1098f..c3ddbbc9 100644 --- a/assets/script/game/hero/Mon.ts +++ b/assets/script/game/hero/Mon.ts @@ -199,7 +199,8 @@ export class Monster extends ecs.Entity { oops.message.dispatchEvent(GameEvent.TriggerSkill, { s_uuid: hero.call, heroAttrs: model, - heroView: view + heroView: view, + triggerType: 'call' }); } diff --git a/assets/script/game/hero/SCastSystem.ts b/assets/script/game/hero/SCastSystem.ts index 12492786..6d153ee2 100644 --- a/assets/script/game/hero/SCastSystem.ts +++ b/assets/script/game/hero/SCastSystem.ts @@ -40,9 +40,9 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate oops.message.off(GameEvent.TriggerSkill, this.onTriggerSkill, this); } - private onTriggerSkill(event: string, args: { s_uuid: number, heroAttrs: HeroAttrsComp, heroView: HeroViewComp }) { + private onTriggerSkill(event: string, args: { s_uuid: number, heroAttrs: HeroAttrsComp, heroView: HeroViewComp, triggerType?: string }) { if (!args || !args.s_uuid || !args.heroAttrs || !args.heroView) return; - this.forceCastTriggerSkill(args.s_uuid, args.heroAttrs, args.heroView); + this.forceCastTriggerSkill(args.s_uuid, args.heroAttrs, args.heroView, args.triggerType); } /** 空施法计划：用于“当前无可施法技能”时的统一返回 */ private readonly emptyCastPlan = { skillId: 0, skillLv: 1, isFriendly: false, targetPos: null as Vec3 | null, targetEids: [] as number[] }; @@ -95,7 +95,14 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate * 强制执行触发技能（召唤/死亡触发） * 忽略CD、状态、动画前摇，直接生效 */ - public forceCastTriggerSkill(s_uuid: number, heroAttrs: HeroAttrsComp, heroView: HeroViewComp) { + public forceCastTriggerSkill(s_uuid: number, heroAttrs: HeroAttrsComp, heroView: HeroViewComp, triggerType?: string) { + // 播放相应的触发动画 + if (triggerType === 'call') { + heroView.playReady("yellow"); + } else if (triggerType === 'dead') { + heroView.playReady("dead"); + } + // 如果是敌方攻击技能，必须在战斗中才能释放；友方增益/护盾则允许在非战斗中释放 const config = SkillSet[s_uuid]; if (!config) return;