diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index 6a9c9904..79d330af 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -26,31 +26,34 @@ }, { "__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__": 49 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -631,6 +634,118 @@ "z": 1 } }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 38 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 37 + }, + "asset": { + "__uuid__": "fb48f231-c2a1-4921-8e71-1ec9b9ba245f", + "__expectedType__": "cc.Prefab" + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": { + "__id__": 39 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "93WGgxu3hHMLHVRcee8Mtz", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 40 + }, + { + "__id__": 42 + }, + { + "__id__": 43 + }, + { + "__id__": 44 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 41 + }, + "propertyPath": [ + "_name" + ], + "value": "up_ap" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c46/YsCPVOJYA4mWEpNYRx" + ] + }, + { + "__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": "", @@ -641,7 +756,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -669,7 +784,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 48 }, "anm": { "__id__": 5 @@ -690,7 +805,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 50 }, "debugMode": false, "_id": "" @@ -709,7 +824,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 52 }, "enabledContactListener": true, "bullet": false, @@ -743,7 +858,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 54 }, "tag": 0, "_group": 4, @@ -777,7 +892,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 56 }, "playOnLoad": false, "_clips": [], @@ -800,6 +915,9 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ + { + "__id__": 37 + }, { "__id__": 26 }, diff --git a/assets/resources/game/skill/ready/up_ap.prefab b/assets/resources/game/skill/ready/up_ap.prefab index 780b53b0..fa2870d1 100644 --- a/assets/resources/game/skill/ready/up_ap.prefab +++ b/assets/resources/game/skill/ready/up_ap.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -10.802, "z": 0 }, "_lrot": { @@ -99,8 +99,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.2, + "y": 1.2, "z": 1 }, "_mobility": 0, @@ -161,7 +161,7 @@ "r": 255, "g": 255, "b": 255, - "a": 206 + "a": 255 }, "_spriteFrame": { "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@3ddda", diff --git a/assets/resources/game/skill/ready/up_hp.prefab b/assets/resources/game/skill/ready/up_hp.prefab index 87c98575..cfc9dec1 100644 --- a/assets/resources/game/skill/ready/up_hp.prefab +++ b/assets/resources/game/skill/ready/up_hp.prefab @@ -37,7 +37,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -12.537, "z": 0 }, "_lrot": { @@ -99,8 +99,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.2, + "y": 1.2, "z": 1 }, "_mobility": 0, @@ -161,7 +161,7 @@ "r": 255, "g": 255, "b": 255, - "a": 206 + "a": 255 }, "_spriteFrame": { "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6@e8dba", diff --git a/assets/resources/game/skill/ready/wfuny.prefab b/assets/resources/game/skill/ready/wfuny.prefab new file mode 100644 index 00000000..a3410cfe --- /dev/null +++ b/assets/resources/game/skill/ready/wfuny.prefab @@ -0,0 +1,274 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "wfuny", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "wfuny", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 8 + }, + { + "__id__": 10 + } + ], + "_prefab": { + "__id__": 12 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -12.537, + "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": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_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": 1.2, + "y": 1.2, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 91, + "height": 109 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b4sNQPJWFKha7x75SWXmRj" + }, + { + "__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__": "3d46f945-3f07-477e-a95a-b49557d552c6@e8dba", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 1, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0.2, + "_fillRange": 1, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": { + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9a+65VIghBm4HQxuHPQ/mg" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7a5LvbdlxEc6FKa7cun2oB", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "cbac7690-586d-42bf-bd2c-2e2fc279b819", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "cbac7690-586d-42bf-bd2c-2e2fc279b819", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c6LOemuvJKyYCqlF/yUJcr" + }, + { + "__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/skill/ready/wfuny.prefab.meta b/assets/resources/game/skill/ready/wfuny.prefab.meta new file mode 100644 index 00000000..3403435c --- /dev/null +++ b/assets/resources/game/skill/ready/wfuny.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "93905c3f-cf41-4b0d-8b1c-e4565a20de80", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "wfuny" + } +}