From d987e0806f0b14e917a37fa1e97dc27a6df93a36 Mon Sep 17 00:00:00 2001 From: panw Date: Wed, 22 Oct 2025 16:06:37 +0800 Subject: [PATCH] =?UTF-8?q?refactor(animation):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E5=92=8C=E9=A2=84=E8=AE=BE=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - notify.anim 新增位置向量轨迹和关键帧曲线数据，丰富动画表现 - notify.prefab 增加和调整节点、组件及属性，提升UI结构和视觉布局 - hero hc1 的 move.anim 动画时长和帧数据调整，优化动作流畅度 - atk_fires.prefab 添加 withHero 属性以支持技能表现扩展 - 删除了 game/skills 目录下的 buff.prefab 和 buff_iced.prefab 资源，清理无用资源 --- assets/resources/common/anim/notify.anim | 211 ++++- assets/resources/common/prefab/notify.prefab | 389 ++++++++- .../resources/game/heros/hero/hc1/move.anim | 33 +- .../resources/game/skill/atk/atk_fires.prefab | 1 + assets/resources/game/skill/buff.meta | 9 + .../game/{skills => skill/buff}/buff.prefab | 0 .../{skills => skill/buff}/buff.prefab.meta | 0 .../{skills => skill/buff}/buff_iced.prefab | 0 .../buff}/buff_iced.prefab.meta | 0 .../{skills => skill/buff}/buff_max.prefab | 0 .../buff}/buff_max.prefab.meta | 0 .../game/{skills => skill/buff}/dead.prefab | 0 .../{skills => skill/buff}/dead.prefab.meta | 0 .../{skills => skill/buff}/shielded.prefab | 0 .../buff}/shielded.prefab.meta | 0 .../{skills => skill/buff}/tooltip.prefab | 0 .../buff}/tooltip.prefab.meta | 0 assets/resources/gui/anim/lock.anim | 258 ++++++ assets/resources/gui/anim/lock.anim.meta | 13 + assets/resources/gui/role_controller.prefab | 743 ++++++++++++++---- assets/script/game/map/HInfoComp.ts | 25 +- assets/script/game/skill/SkillViewCom.ts | 7 +- 22 files changed, 1479 insertions(+), 210 deletions(-) create mode 100644 assets/resources/game/skill/buff.meta rename assets/resources/game/{skills => skill/buff}/buff.prefab (100%) rename assets/resources/game/{skills => skill/buff}/buff.prefab.meta (100%) rename assets/resources/game/{skills => skill/buff}/buff_iced.prefab (100%) rename assets/resources/game/{skills => skill/buff}/buff_iced.prefab.meta (100%) rename assets/resources/game/{skills => skill/buff}/buff_max.prefab (100%) rename assets/resources/game/{skills => skill/buff}/buff_max.prefab.meta (100%) rename assets/resources/game/{skills => skill/buff}/dead.prefab (100%) rename assets/resources/game/{skills => skill/buff}/dead.prefab.meta (100%) rename assets/resources/game/{skills => skill/buff}/shielded.prefab (100%) rename assets/resources/game/{skills => skill/buff}/shielded.prefab.meta (100%) rename assets/resources/game/{skills => skill/buff}/tooltip.prefab (100%) rename assets/resources/game/{skills => skill/buff}/tooltip.prefab.meta (100%) create mode 100644 assets/resources/gui/anim/lock.anim create mode 100644 assets/resources/gui/anim/lock.anim.meta diff --git a/assets/resources/common/anim/notify.anim b/assets/resources/common/anim/notify.anim index 6a3776b8..eb5bc081 100644 --- a/assets/resources/common/anim/notify.anim +++ b/assets/resources/common/anim/notify.anim @@ -19,13 +19,16 @@ }, { "__id__": 13 + }, + { + "__id__": 24 } ], "_exoticAnimation": null, "_events": [], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 24 + "__id__": 34 }, "_auxiliaryCurveEntries": [] }, @@ -590,6 +593,212 @@ "preExtrapolation": 1, "postExtrapolation": 1 }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 25 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 26 + }, + { + "__id__": 28 + }, + { + "__id__": 30 + }, + { + "__id__": 32 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + "position" + ] + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 27 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.6666666666666666, + 1.25 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 29 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.6666666666666666, + 1.25 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 455, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 455, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 555, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 31 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.6666666666666666, + 1.25 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 33 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, { "__type__": "cc.AnimationClipAdditiveSettings", "enabled": false, diff --git a/assets/resources/common/prefab/notify.prefab b/assets/resources/common/prefab/notify.prefab index 83185c2e..0ff83184 100644 --- a/assets/resources/common/prefab/notify.prefab +++ b/assets/resources/common/prefab/notify.prefab @@ -20,33 +20,39 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 17 + }, + { + "__id__": 23 } ], "_active": true, "_components": [ { - "__id__": 10 + "__id__": 31 }, { - "__id__": 12 + "__id__": 33 }, { - "__id__": 14 + "__id__": 35 }, { - "__id__": 16 + "__id__": 37 }, { - "__id__": 18 + "__id__": 39 } ], "_prefab": { - "__id__": 20 + "__id__": 41 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 555, + "y": 455, "z": 0 }, "_lrot": { @@ -72,6 +78,332 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "fbbc9ff5-0bcf-4e92-9c71-f9dc27a30158", + "__expectedType__": "cc.Prefab" + }, + "fileId": "0bP5AdjVNKbIVXJK2hNWPD", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "58cIYrwIBIUJTPYa+To7Os", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + }, + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "slist" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "0bP5AdjVNKbIVXJK2hNWPD" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 11 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 680, + "height": 120 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "53s5rNSsdM1rRVM8XF85z1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 13 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 680, + "height": 120 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "0fDjKrHkFN9YsEzQamA+QJ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_left" + ], + "value": 10 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "88vjsnrkhKvrT5BHQt/TeZ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_right" + ], + "value": 10 + }, + { + "__type__": "cc.Node", + "_name": "ItemIcon_Scroll_Feather", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 18 + }, + { + "__id__": 20 + } + ], + "_prefab": { + "__id__": 22 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -297.311, + "y": 40.477, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.7, + "y": 0.7, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 122, + "height": 112 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "95euAr+ABP4aTgxKUFnC10" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_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@6a8a9", + "__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": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "87hztWZFVH0L7943RpKfAr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fbQMFJWSFAgpDKxvWpMcqN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "lab_content", @@ -84,17 +416,17 @@ "_active": true, "_components": [ { - "__id__": 3 + "__id__": 24 }, { - "__id__": 5 + "__id__": 26 }, { - "__id__": 7 + "__id__": 28 } ], "_prefab": { - "__id__": 9 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -131,11 +463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -159,11 +491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -227,11 +559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 29 }, "_params": [], "_dataID": "", @@ -264,7 +596,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -292,7 +624,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 34 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -334,7 +666,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 36 }, "playOnLoad": true, "_clips": [ @@ -363,13 +695,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 38 }, "lab_content": { - "__id__": 5 + "__id__": 26 }, "animation": { - "__id__": 14 + "__id__": 35 }, "_id": "" }, @@ -387,13 +719,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 40 }, "_alignFlags": 1, "_target": null, "_left": 0, "_right": 0, - "_top": 10, + "_top": 110, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -423,6 +755,11 @@ }, "fileId": "4fj6jVgO1KzKob1u6D65Ik", "instance": null, - "targetOverrides": null + "targetOverrides": null, + "nestedPrefabInstanceRoots": [ + { + "__id__": 2 + } + ] } ] \ No newline at end of file diff --git a/assets/resources/game/heros/hero/hc1/move.anim b/assets/resources/game/heros/hero/hc1/move.anim index d797470a..dae33ea8 100644 --- a/assets/resources/game/heros/hero/hc1/move.anim +++ b/assets/resources/game/heros/hero/hc1/move.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 2, "enableTrsBlending": false, - "_duration": 0, + "_duration": 0.5, "_hash": 500763545, "_tracks": [ { @@ -60,8 +60,35 @@ }, { "__type__": "cc.ObjectCurve", - "_times": [], - "_values": [] + "_times": [ + 0, + 0.1, + 0.2, + 0.3, + 0.4 + ], + "_values": [ + { + "__uuid__": "3751c550-6b31-4667-a6bb-c9af49ba570c@bffbf", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3751c550-6b31-4667-a6bb-c9af49ba570c@01c5d", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3751c550-6b31-4667-a6bb-c9af49ba570c@66491", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3751c550-6b31-4667-a6bb-c9af49ba570c@ec0d0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "3751c550-6b31-4667-a6bb-c9af49ba570c@dddab", + "__expectedType__": "cc.SpriteFrame" + } + ] }, { "__type__": "cc.AnimationClipAdditiveSettings", diff --git a/assets/resources/game/skill/atk/atk_fires.prefab b/assets/resources/game/skill/atk/atk_fires.prefab index 49019fb9..f6b0e641 100644 --- a/assets/resources/game/skill/atk/atk_fires.prefab +++ b/assets/resources/game/skill/atk/atk_fires.prefab @@ -312,6 +312,7 @@ "__expectedType__": "cc.Prefab" }, "hasReady": true, + "withHero": false, "ReadyLoop": true, "SkillTime": 5, "ReadyTime": 0.2, diff --git a/assets/resources/game/skill/buff.meta b/assets/resources/game/skill/buff.meta new file mode 100644 index 00000000..8ff4b675 --- /dev/null +++ b/assets/resources/game/skill/buff.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "45f96a78-18a2-4f35-8d22-c3a2775eb4ba", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/buff.prefab b/assets/resources/game/skill/buff/buff.prefab similarity index 100% rename from assets/resources/game/skills/buff.prefab rename to assets/resources/game/skill/buff/buff.prefab diff --git a/assets/resources/game/skills/buff.prefab.meta b/assets/resources/game/skill/buff/buff.prefab.meta similarity index 100% rename from assets/resources/game/skills/buff.prefab.meta rename to assets/resources/game/skill/buff/buff.prefab.meta diff --git a/assets/resources/game/skills/buff_iced.prefab b/assets/resources/game/skill/buff/buff_iced.prefab similarity index 100% rename from assets/resources/game/skills/buff_iced.prefab rename to assets/resources/game/skill/buff/buff_iced.prefab diff --git a/assets/resources/game/skills/buff_iced.prefab.meta b/assets/resources/game/skill/buff/buff_iced.prefab.meta similarity index 100% rename from assets/resources/game/skills/buff_iced.prefab.meta rename to assets/resources/game/skill/buff/buff_iced.prefab.meta diff --git a/assets/resources/game/skills/buff_max.prefab b/assets/resources/game/skill/buff/buff_max.prefab similarity index 100% rename from assets/resources/game/skills/buff_max.prefab rename to assets/resources/game/skill/buff/buff_max.prefab diff --git a/assets/resources/game/skills/buff_max.prefab.meta b/assets/resources/game/skill/buff/buff_max.prefab.meta similarity index 100% rename from assets/resources/game/skills/buff_max.prefab.meta rename to assets/resources/game/skill/buff/buff_max.prefab.meta diff --git a/assets/resources/game/skills/dead.prefab b/assets/resources/game/skill/buff/dead.prefab similarity index 100% rename from assets/resources/game/skills/dead.prefab rename to assets/resources/game/skill/buff/dead.prefab diff --git a/assets/resources/game/skills/dead.prefab.meta b/assets/resources/game/skill/buff/dead.prefab.meta similarity index 100% rename from assets/resources/game/skills/dead.prefab.meta rename to assets/resources/game/skill/buff/dead.prefab.meta diff --git a/assets/resources/game/skills/shielded.prefab b/assets/resources/game/skill/buff/shielded.prefab similarity index 100% rename from assets/resources/game/skills/shielded.prefab rename to assets/resources/game/skill/buff/shielded.prefab diff --git a/assets/resources/game/skills/shielded.prefab.meta b/assets/resources/game/skill/buff/shielded.prefab.meta similarity index 100% rename from assets/resources/game/skills/shielded.prefab.meta rename to assets/resources/game/skill/buff/shielded.prefab.meta diff --git a/assets/resources/game/skills/tooltip.prefab b/assets/resources/game/skill/buff/tooltip.prefab similarity index 100% rename from assets/resources/game/skills/tooltip.prefab rename to assets/resources/game/skill/buff/tooltip.prefab diff --git a/assets/resources/game/skills/tooltip.prefab.meta b/assets/resources/game/skill/buff/tooltip.prefab.meta similarity index 100% rename from assets/resources/game/skills/tooltip.prefab.meta rename to assets/resources/game/skill/buff/tooltip.prefab.meta diff --git a/assets/resources/gui/anim/lock.anim b/assets/resources/gui/anim/lock.anim new file mode 100644 index 00000000..4f361c21 --- /dev/null +++ b/assets/resources/gui/anim/lock.anim @@ -0,0 +1,258 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "lock", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.6666666666666666, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 11 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 9 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + "scale" + ] + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 4 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.3333333432674408, + 0.6666666865348816 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1.2999999523162842, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.3333333432674408, + 0.6666666865348816 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1.2999999523162842, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 8 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.3333333432674408, + 0.6666666865348816 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 10 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/gui/anim/lock.anim.meta b/assets/resources/gui/anim/lock.anim.meta new file mode 100644 index 00000000..d85c7337 --- /dev/null +++ b/assets/resources/gui/anim/lock.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "2e6a6e8e-b430-4ccf-86b2-b8abbada6f20", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "lock" + } +} diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index c81dd44a..bc8d8181 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,29 +25,29 @@ "__id__": 53 }, { - "__id__": 297 + "__id__": 315 }, { - "__id__": 325 + "__id__": 343 } ], "_active": true, "_components": [ { - "__id__": 371 + "__id__": 389 }, { - "__id__": 373 + "__id__": 391 }, { - "__id__": 375 + "__id__": 393 }, { - "__id__": 377 + "__id__": 395 } ], "_prefab": { - "__id__": 379 + "__id__": 397 }, "_lpos": { "__type__": "cc.Vec3", @@ -1245,20 +1245,20 @@ "_active": true, "_components": [ { - "__id__": 288 + "__id__": 306 }, { - "__id__": 290 + "__id__": 308 }, { - "__id__": 292 + "__id__": 310 }, { - "__id__": 294 + "__id__": 312 } ], "_prefab": { - "__id__": 296 + "__id__": 314 }, "_lpos": { "__type__": "cc.Vec3", @@ -4617,7 +4617,7 @@ "__id__": 198 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 204 @@ -5080,8 +5080,8 @@ "_hoverSprite": null, "_pressedSprite": null, "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 0.8, + "_duration": 0.3, + "_zoomScale": 1.3, "_target": { "__id__": 189 }, @@ -6154,19 +6154,25 @@ }, { "__id__": 263 + }, + { + "__id__": 269 + }, + { + "__id__": 289 } ], "_active": true, "_components": [ { - "__id__": 283 + "__id__": 301 }, { - "__id__": 285 + "__id__": 303 } ], "_prefab": { - "__id__": 287 + "__id__": 305 }, "_lpos": { "__type__": "cc.Vec3", @@ -6199,7 +6205,7 @@ }, { "__type__": "cc.Node", - "_name": "light", + "_name": "lighted", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -6221,7 +6227,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 57.51599999999996, + "y": 44.11, "z": 0 }, "_lrot": { @@ -6273,7 +6279,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "93eanUwSxDUJRWaFfD8btC" + "fileId": "23v85sFDFPbpXfslvC1Znr" }, { "__type__": "cc.Sprite", @@ -6292,9 +6298,148 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 231, - "g": 227, - "b": 120, + "r": 255, + "g": 246, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@0e9c9", + "__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__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "36hdC1bsNKobwy7GAP/JQN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c2H2yqRFpEyrxGTRmaD9Jm", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "light", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 256 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 264 + }, + { + "__id__": 266 + } + ], + "_prefab": { + "__id__": 268 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 44.11, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 6.123233995736766e-17, + "y": 6.123233995736766e-17, + "z": -1, + "w": 3.749399456654644e-33 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 3, + "y": 1.5, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 180, + "y": 180, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 263 + }, + "_enabled": true, + "__prefab": { + "__id__": 265 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48, + "height": 189 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93eanUwSxDUJRWaFfD8btC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 263 + }, + "_enabled": true, + "__prefab": { + "__id__": 267 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 246, + "b": 0, "a": 255 }, "_spriteFrame": { @@ -6346,23 +6491,23 @@ }, "_children": [ { - "__id__": 264 + "__id__": 270 }, { - "__id__": 272 + "__id__": 278 } ], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 284 }, { - "__id__": 280 + "__id__": 286 } ], "_prefab": { - "__id__": 282 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -6399,23 +6544,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 269 }, "_children": [], "_active": true, "_components": [ { - "__id__": 265 + "__id__": 271 }, { - "__id__": 267 + "__id__": 273 }, { - "__id__": 269 + "__id__": 275 } ], "_prefab": { - "__id__": 271 + "__id__": 277 }, "_lpos": { "__type__": "cc.Vec3", @@ -6452,11 +6597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -6480,11 +6625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 274 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6548,11 +6693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 276 }, "_alignFlags": 1, "_target": null, @@ -6597,20 +6742,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 269 }, "_children": [], "_active": true, "_components": [ { - "__id__": 273 + "__id__": 279 }, { - "__id__": 275 + "__id__": 281 } ], "_prefab": { - "__id__": 277 + "__id__": 283 }, "_lpos": { "__type__": "cc.Vec3", @@ -6647,11 +6792,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 280 }, "_contentSize": { "__type__": "cc.Size", @@ -6675,11 +6820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 282 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6756,11 +6901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 285 }, "_contentSize": { "__type__": "cc.Size", @@ -6784,11 +6929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 287 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6839,6 +6984,266 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "lock", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 256 + }, + "_children": [ + { + "__id__": 290 + } + ], + "_active": true, + "_components": [ + { + "__id__": 296 + }, + { + "__id__": 298 + } + ], + "_prefab": { + "__id__": 300 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 54.863, + "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": "ItemIcon_Star_Disable", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 289 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 291 + }, + { + "__id__": 293 + } + ], + "_prefab": { + "__id__": 295 + }, + "_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.4, + "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__": 290 + }, + "_enabled": true, + "__prefab": { + "__id__": 292 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 118 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d8/ICmGSZEpp+V8NDmVLLy" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 290 + }, + "_enabled": true, + "__prefab": { + "__id__": 294 + }, + "_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@ba602", + "__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": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "faRyCtrrlCnaSaB5ue9SsT" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a4cNSivhtCQqqlWPkvBfkY", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 289 + }, + "_enabled": true, + "__prefab": { + "__id__": 297 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c5Zk1YJ81P1Z7/AX9jtDem" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 289 + }, + "_enabled": true, + "__prefab": { + "__id__": 299 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "2e6a6e8e-b430-4ccf-86b2-b8abbada6f20", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "2e6a6e8e-b430-4ccf-86b2-b8abbada6f20", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dapcDNTzVJi7HosqEh6Cc6" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8eX7YMP+9BGqqPiL/oq4sO", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -6849,7 +7254,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -6877,7 +7282,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 304 }, "_alignFlags": 18, "_target": null, @@ -6926,7 +7331,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 307 }, "_contentSize": { "__type__": "cc.Size", @@ -6954,7 +7359,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 309 }, "_alignFlags": 21, "_target": null, @@ -6990,7 +7395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 311 }, "_id": "" }, @@ -7008,7 +7413,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 313 }, "_id": "" }, @@ -7039,26 +7444,26 @@ }, "_children": [ { - "__id__": 298 + "__id__": 316 }, { - "__id__": 306 + "__id__": 324 } ], "_active": false, "_components": [ { - "__id__": 318 + "__id__": 336 }, { - "__id__": 320 + "__id__": 338 }, { - "__id__": 322 + "__id__": 340 } ], "_prefab": { - "__id__": 324 + "__id__": 342 }, "_lpos": { "__type__": "cc.Vec3", @@ -7095,23 +7500,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 297 + "__id__": 315 }, "_children": [], "_active": true, "_components": [ { - "__id__": 299 + "__id__": 317 }, { - "__id__": 301 + "__id__": 319 }, { - "__id__": 303 + "__id__": 321 } ], "_prefab": { - "__id__": 305 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -7148,11 +7553,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 318 }, "_contentSize": { "__type__": "cc.Size", @@ -7176,11 +7581,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 320 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7224,11 +7629,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 322 }, "_alignFlags": 45, "_target": null, @@ -7271,17 +7676,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 297 + "__id__": 315 }, "_prefab": { - "__id__": 307 + "__id__": 325 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 306 + "__id__": 324 }, "asset": { "__uuid__": "9cc71d8c-192a-4234-8204-352f42b95c65", @@ -7289,7 +7694,7 @@ }, "fileId": "a0daVw8DRLi6ToMaTA0VS2", "instance": { - "__id__": 308 + "__id__": 326 }, "targetOverrides": null }, @@ -7303,22 +7708,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 309 + "__id__": 327 }, { - "__id__": 311 + "__id__": 329 }, { - "__id__": 312 + "__id__": 330 }, { - "__id__": 313 + "__id__": 331 }, { - "__id__": 314 + "__id__": 332 }, { - "__id__": 316 + "__id__": 334 } ], "removedComponents": [] @@ -7326,7 +7731,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 328 }, "propertyPath": [ "_name" @@ -7342,7 +7747,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 328 }, "propertyPath": [ "_lpos" @@ -7357,7 +7762,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 328 }, "propertyPath": [ "_lrot" @@ -7373,7 +7778,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 328 }, "propertyPath": [ "_euler" @@ -7388,7 +7793,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 315 + "__id__": 333 }, "propertyPath": [ "_contentSize" @@ -7408,7 +7813,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 317 + "__id__": 335 }, "propertyPath": [ "_contentSize" @@ -7431,11 +7836,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", @@ -7459,11 +7864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 339 }, "_alignFlags": 45, "_target": null, @@ -7495,11 +7900,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 341 }, "_id": "" }, @@ -7530,23 +7935,23 @@ }, "_children": [ { - "__id__": 326 + "__id__": 344 } ], "_active": true, "_components": [ { - "__id__": 364 + "__id__": 382 }, { - "__id__": 366 + "__id__": 384 }, { - "__id__": 368 + "__id__": 386 } ], "_prefab": { - "__id__": 370 + "__id__": 388 }, "_lpos": { "__type__": "cc.Vec3", @@ -7583,30 +7988,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 325 + "__id__": 343 }, "_children": [ { - "__id__": 327 + "__id__": 345 } ], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 373 }, { - "__id__": 357 + "__id__": 375 }, { - "__id__": 359 + "__id__": 377 }, { - "__id__": 361 + "__id__": 379 } ], "_prefab": { - "__id__": 363 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -7643,27 +8048,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 326 + "__id__": 344 }, "_children": [ { - "__id__": 328 + "__id__": 346 }, { - "__id__": 336 + "__id__": 354 }, { - "__id__": 342 + "__id__": 360 } ], "_active": true, "_components": [ { - "__id__": 352 + "__id__": 370 } ], "_prefab": { - "__id__": 354 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -7700,23 +8105,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 327 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 329 + "__id__": 347 }, { - "__id__": 331 + "__id__": 349 }, { - "__id__": 333 + "__id__": 351 } ], "_prefab": { - "__id__": 335 + "__id__": 353 }, "_lpos": { "__type__": "cc.Vec3", @@ -7753,11 +8158,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 348 }, "_contentSize": { "__type__": "cc.Size", @@ -7781,11 +8186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 350 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7829,11 +8234,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 352 }, "_alignFlags": 40, "_target": null, @@ -7878,20 +8283,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 327 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 337 + "__id__": 355 }, { - "__id__": 339 + "__id__": 357 } ], "_prefab": { - "__id__": 341 + "__id__": 359 }, "_lpos": { "__type__": "cc.Vec3", @@ -7928,11 +8333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 356 }, "_contentSize": { "__type__": "cc.Size", @@ -7956,11 +8361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 358 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8017,26 +8422,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 327 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 343 + "__id__": 361 }, { - "__id__": 345 + "__id__": 363 }, { - "__id__": 347 + "__id__": 365 }, { - "__id__": 349 + "__id__": 367 } ], "_prefab": { - "__id__": 351 + "__id__": 369 }, "_lpos": { "__type__": "cc.Vec3", @@ -8073,11 +8478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 342 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 362 }, "_contentSize": { "__type__": "cc.Size", @@ -8101,11 +8506,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 342 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 346 + "__id__": 364 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8169,11 +8574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 342 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 366 }, "_alignFlags": 10, "_target": null, @@ -8205,11 +8610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 342 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 368 }, "templateMode": true, "watchPath": "data.data.gold", @@ -8242,11 +8647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 371 }, "_contentSize": { "__type__": "cc.Size", @@ -8283,11 +8688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 374 }, "_contentSize": { "__type__": "cc.Size", @@ -8311,11 +8716,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 376 }, "_alignFlags": 8, "_target": null, @@ -8347,11 +8752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 378 }, "_resizeMode": 0, "_layoutType": 1, @@ -8385,11 +8790,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 380 }, "_alignFlags": 40, "_target": null, @@ -8434,11 +8839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 365 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", @@ -8462,11 +8867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 385 }, "_alignFlags": 17, "_target": null, @@ -8498,11 +8903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 387 }, "_id": "" }, @@ -8533,7 +8938,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 390 }, "_contentSize": { "__type__": "cc.Size", @@ -8561,7 +8966,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 392 }, "_alignFlags": 45, "_target": null, @@ -8597,7 +9002,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 394 }, "_id": "" }, @@ -8615,7 +9020,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 378 + "__id__": 396 }, "_id": "" }, @@ -8636,7 +9041,7 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 306 + "__id__": 324 } ] } diff --git a/assets/script/game/map/HInfoComp.ts b/assets/script/game/map/HInfoComp.ts index 9dc8fa0b..18b6cac9 100644 --- a/assets/script/game/map/HInfoComp.ts +++ b/assets/script/game/map/HInfoComp.ts @@ -1,6 +1,6 @@ import { _decorator, Animation, AnimationClip, Component, instantiate, Label, Node, Prefab, resources, Sprite, SpriteFrame, v3, tween, Vec3 } from 'cc'; import { oops } from 'db://oops-framework/core/Oops'; -import { getHeroList, HeroInfo, HType, HTypeName } from '../common/config/heroSet'; +import { getHeroList, HeroConf, HeroInfo, HType, HTypeName } from '../common/config/heroSet'; import { smc } from '../common/SingletonModuleComp'; import { GameEvent } from '../common/config/GameEvent'; import { CCComp } from 'db://oops-framework/module/common/CCComp'; @@ -89,7 +89,7 @@ export class HInfoComp extends CCComp { // 载入英雄预制体并设置位置 this.heroNodes[i] = this.load_hui(heroUuid, i); } - this.is_lucky() + this.show_lock() } load_hui(uuid:number, pos_index: number){ var path = "game/gui/hui"; @@ -100,7 +100,7 @@ export class HInfoComp extends CCComp { // 设置节点位置 node.setPosition(this.hero_pos[pos_index]); - + node.setSiblingIndex(0); // 加载并播放动画 let anm_path=HeroInfo[uuid].path; resources.load("game/heros/hero/"+anm_path+"/idle", AnimationClip, (err, clip) => { @@ -120,8 +120,12 @@ export class HInfoComp extends CCComp { mission_start(){ this.claear_hero() } - is_lucky(){ - this.node.getChildByName("buy").active=!smc.heros.includes(this.h_uuid) + is_own(){ + return smc.heros.includes(this.h_uuid) + } + show_lock(){ + this.node.getChildByName("buy").active=!this.is_own() + this.node.getChildByName("hero").getChildByName("lock").active=!this.is_own() } claear_hero(){ for (let i = 0; i < this.heroNodes.length; i++) { @@ -149,7 +153,7 @@ export class HInfoComp extends CCComp { this.update_data(nextHero); // 执行平滑移动动画 this.moveHeroesRight(); - this.is_lucky() + this.show_lock() } prev_hero(){ @@ -169,14 +173,17 @@ export class HInfoComp extends CCComp { this.update_data(prevHero); // 执行平滑移动动画 this.moveHeroesLeft(); - this.is_lucky() + this.show_lock() } buy_hero(){ console.info("[HInfoComp]:buy_hero",this.h_uuid) - this.node.getChildByName("buy").active=false + if(smc.vmdata.gold < HeroConf.COST) { + oops.gui.toast("金币不足") + return + } smc.addHero(this.h_uuid) this.load_all_hero(this.h_uuid) - this.is_lucky() + this.show_lock() } start_mission() { oops.message.dispatchEvent(GameEvent.MissionStart, {}) diff --git a/assets/script/game/skill/SkillViewCom.ts b/assets/script/game/skill/SkillViewCom.ts index 47ea58f5..67299908 100644 --- a/assets/script/game/skill/SkillViewCom.ts +++ b/assets/script/game/skill/SkillViewCom.ts @@ -16,7 +16,9 @@ export class SkillViewCom extends CCComp { @property({ type: Prefab }) atkPrefab: Prefab = null! @property - hasReady: boolean = false; + hasReady: boolean = false + @property + withHero: boolean = true @property ReadyLoop: boolean = false // 预备是否循环 @property({ type: CCFloat }) @@ -55,6 +57,7 @@ export class SkillViewCom extends CCComp { start() { // var entity = this.ent as ecs.Entity; // ecs.Entity 可转为当前模块的具体实体对象 this.node.getChildByName("ready").active = this.hasReady + this.node.setPosition(this.caster.node.position.x,this.caster.node.position.y+this.ready_y) } protected update(dt: number): void { this.doTimer(dt) @@ -144,7 +147,7 @@ export class SkillViewCom extends CCComp { } move(dt: number): void { // console.log(`${this.cName}_[SkillViewCom] move`) - if(this.caster != null&&this.caster.node!=null) this.node.setPosition(this.caster.node.position.x,this.caster.node.position.y+this.ready_y) + if(this.caster != null&&this.caster.node!=null&&this.withHero) this.node.setPosition(this.caster.node.position.x,this.caster.node.position.y+this.ready_y) // console.log(`${this.cName}_[skillview]move`,this.caster.node.position,this.node.position) } reset() {