From c6fa6838db72534b56bc2698faa5c2d817bea65e Mon Sep 17 00:00:00 2001 From: panw Date: Mon, 23 Jun 2025 10:49:15 +0800 Subject: [PATCH] dd --- assets/resources/game/gui/card.prefab | 2 +- assets/resources/gui/role_controller.prefab | 1490 +++++++++++++------ assets/script/game/common/config/CardSet.ts | 12 +- assets/script/game/common/config/Mission.ts | 4 + assets/script/game/common/config/heroSet.ts | 69 +- assets/script/game/map/CardComp.ts | 129 +- assets/script/game/map/CardsComp.ts | 4 +- assets/script/game/map/MissionComp.ts | 3 + assets/script/todo.md | 13 +- 9 files changed, 1164 insertions(+), 562 deletions(-) diff --git a/assets/resources/game/gui/card.prefab b/assets/resources/game/gui/card.prefab index ca974ccb..45b41716 100644 --- a/assets/resources/game/gui/card.prefab +++ b/assets/resources/game/gui/card.prefab @@ -8886,7 +8886,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 10.595, + "x": 0, "y": 0, "z": 0 }, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 25dd662a..fe5d8368 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,29 +22,29 @@ "__id__": 2 }, { - "__id__": 1684 + "__id__": 1709 }, { - "__id__": 1744 + "__id__": 1769 }, { - "__id__": 1766 + "__id__": 1791 } ], "_active": true, "_components": [ { - "__id__": 1974 + "__id__": 1999 }, { - "__id__": 1976 + "__id__": 2001 }, { - "__id__": 1978 + "__id__": 2003 } ], "_prefab": { - "__id__": 1980 + "__id__": 2005 }, "_lpos": { "__type__": "cc.Vec3", @@ -107,28 +107,31 @@ }, { "__id__": 1659 + }, + { + "__id__": 1673 } ], "_active": true, "_components": [ { - "__id__": 1673 + "__id__": 1698 }, { - "__id__": 1675 + "__id__": 1700 }, { - "__id__": 1677 + "__id__": 1702 }, { - "__id__": 1679 + "__id__": 1704 }, { - "__id__": 1681 + "__id__": 1706 } ], "_prefab": { - "__id__": 1683 + "__id__": 1708 }, "_lpos": { "__type__": "cc.Vec3", @@ -37132,6 +37135,585 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "new_hero", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 1674 + }, + { + "__id__": 1680 + }, + { + "__id__": 1686 + } + ], + "_active": true, + "_components": [ + { + "__id__": 1692 + }, + { + "__id__": 1694 + } + ], + "_prefab": { + "__id__": 1697 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 267.577, + "y": 451.12, + "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": "CardFrame04_FocusGlow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1673 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1675 + }, + { + "__id__": 1677 + } + ], + "_prefab": { + "__id__": 1679 + }, + "_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.5, + "y": 1.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__": 1674 + }, + "_enabled": true, + "__prefab": { + "__id__": 1676 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 108, + "height": 108 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9efaTupMpPz43YhOiJk5/b" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1674 + }, + "_enabled": true, + "__prefab": { + "__id__": 1678 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 235, + "g": 235, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "260d01c4-5936-4c90-8ff9-b892c60b2e48@b1490", + "__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": "28U54/oqRGC7bvANPjb8ea" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "47NflqgjZBGoex7+sUdMW9", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Button_Circle122", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1673 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1681 + }, + { + "__id__": 1683 + } + ], + "_prefab": { + "__id__": 1685 + }, + "_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__": 1680 + }, + "_enabled": true, + "__prefab": { + "__id__": 1682 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 122 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "27kxq4ICNCQ5BBlaERGpJq" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1680 + }, + "_enabled": true, + "__prefab": { + "__id__": 1684 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8fbdd", + "__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": "c8+q+BUblB8KJNwIk6H12H" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e4WqJJnc1MTpKSAviSZlKN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "userinfo_icon_crown", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1673 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1687 + }, + { + "__id__": 1689 + } + ], + "_prefab": { + "__id__": 1691 + }, + "_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__": 1686 + }, + "_enabled": true, + "__prefab": { + "__id__": 1688 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 59, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "439vi3I/xIZZFTpUqPboRI" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1686 + }, + "_enabled": true, + "__prefab": { + "__id__": 1690 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8e30d", + "__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": "06Y3fUf9pB1bM/beua4Sz0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "43FRDo5XJGSYDDUhmQM8WA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1673 + }, + "_enabled": true, + "__prefab": { + "__id__": 1693 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d5CQJjK6hOJaKNpSKEnR5O" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1673 + }, + "_enabled": true, + "__prefab": { + "__id__": 1695 + }, + "clickEvents": [ + { + "__id__": 1696 + } + ], + "_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": "b1qKz9XS5Py5SUSF+VAeJ4" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 2 + }, + "component": "", + "_componentId": "e7482dUVpJEJZzHkqJl1ZWP", + "handler": "call_friend_card", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1eCW+sEG5LQK3A19Z0Uhth", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -37142,7 +37724,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1674 + "__id__": 1699 }, "_contentSize": { "__type__": "cc.Size", @@ -37170,7 +37752,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1676 + "__id__": 1701 }, "_alignFlags": 21, "_target": null, @@ -37206,7 +37788,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1678 + "__id__": 1703 }, "_id": "" }, @@ -37224,7 +37806,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1680 + "__id__": 1705 }, "_id": "" }, @@ -37242,7 +37824,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1682 + "__id__": 1707 }, "_id": "" }, @@ -37273,29 +37855,29 @@ }, "_children": [ { - "__id__": 1685 + "__id__": 1710 }, { - "__id__": 1693 + "__id__": 1718 } ], "_active": false, "_components": [ { - "__id__": 1735 + "__id__": 1760 }, { - "__id__": 1737 + "__id__": 1762 }, { - "__id__": 1739 + "__id__": 1764 }, { - "__id__": 1741 + "__id__": 1766 } ], "_prefab": { - "__id__": 1743 + "__id__": 1768 }, "_lpos": { "__type__": "cc.Vec3", @@ -37332,23 +37914,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1684 + "__id__": 1709 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1686 + "__id__": 1711 }, { - "__id__": 1688 + "__id__": 1713 }, { - "__id__": 1690 + "__id__": 1715 } ], "_prefab": { - "__id__": 1692 + "__id__": 1717 }, "_lpos": { "__type__": "cc.Vec3", @@ -37385,11 +37967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1685 + "__id__": 1710 }, "_enabled": true, "__prefab": { - "__id__": 1687 + "__id__": 1712 }, "_contentSize": { "__type__": "cc.Size", @@ -37413,11 +37995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1685 + "__id__": 1710 }, "_enabled": true, "__prefab": { - "__id__": 1689 + "__id__": 1714 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -37458,11 +38040,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1685 + "__id__": 1710 }, "_enabled": true, "__prefab": { - "__id__": 1691 + "__id__": 1716 }, "_alignFlags": 45, "_target": null, @@ -37507,27 +38089,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1684 + "__id__": 1709 }, "_children": [ { - "__id__": 1694 + "__id__": 1719 } ], "_active": true, "_components": [ { - "__id__": 1728 + "__id__": 1753 }, { - "__id__": 1730 + "__id__": 1755 }, { - "__id__": 1732 + "__id__": 1757 } ], "_prefab": { - "__id__": 1734 + "__id__": 1759 }, "_lpos": { "__type__": "cc.Vec3", @@ -37564,33 +38146,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1693 + "__id__": 1718 }, "_children": [ { - "__id__": 1695 + "__id__": 1720 }, { - "__id__": 1701 + "__id__": 1726 }, { - "__id__": 1710 + "__id__": 1735 }, { - "__id__": 1716 + "__id__": 1741 } ], "_active": true, "_components": [ { - "__id__": 1722 + "__id__": 1747 }, { - "__id__": 1724 + "__id__": 1749 } ], "_prefab": { - "__id__": 1727 + "__id__": 1752 }, "_lpos": { "__type__": "cc.Vec3", @@ -37627,20 +38209,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1694 + "__id__": 1719 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1696 + "__id__": 1721 }, { - "__id__": 1698 + "__id__": 1723 } ], "_prefab": { - "__id__": 1700 + "__id__": 1725 }, "_lpos": { "__type__": "cc.Vec3", @@ -37677,11 +38259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1695 + "__id__": 1720 }, "_enabled": true, "__prefab": { - "__id__": 1697 + "__id__": 1722 }, "_contentSize": { "__type__": "cc.Size", @@ -37705,11 +38287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1695 + "__id__": 1720 }, "_enabled": true, "__prefab": { - "__id__": 1699 + "__id__": 1724 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -37761,17 +38343,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1694 + "__id__": 1719 }, "_prefab": { - "__id__": 1702 + "__id__": 1727 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1701 + "__id__": 1726 }, "asset": { "__uuid__": "915a4408-90ea-4c30-9974-05d96c0c27f1", @@ -37779,7 +38361,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 1703 + "__id__": 1728 }, "targetOverrides": null }, @@ -37793,19 +38375,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1704 + "__id__": 1729 }, { - "__id__": 1706 + "__id__": 1731 }, { - "__id__": 1707 + "__id__": 1732 }, { - "__id__": 1708 + "__id__": 1733 }, { - "__id__": 1709 + "__id__": 1734 } ], "removedComponents": [] @@ -37813,7 +38395,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1705 + "__id__": 1730 }, "propertyPath": [ "_name" @@ -37829,7 +38411,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1705 + "__id__": 1730 }, "propertyPath": [ "_lpos" @@ -37844,7 +38426,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1705 + "__id__": 1730 }, "propertyPath": [ "_lrot" @@ -37860,7 +38442,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1705 + "__id__": 1730 }, "propertyPath": [ "_euler" @@ -37875,7 +38457,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1705 + "__id__": 1730 }, "propertyPath": [ "_active" @@ -37888,20 +38470,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1694 + "__id__": 1719 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1711 + "__id__": 1736 }, { - "__id__": 1713 + "__id__": 1738 } ], "_prefab": { - "__id__": 1715 + "__id__": 1740 }, "_lpos": { "__type__": "cc.Vec3", @@ -37938,11 +38520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1710 + "__id__": 1735 }, "_enabled": true, "__prefab": { - "__id__": 1712 + "__id__": 1737 }, "_contentSize": { "__type__": "cc.Size", @@ -37966,11 +38548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1710 + "__id__": 1735 }, "_enabled": true, "__prefab": { - "__id__": 1714 + "__id__": 1739 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -38024,20 +38606,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1694 + "__id__": 1719 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1717 + "__id__": 1742 }, { - "__id__": 1719 + "__id__": 1744 } ], "_prefab": { - "__id__": 1721 + "__id__": 1746 }, "_lpos": { "__type__": "cc.Vec3", @@ -38074,11 +38656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1716 + "__id__": 1741 }, "_enabled": true, "__prefab": { - "__id__": 1718 + "__id__": 1743 }, "_contentSize": { "__type__": "cc.Size", @@ -38102,11 +38684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1716 + "__id__": 1741 }, "_enabled": true, "__prefab": { - "__id__": 1720 + "__id__": 1745 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -38183,11 +38765,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1694 + "__id__": 1719 }, "_enabled": true, "__prefab": { - "__id__": 1723 + "__id__": 1748 }, "_contentSize": { "__type__": "cc.Size", @@ -38211,15 +38793,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1694 + "__id__": 1719 }, "_enabled": true, "__prefab": { - "__id__": 1725 + "__id__": 1750 }, "clickEvents": [ { - "__id__": 1726 + "__id__": 1751 } ], "_interactable": true, @@ -38259,7 +38841,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 1694 + "__id__": 1719 }, "_id": "" }, @@ -38270,7 +38852,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 1684 + "__id__": 1709 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -38296,11 +38878,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1693 + "__id__": 1718 }, "_enabled": true, "__prefab": { - "__id__": 1729 + "__id__": 1754 }, "_contentSize": { "__type__": "cc.Size", @@ -38324,11 +38906,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1693 + "__id__": 1718 }, "_enabled": false, "__prefab": { - "__id__": 1731 + "__id__": 1756 }, "_resizeMode": 0, "_layoutType": 0, @@ -38362,11 +38944,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1693 + "__id__": 1718 }, "_enabled": true, "__prefab": { - "__id__": 1733 + "__id__": 1758 }, "_alignFlags": 18, "_target": null, @@ -38411,11 +38993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1684 + "__id__": 1709 }, "_enabled": true, "__prefab": { - "__id__": 1736 + "__id__": 1761 }, "_contentSize": { "__type__": "cc.Size", @@ -38439,11 +39021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1684 + "__id__": 1709 }, "_enabled": true, "__prefab": { - "__id__": 1738 + "__id__": 1763 }, "_alignFlags": 20, "_target": null, @@ -38475,11 +39057,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1684 + "__id__": 1709 }, "_enabled": true, "__prefab": { - "__id__": 1740 + "__id__": 1765 }, "_id": "" }, @@ -38493,11 +39075,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1684 + "__id__": 1709 }, "_enabled": true, "__prefab": { - "__id__": 1742 + "__id__": 1767 }, "_alignFlags": 45, "_target": null, @@ -38546,23 +39128,23 @@ }, "_children": [ { - "__id__": 1745 + "__id__": 1770 } ], "_active": false, "_components": [ { - "__id__": 1759 + "__id__": 1784 }, { - "__id__": 1761 + "__id__": 1786 }, { - "__id__": 1763 + "__id__": 1788 } ], "_prefab": { - "__id__": 1765 + "__id__": 1790 }, "_lpos": { "__type__": "cc.Vec3", @@ -38599,27 +39181,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1744 + "__id__": 1769 }, "_children": [ { - "__id__": 1746 + "__id__": 1771 } ], "_active": true, "_components": [ { - "__id__": 1752 + "__id__": 1777 }, { - "__id__": 1754 + "__id__": 1779 }, { - "__id__": 1756 + "__id__": 1781 } ], "_prefab": { - "__id__": 1758 + "__id__": 1783 }, "_lpos": { "__type__": "cc.Vec3", @@ -38656,20 +39238,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1745 + "__id__": 1770 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1747 + "__id__": 1772 }, { - "__id__": 1749 + "__id__": 1774 } ], "_prefab": { - "__id__": 1751 + "__id__": 1776 }, "_lpos": { "__type__": "cc.Vec3", @@ -38706,11 +39288,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1746 + "__id__": 1771 }, "_enabled": true, "__prefab": { - "__id__": 1748 + "__id__": 1773 }, "_contentSize": { "__type__": "cc.Size", @@ -38734,11 +39316,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1746 + "__id__": 1771 }, "_enabled": true, "__prefab": { - "__id__": 1750 + "__id__": 1775 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -38815,11 +39397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1745 + "__id__": 1770 }, "_enabled": true, "__prefab": { - "__id__": 1753 + "__id__": 1778 }, "_contentSize": { "__type__": "cc.Size", @@ -38843,11 +39425,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1745 + "__id__": 1770 }, "_enabled": true, "__prefab": { - "__id__": 1755 + "__id__": 1780 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -38888,11 +39470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1745 + "__id__": 1770 }, "_enabled": true, "__prefab": { - "__id__": 1757 + "__id__": 1782 }, "_alignFlags": 45, "_target": null, @@ -38937,11 +39519,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1744 + "__id__": 1769 }, "_enabled": true, "__prefab": { - "__id__": 1760 + "__id__": 1785 }, "_contentSize": { "__type__": "cc.Size", @@ -38965,11 +39547,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1744 + "__id__": 1769 }, "_enabled": true, "__prefab": { - "__id__": 1762 + "__id__": 1787 }, "_alignFlags": 45, "_target": null, @@ -39001,11 +39583,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1744 + "__id__": 1769 }, "_enabled": true, "__prefab": { - "__id__": 1764 + "__id__": 1789 }, "_id": "" }, @@ -39036,35 +39618,35 @@ }, "_children": [ { - "__id__": 1767 + "__id__": 1792 }, { - "__id__": 1807 + "__id__": 1832 }, { - "__id__": 1847 + "__id__": 1872 }, { - "__id__": 1887 + "__id__": 1912 }, { - "__id__": 1927 + "__id__": 1952 } ], "_active": false, "_components": [ { - "__id__": 1967 + "__id__": 1992 }, { - "__id__": 1969 + "__id__": 1994 }, { - "__id__": 1971 + "__id__": 1996 } ], "_prefab": { - "__id__": 1973 + "__id__": 1998 }, "_lpos": { "__type__": "cc.Vec3", @@ -39101,33 +39683,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1766 + "__id__": 1791 }, "_children": [ { - "__id__": 1768 + "__id__": 1793 }, { - "__id__": 1774 + "__id__": 1799 }, { - "__id__": 1780 + "__id__": 1805 }, { - "__id__": 1790 + "__id__": 1815 } ], "_active": true, "_components": [ { - "__id__": 1802 + "__id__": 1827 }, { - "__id__": 1804 + "__id__": 1829 } ], "_prefab": { - "__id__": 1806 + "__id__": 1831 }, "_lpos": { "__type__": "cc.Vec3", @@ -39164,20 +39746,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1767 + "__id__": 1792 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1769 + "__id__": 1794 }, { - "__id__": 1771 + "__id__": 1796 } ], "_prefab": { - "__id__": 1773 + "__id__": 1798 }, "_lpos": { "__type__": "cc.Vec3", @@ -39214,11 +39796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1768 + "__id__": 1793 }, "_enabled": true, "__prefab": { - "__id__": 1770 + "__id__": 1795 }, "_contentSize": { "__type__": "cc.Size", @@ -39242,11 +39824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1768 + "__id__": 1793 }, "_enabled": true, "__prefab": { - "__id__": 1772 + "__id__": 1797 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -39300,20 +39882,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1767 + "__id__": 1792 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1775 + "__id__": 1800 }, { - "__id__": 1777 + "__id__": 1802 } ], "_prefab": { - "__id__": 1779 + "__id__": 1804 }, "_lpos": { "__type__": "cc.Vec3", @@ -39350,11 +39932,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1774 + "__id__": 1799 }, "_enabled": true, "__prefab": { - "__id__": 1776 + "__id__": 1801 }, "_contentSize": { "__type__": "cc.Size", @@ -39378,11 +39960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1774 + "__id__": 1799 }, "_enabled": true, "__prefab": { - "__id__": 1778 + "__id__": 1803 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -39436,26 +40018,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1767 + "__id__": 1792 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1781 + "__id__": 1806 }, { - "__id__": 1783 + "__id__": 1808 }, { - "__id__": 1785 + "__id__": 1810 }, { - "__id__": 1787 + "__id__": 1812 } ], "_prefab": { - "__id__": 1789 + "__id__": 1814 }, "_lpos": { "__type__": "cc.Vec3", @@ -39492,11 +40074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1780 + "__id__": 1805 }, "_enabled": true, "__prefab": { - "__id__": 1782 + "__id__": 1807 }, "_contentSize": { "__type__": "cc.Size", @@ -39520,11 +40102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1780 + "__id__": 1805 }, "_enabled": true, "__prefab": { - "__id__": 1784 + "__id__": 1809 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -39588,11 +40170,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1780 + "__id__": 1805 }, "_enabled": true, "__prefab": { - "__id__": 1786 + "__id__": 1811 }, "_id": "" }, @@ -39606,11 +40188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1780 + "__id__": 1805 }, "_enabled": true, "__prefab": { - "__id__": 1788 + "__id__": 1813 }, "templateMode": true, "watchPath": "data.role.gold", @@ -39643,24 +40225,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1767 + "__id__": 1792 }, "_children": [ { - "__id__": 1791 + "__id__": 1816 } ], "_active": false, "_components": [ { - "__id__": 1797 + "__id__": 1822 }, { - "__id__": 1799 + "__id__": 1824 } ], "_prefab": { - "__id__": 1801 + "__id__": 1826 }, "_lpos": { "__type__": "cc.Vec3", @@ -39697,20 +40279,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1790 + "__id__": 1815 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1792 + "__id__": 1817 }, { - "__id__": 1794 + "__id__": 1819 } ], "_prefab": { - "__id__": 1796 + "__id__": 1821 }, "_lpos": { "__type__": "cc.Vec3", @@ -39747,11 +40329,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1791 + "__id__": 1816 }, "_enabled": true, "__prefab": { - "__id__": 1793 + "__id__": 1818 }, "_contentSize": { "__type__": "cc.Size", @@ -39775,11 +40357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1791 + "__id__": 1816 }, "_enabled": true, "__prefab": { - "__id__": 1795 + "__id__": 1820 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -39833,11 +40415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1790 + "__id__": 1815 }, "_enabled": true, "__prefab": { - "__id__": 1798 + "__id__": 1823 }, "_contentSize": { "__type__": "cc.Size", @@ -39861,11 +40443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1790 + "__id__": 1815 }, "_enabled": true, "__prefab": { - "__id__": 1800 + "__id__": 1825 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -39919,11 +40501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1767 + "__id__": 1792 }, "_enabled": true, "__prefab": { - "__id__": 1803 + "__id__": 1828 }, "_contentSize": { "__type__": "cc.Size", @@ -39947,11 +40529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1767 + "__id__": 1792 }, "_enabled": true, "__prefab": { - "__id__": 1805 + "__id__": 1830 }, "_alignFlags": 12, "_target": null, @@ -39996,33 +40578,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1766 + "__id__": 1791 }, "_children": [ { - "__id__": 1808 + "__id__": 1833 }, { - "__id__": 1814 + "__id__": 1839 }, { - "__id__": 1820 + "__id__": 1845 }, { - "__id__": 1830 + "__id__": 1855 } ], "_active": false, "_components": [ { - "__id__": 1842 + "__id__": 1867 }, { - "__id__": 1844 + "__id__": 1869 } ], "_prefab": { - "__id__": 1846 + "__id__": 1871 }, "_lpos": { "__type__": "cc.Vec3", @@ -40059,20 +40641,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1807 + "__id__": 1832 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1809 + "__id__": 1834 }, { - "__id__": 1811 + "__id__": 1836 } ], "_prefab": { - "__id__": 1813 + "__id__": 1838 }, "_lpos": { "__type__": "cc.Vec3", @@ -40109,11 +40691,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1808 + "__id__": 1833 }, "_enabled": true, "__prefab": { - "__id__": 1810 + "__id__": 1835 }, "_contentSize": { "__type__": "cc.Size", @@ -40137,11 +40719,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1808 + "__id__": 1833 }, "_enabled": true, "__prefab": { - "__id__": 1812 + "__id__": 1837 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -40195,20 +40777,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1807 + "__id__": 1832 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1815 + "__id__": 1840 }, { - "__id__": 1817 + "__id__": 1842 } ], "_prefab": { - "__id__": 1819 + "__id__": 1844 }, "_lpos": { "__type__": "cc.Vec3", @@ -40245,11 +40827,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1814 + "__id__": 1839 }, "_enabled": true, "__prefab": { - "__id__": 1816 + "__id__": 1841 }, "_contentSize": { "__type__": "cc.Size", @@ -40273,11 +40855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1814 + "__id__": 1839 }, "_enabled": true, "__prefab": { - "__id__": 1818 + "__id__": 1843 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -40331,26 +40913,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1807 + "__id__": 1832 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1821 + "__id__": 1846 }, { - "__id__": 1823 + "__id__": 1848 }, { - "__id__": 1825 + "__id__": 1850 }, { - "__id__": 1827 + "__id__": 1852 } ], "_prefab": { - "__id__": 1829 + "__id__": 1854 }, "_lpos": { "__type__": "cc.Vec3", @@ -40387,11 +40969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1820 + "__id__": 1845 }, "_enabled": true, "__prefab": { - "__id__": 1822 + "__id__": 1847 }, "_contentSize": { "__type__": "cc.Size", @@ -40415,11 +40997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1820 + "__id__": 1845 }, "_enabled": true, "__prefab": { - "__id__": 1824 + "__id__": 1849 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -40483,11 +41065,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1820 + "__id__": 1845 }, "_enabled": true, "__prefab": { - "__id__": 1826 + "__id__": 1851 }, "_id": "" }, @@ -40501,11 +41083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1820 + "__id__": 1845 }, "_enabled": true, "__prefab": { - "__id__": 1828 + "__id__": 1853 }, "templateMode": true, "watchPath": "data.role.gold", @@ -40538,24 +41120,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1807 + "__id__": 1832 }, "_children": [ { - "__id__": 1831 + "__id__": 1856 } ], "_active": false, "_components": [ { - "__id__": 1837 + "__id__": 1862 }, { - "__id__": 1839 + "__id__": 1864 } ], "_prefab": { - "__id__": 1841 + "__id__": 1866 }, "_lpos": { "__type__": "cc.Vec3", @@ -40592,20 +41174,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1830 + "__id__": 1855 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1832 + "__id__": 1857 }, { - "__id__": 1834 + "__id__": 1859 } ], "_prefab": { - "__id__": 1836 + "__id__": 1861 }, "_lpos": { "__type__": "cc.Vec3", @@ -40642,11 +41224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1831 + "__id__": 1856 }, "_enabled": true, "__prefab": { - "__id__": 1833 + "__id__": 1858 }, "_contentSize": { "__type__": "cc.Size", @@ -40670,11 +41252,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1831 + "__id__": 1856 }, "_enabled": true, "__prefab": { - "__id__": 1835 + "__id__": 1860 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -40728,11 +41310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1830 + "__id__": 1855 }, "_enabled": true, "__prefab": { - "__id__": 1838 + "__id__": 1863 }, "_contentSize": { "__type__": "cc.Size", @@ -40756,11 +41338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1830 + "__id__": 1855 }, "_enabled": true, "__prefab": { - "__id__": 1840 + "__id__": 1865 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -40814,11 +41396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1807 + "__id__": 1832 }, "_enabled": true, "__prefab": { - "__id__": 1843 + "__id__": 1868 }, "_contentSize": { "__type__": "cc.Size", @@ -40842,11 +41424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1807 + "__id__": 1832 }, "_enabled": true, "__prefab": { - "__id__": 1845 + "__id__": 1870 }, "_alignFlags": 12, "_target": null, @@ -40891,33 +41473,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1766 + "__id__": 1791 }, "_children": [ { - "__id__": 1848 + "__id__": 1873 }, { - "__id__": 1854 + "__id__": 1879 }, { - "__id__": 1860 + "__id__": 1885 }, { - "__id__": 1870 + "__id__": 1895 } ], "_active": false, "_components": [ { - "__id__": 1882 + "__id__": 1907 }, { - "__id__": 1884 + "__id__": 1909 } ], "_prefab": { - "__id__": 1886 + "__id__": 1911 }, "_lpos": { "__type__": "cc.Vec3", @@ -40954,20 +41536,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1847 + "__id__": 1872 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1849 + "__id__": 1874 }, { - "__id__": 1851 + "__id__": 1876 } ], "_prefab": { - "__id__": 1853 + "__id__": 1878 }, "_lpos": { "__type__": "cc.Vec3", @@ -41004,11 +41586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1848 + "__id__": 1873 }, "_enabled": true, "__prefab": { - "__id__": 1850 + "__id__": 1875 }, "_contentSize": { "__type__": "cc.Size", @@ -41032,11 +41614,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1848 + "__id__": 1873 }, "_enabled": true, "__prefab": { - "__id__": 1852 + "__id__": 1877 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -41090,20 +41672,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1847 + "__id__": 1872 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1855 + "__id__": 1880 }, { - "__id__": 1857 + "__id__": 1882 } ], "_prefab": { - "__id__": 1859 + "__id__": 1884 }, "_lpos": { "__type__": "cc.Vec3", @@ -41140,11 +41722,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1854 + "__id__": 1879 }, "_enabled": true, "__prefab": { - "__id__": 1856 + "__id__": 1881 }, "_contentSize": { "__type__": "cc.Size", @@ -41168,11 +41750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1854 + "__id__": 1879 }, "_enabled": true, "__prefab": { - "__id__": 1858 + "__id__": 1883 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -41226,26 +41808,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1847 + "__id__": 1872 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1861 + "__id__": 1886 }, { - "__id__": 1863 + "__id__": 1888 }, { - "__id__": 1865 + "__id__": 1890 }, { - "__id__": 1867 + "__id__": 1892 } ], "_prefab": { - "__id__": 1869 + "__id__": 1894 }, "_lpos": { "__type__": "cc.Vec3", @@ -41282,11 +41864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1860 + "__id__": 1885 }, "_enabled": true, "__prefab": { - "__id__": 1862 + "__id__": 1887 }, "_contentSize": { "__type__": "cc.Size", @@ -41310,11 +41892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1860 + "__id__": 1885 }, "_enabled": true, "__prefab": { - "__id__": 1864 + "__id__": 1889 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -41378,11 +41960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1860 + "__id__": 1885 }, "_enabled": true, "__prefab": { - "__id__": 1866 + "__id__": 1891 }, "_id": "" }, @@ -41396,11 +41978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1860 + "__id__": 1885 }, "_enabled": true, "__prefab": { - "__id__": 1868 + "__id__": 1893 }, "templateMode": true, "watchPath": "data.role.gold", @@ -41433,24 +42015,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1847 + "__id__": 1872 }, "_children": [ { - "__id__": 1871 + "__id__": 1896 } ], "_active": false, "_components": [ { - "__id__": 1877 + "__id__": 1902 }, { - "__id__": 1879 + "__id__": 1904 } ], "_prefab": { - "__id__": 1881 + "__id__": 1906 }, "_lpos": { "__type__": "cc.Vec3", @@ -41487,20 +42069,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1870 + "__id__": 1895 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1872 + "__id__": 1897 }, { - "__id__": 1874 + "__id__": 1899 } ], "_prefab": { - "__id__": 1876 + "__id__": 1901 }, "_lpos": { "__type__": "cc.Vec3", @@ -41537,11 +42119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1871 + "__id__": 1896 }, "_enabled": true, "__prefab": { - "__id__": 1873 + "__id__": 1898 }, "_contentSize": { "__type__": "cc.Size", @@ -41565,11 +42147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1871 + "__id__": 1896 }, "_enabled": true, "__prefab": { - "__id__": 1875 + "__id__": 1900 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -41623,11 +42205,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1870 + "__id__": 1895 }, "_enabled": true, "__prefab": { - "__id__": 1878 + "__id__": 1903 }, "_contentSize": { "__type__": "cc.Size", @@ -41651,11 +42233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1870 + "__id__": 1895 }, "_enabled": true, "__prefab": { - "__id__": 1880 + "__id__": 1905 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -41709,11 +42291,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1847 + "__id__": 1872 }, "_enabled": true, "__prefab": { - "__id__": 1883 + "__id__": 1908 }, "_contentSize": { "__type__": "cc.Size", @@ -41737,11 +42319,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1847 + "__id__": 1872 }, "_enabled": true, "__prefab": { - "__id__": 1885 + "__id__": 1910 }, "_alignFlags": 12, "_target": null, @@ -41786,33 +42368,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1766 + "__id__": 1791 }, "_children": [ { - "__id__": 1888 + "__id__": 1913 }, { - "__id__": 1894 + "__id__": 1919 }, { - "__id__": 1900 + "__id__": 1925 }, { - "__id__": 1910 + "__id__": 1935 } ], "_active": false, "_components": [ { - "__id__": 1922 + "__id__": 1947 }, { - "__id__": 1924 + "__id__": 1949 } ], "_prefab": { - "__id__": 1926 + "__id__": 1951 }, "_lpos": { "__type__": "cc.Vec3", @@ -41849,20 +42431,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1887 + "__id__": 1912 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1889 + "__id__": 1914 }, { - "__id__": 1891 + "__id__": 1916 } ], "_prefab": { - "__id__": 1893 + "__id__": 1918 }, "_lpos": { "__type__": "cc.Vec3", @@ -41899,11 +42481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1888 + "__id__": 1913 }, "_enabled": true, "__prefab": { - "__id__": 1890 + "__id__": 1915 }, "_contentSize": { "__type__": "cc.Size", @@ -41927,11 +42509,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1888 + "__id__": 1913 }, "_enabled": true, "__prefab": { - "__id__": 1892 + "__id__": 1917 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -41985,20 +42567,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1887 + "__id__": 1912 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1895 + "__id__": 1920 }, { - "__id__": 1897 + "__id__": 1922 } ], "_prefab": { - "__id__": 1899 + "__id__": 1924 }, "_lpos": { "__type__": "cc.Vec3", @@ -42035,11 +42617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1894 + "__id__": 1919 }, "_enabled": true, "__prefab": { - "__id__": 1896 + "__id__": 1921 }, "_contentSize": { "__type__": "cc.Size", @@ -42063,11 +42645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1894 + "__id__": 1919 }, "_enabled": true, "__prefab": { - "__id__": 1898 + "__id__": 1923 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -42121,26 +42703,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1887 + "__id__": 1912 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1901 + "__id__": 1926 }, { - "__id__": 1903 + "__id__": 1928 }, { - "__id__": 1905 + "__id__": 1930 }, { - "__id__": 1907 + "__id__": 1932 } ], "_prefab": { - "__id__": 1909 + "__id__": 1934 }, "_lpos": { "__type__": "cc.Vec3", @@ -42177,11 +42759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1900 + "__id__": 1925 }, "_enabled": true, "__prefab": { - "__id__": 1902 + "__id__": 1927 }, "_contentSize": { "__type__": "cc.Size", @@ -42205,11 +42787,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1900 + "__id__": 1925 }, "_enabled": true, "__prefab": { - "__id__": 1904 + "__id__": 1929 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -42273,11 +42855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1900 + "__id__": 1925 }, "_enabled": true, "__prefab": { - "__id__": 1906 + "__id__": 1931 }, "_id": "" }, @@ -42291,11 +42873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1900 + "__id__": 1925 }, "_enabled": true, "__prefab": { - "__id__": 1908 + "__id__": 1933 }, "templateMode": true, "watchPath": "data.role.gold", @@ -42328,24 +42910,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1887 + "__id__": 1912 }, "_children": [ { - "__id__": 1911 + "__id__": 1936 } ], "_active": false, "_components": [ { - "__id__": 1917 + "__id__": 1942 }, { - "__id__": 1919 + "__id__": 1944 } ], "_prefab": { - "__id__": 1921 + "__id__": 1946 }, "_lpos": { "__type__": "cc.Vec3", @@ -42382,20 +42964,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1910 + "__id__": 1935 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1912 + "__id__": 1937 }, { - "__id__": 1914 + "__id__": 1939 } ], "_prefab": { - "__id__": 1916 + "__id__": 1941 }, "_lpos": { "__type__": "cc.Vec3", @@ -42432,11 +43014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1911 + "__id__": 1936 }, "_enabled": true, "__prefab": { - "__id__": 1913 + "__id__": 1938 }, "_contentSize": { "__type__": "cc.Size", @@ -42460,11 +43042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1911 + "__id__": 1936 }, "_enabled": true, "__prefab": { - "__id__": 1915 + "__id__": 1940 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -42518,11 +43100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1910 + "__id__": 1935 }, "_enabled": true, "__prefab": { - "__id__": 1918 + "__id__": 1943 }, "_contentSize": { "__type__": "cc.Size", @@ -42546,11 +43128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1910 + "__id__": 1935 }, "_enabled": true, "__prefab": { - "__id__": 1920 + "__id__": 1945 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -42604,11 +43186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1887 + "__id__": 1912 }, "_enabled": true, "__prefab": { - "__id__": 1923 + "__id__": 1948 }, "_contentSize": { "__type__": "cc.Size", @@ -42632,11 +43214,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1887 + "__id__": 1912 }, "_enabled": true, "__prefab": { - "__id__": 1925 + "__id__": 1950 }, "_alignFlags": 12, "_target": null, @@ -42681,33 +43263,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1766 + "__id__": 1791 }, "_children": [ { - "__id__": 1928 + "__id__": 1953 }, { - "__id__": 1934 + "__id__": 1959 }, { - "__id__": 1940 + "__id__": 1965 }, { - "__id__": 1950 + "__id__": 1975 } ], "_active": false, "_components": [ { - "__id__": 1962 + "__id__": 1987 }, { - "__id__": 1964 + "__id__": 1989 } ], "_prefab": { - "__id__": 1966 + "__id__": 1991 }, "_lpos": { "__type__": "cc.Vec3", @@ -42744,20 +43326,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1927 + "__id__": 1952 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1929 + "__id__": 1954 }, { - "__id__": 1931 + "__id__": 1956 } ], "_prefab": { - "__id__": 1933 + "__id__": 1958 }, "_lpos": { "__type__": "cc.Vec3", @@ -42794,11 +43376,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1928 + "__id__": 1953 }, "_enabled": true, "__prefab": { - "__id__": 1930 + "__id__": 1955 }, "_contentSize": { "__type__": "cc.Size", @@ -42822,11 +43404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1928 + "__id__": 1953 }, "_enabled": true, "__prefab": { - "__id__": 1932 + "__id__": 1957 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -42880,20 +43462,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1927 + "__id__": 1952 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1935 + "__id__": 1960 }, { - "__id__": 1937 + "__id__": 1962 } ], "_prefab": { - "__id__": 1939 + "__id__": 1964 }, "_lpos": { "__type__": "cc.Vec3", @@ -42930,11 +43512,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1934 + "__id__": 1959 }, "_enabled": true, "__prefab": { - "__id__": 1936 + "__id__": 1961 }, "_contentSize": { "__type__": "cc.Size", @@ -42958,11 +43540,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1934 + "__id__": 1959 }, "_enabled": true, "__prefab": { - "__id__": 1938 + "__id__": 1963 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -43016,26 +43598,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1927 + "__id__": 1952 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1941 + "__id__": 1966 }, { - "__id__": 1943 + "__id__": 1968 }, { - "__id__": 1945 + "__id__": 1970 }, { - "__id__": 1947 + "__id__": 1972 } ], "_prefab": { - "__id__": 1949 + "__id__": 1974 }, "_lpos": { "__type__": "cc.Vec3", @@ -43072,11 +43654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1940 + "__id__": 1965 }, "_enabled": true, "__prefab": { - "__id__": 1942 + "__id__": 1967 }, "_contentSize": { "__type__": "cc.Size", @@ -43100,11 +43682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1940 + "__id__": 1965 }, "_enabled": true, "__prefab": { - "__id__": 1944 + "__id__": 1969 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -43168,11 +43750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1940 + "__id__": 1965 }, "_enabled": true, "__prefab": { - "__id__": 1946 + "__id__": 1971 }, "_id": "" }, @@ -43186,11 +43768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1940 + "__id__": 1965 }, "_enabled": true, "__prefab": { - "__id__": 1948 + "__id__": 1973 }, "templateMode": true, "watchPath": "data.role.gold", @@ -43223,24 +43805,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1927 + "__id__": 1952 }, "_children": [ { - "__id__": 1951 + "__id__": 1976 } ], "_active": false, "_components": [ { - "__id__": 1957 + "__id__": 1982 }, { - "__id__": 1959 + "__id__": 1984 } ], "_prefab": { - "__id__": 1961 + "__id__": 1986 }, "_lpos": { "__type__": "cc.Vec3", @@ -43277,20 +43859,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1950 + "__id__": 1975 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1952 + "__id__": 1977 }, { - "__id__": 1954 + "__id__": 1979 } ], "_prefab": { - "__id__": 1956 + "__id__": 1981 }, "_lpos": { "__type__": "cc.Vec3", @@ -43327,11 +43909,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1951 + "__id__": 1976 }, "_enabled": true, "__prefab": { - "__id__": 1953 + "__id__": 1978 }, "_contentSize": { "__type__": "cc.Size", @@ -43355,11 +43937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1951 + "__id__": 1976 }, "_enabled": true, "__prefab": { - "__id__": 1955 + "__id__": 1980 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -43413,11 +43995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1950 + "__id__": 1975 }, "_enabled": true, "__prefab": { - "__id__": 1958 + "__id__": 1983 }, "_contentSize": { "__type__": "cc.Size", @@ -43441,11 +44023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1950 + "__id__": 1975 }, "_enabled": true, "__prefab": { - "__id__": 1960 + "__id__": 1985 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -43499,11 +44081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1927 + "__id__": 1952 }, "_enabled": true, "__prefab": { - "__id__": 1963 + "__id__": 1988 }, "_contentSize": { "__type__": "cc.Size", @@ -43527,11 +44109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1927 + "__id__": 1952 }, "_enabled": true, "__prefab": { - "__id__": 1965 + "__id__": 1990 }, "_alignFlags": 12, "_target": null, @@ -43576,11 +44158,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1766 + "__id__": 1791 }, "_enabled": true, "__prefab": { - "__id__": 1968 + "__id__": 1993 }, "_contentSize": { "__type__": "cc.Size", @@ -43604,11 +44186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1766 + "__id__": 1791 }, "_enabled": true, "__prefab": { - "__id__": 1970 + "__id__": 1995 }, "_alignFlags": 41, "_target": null, @@ -43640,11 +44222,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1766 + "__id__": 1791 }, "_enabled": true, "__prefab": { - "__id__": 1972 + "__id__": 1997 }, "_resizeMode": 0, "_layoutType": 1, @@ -43695,7 +44277,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1975 + "__id__": 2000 }, "_contentSize": { "__type__": "cc.Size", @@ -43723,7 +44305,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1977 + "__id__": 2002 }, "_alignFlags": 45, "_target": null, @@ -43759,7 +44341,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1979 + "__id__": 2004 }, "_id": "" }, @@ -43780,7 +44362,7 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 1701 + "__id__": 1726 }, { "__id__": 1123 diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index d89d41d0..0553a038 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -150,17 +150,17 @@ export const SuperCards={ info:"攻击触发提高英雄/伙伴属性的效果,额外添加+1攻击力"}, 3002:{uuid:3002,name:"附魔宝典",quality:Quality.WHITE,path:"3002",type:SuperCardsType.SPECIAL,value1:1,value2:0,value3:0, info:"攻击触发高英雄/伙伴属性的效果,额外添加+1生命值"}, - 3101:{uuid:3101,name:"陨石术",quality:Quality.WHITE,path:"3101",type:SuperCardsType.AOE,value1:SkillSet[6019].uuid,value2:3,value3:0, + 3101:{uuid:3101,name:"陨石术",quality:Quality.GREEN,path:"3101",type:SuperCardsType.AOE,value1:SkillSet[6019].uuid,value2:3,value3:0, info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"}, - 3102:{uuid:3102,name:"冰刺",quality:Quality.WHITE,path:"3102",type:SuperCardsType.AOE,value1:SkillSet[6017].uuid,value2:3,value3:0, + 3102:{uuid:3102,name:"冰刺",quality:Quality.BLUE,path:"3102",type:SuperCardsType.AOE,value1:SkillSet[6017].uuid,value2:3,value3:0, info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"}, - 3103:{uuid:3103,name:"潮汐",quality:Quality.WHITE,path:"3103",type:SuperCardsType.AOE,value1:SkillSet[6018].uuid,value2:3,value3:0, + 3103:{uuid:3103,name:"潮汐",quality:Quality.BLUE,path:"3103",type:SuperCardsType.AOE,value1:SkillSet[6018].uuid,value2:3,value3:0, info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"}, - 3104:{uuid:3104,name:"龙卷风",quality:Quality.WHITE,path:"3104",type:SuperCardsType.AOE,value1:SkillSet[6013].uuid,value2:3,value3:0, + 3104:{uuid:3104,name:"龙卷风",quality:Quality.BLUE,path:"3104",type:SuperCardsType.AOE,value1:SkillSet[6013].uuid,value2:3,value3:0, info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"}, - 3105:{uuid:3105,name:"火球风暴",quality:Quality.WHITE,path:"3105",type:SuperCardsType.AOE,value1:SkillSet[6012].uuid,value2:3,value3:0, + 3105:{uuid:3105,name:"火球风暴",quality:Quality.PURPLE,path:"3105",type:SuperCardsType.AOE,value1:SkillSet[6012].uuid,value2:3,value3:0, info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"}, - 3106:{uuid:3106,name:"冰雨",quality:Quality.WHITE,path:"3106",type:SuperCardsType.AOE,value1:SkillSet[6020].uuid,value2:3,value3:0, + 3106:{uuid:3106,name:"冰雨",quality:Quality.PURPLE,path:"3106",type:SuperCardsType.AOE,value1:SkillSet[6020].uuid,value2:3,value3:0, info:"召唤大量火球攻击敌人,每个火球对敌人造成英雄攻击力的300%伤害"}, 3201:{uuid:3201,name:"极速充能",quality:Quality.WHITE,path:"3201",type:SuperCardsType.BUFF,value1:10,value2:100,value3:0, info:"你的英雄/伙伴接下来的10次普通攻击速度提升100%"}, diff --git a/assets/script/game/common/config/Mission.ts b/assets/script/game/common/config/Mission.ts index 36eea3a4..5c571291 100644 --- a/assets/script/game/common/config/Mission.ts +++ b/assets/script/game/common/config/Mission.ts @@ -68,6 +68,10 @@ export enum FightSet { ATK_ADD_GLOD=1,//金币增加 CRIT_DAMAGE=50,//暴击伤害 DOUBLE_ATK_RATE=100,//额外攻击默认概率 + GREEN_GOLD=1,//绿色金币 + BLUE_GOLD=2,//蓝色金币 + PURPLE_GOLD=3,//紫色金币 + ORANGE_GOLD=4,//橙色金币 // ATK_TO_ATK_RATIO=0.1, // ATK_TO_HP_RATIO=0.2, // ATK_TO_SHIELD_RATIO=2, diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 83877691..a244084e 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -1,4 +1,5 @@ import { v3 } from "cc" +import { Quality } from "./CardSet" /** * kind ：1:烈焰 2:寒冰 3:自然 4:暗影 5:神圣 @@ -31,7 +32,7 @@ export enum HeroFac { hero = 0, enemy = 1, } -export const HeroList = [5001,5002,5003,5004,5005,5006,5007,5008,5009,5010,5011] +export const HeroList = [5001,5002,5003,5004,5005,5006,5008,5009,5010,5011] export const MonList = [5201,5202,5203,5204,5205,5206,5216,5217,5218,5219,5220,5221,5222,5223,5224,5225,5226,5227] export const HeroSet = { Start_x:[-200,-260,-320], @@ -42,6 +43,13 @@ export const HeroPos={ 1:{pos:v3(-220,0,0)}, 2:{pos:v3(-150,0,0)}, } +export const HeroQuality = { + WHITE:1, + GREEN:2, + BLUE:3, + PURPLE:4, + ORANGE:5, +} export const MonSet = { 0:{pos:v3(350,0,0)}, 1:{pos:v3(400,0,0)}, @@ -55,92 +63,89 @@ export const MonSet = { 9:{pos:v3(800,0,0)}, } export const HeroInfo = { - 5001:{uuid:5001,name:"神圣守护",path:"k2", lv:3,kind:1,type:0,hp:50,ap:10,dis:700,a_cd:1, + 5001:{uuid:5001,name:"神圣守护",path:"k2", lv:1,kind:1,type:0,hp:50,ap:10,dis:700,a_cd:1,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5002:{uuid:5002,name:"幻影剑豪",path:"k1", lv:3,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1, + 5002:{uuid:5002,name:"幻影剑豪",path:"k1", lv:1,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5003:{uuid:5003,name:"战争领主",path:"k5", lv:3,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1, + 5003:{uuid:5003,name:"战争领主",path:"k5", lv:1,kind:2,type:0,hp:50,ap:10,dis:700,a_cd:1,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5004:{uuid:5004,name:"混沌法师",path:"zh1", lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5, + 5004:{uuid:5004,name:"混沌法师",path:"zh1", lv:1,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5005:{uuid:5005,name:"火焰法师",path:"zh2", lv:3,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5, + 5005:{uuid:5005,name:"火焰法师",path:"zh2", lv:1,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5006:{uuid:5006,name:"风暴精灵",path:"m4", lv:3,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5, + 5006:{uuid:5006,name:"风暴精灵",path:"m4", lv:1,kind:2,type:2,hp:50,ap:15,dis:700,a_cd:1.5,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5007:{uuid:5007,name:"生命圣者",path:"d1", lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5, + 5008:{uuid:5008,name:"战争祭祀",path:"d2", lv:1,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5008:{uuid:5008,name:"战争祭祀",path:"d2", lv:3,kind:2,type:2,hp:50,ap:10,dis:700,a_cd:1.5, - crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - - 5009:{uuid:5009,name:"暴风射手",path:"a5", lv:3,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2, + 5009:{uuid:5009,name:"暴风射手",path:"a5", lv:1,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6002],info:"说明"}, - 5010:{uuid:5010,name:"苍穹射手",path:"a3", lv:3,kind:1,type:1,hp:50,ap:15,dis:700,a_cd:1.2, + 5010:{uuid:5010,name:"苍穹射手",path:"a3", lv:1,kind:1,type:1,hp:50,ap:15,dis:700,a_cd:1.2,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6002],info:"说明"}, - 5011:{uuid:5011,name:"幽灵射手",path:"a4", lv:3,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2, + 5011:{uuid:5011,name:"幽灵射手",path:"a4", lv:1,kind:2,type:1,hp:50,ap:15,dis:700,a_cd:1.2,quality:HeroQuality.BLUE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6002],info:"说明"}, //怪物 - 5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5202:{uuid:5202,name:"兽人刺客",path:"mor2", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5202:{uuid:5202,name:"兽人刺客",path:"mor2", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5203:{uuid:5203,name:"兽人护卫",path:"mor3", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2, + 5203:{uuid:5203,name:"兽人护卫",path:"mor3", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5204:{uuid:5204,name:"石卫", path:"mgem1",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5204:{uuid:5204,name:"石卫", path:"mgem1",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5205:{uuid:5205,name:"土卫", path:"mgem2",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5205:{uuid:5205,name:"土卫", path:"mgem2",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5206:{uuid:5206,name:"树人", path:"mgem3",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5206:{uuid:5206,name:"树人", path:"mgem3",lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5216:{uuid:5216,name:"元素1", path:"my1", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5, + 5216:{uuid:5216,name:"元素1", path:"my1", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5217:{uuid:5217,name:"元素2", path:"my2", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5, + 5217:{uuid:5217,name:"元素2", path:"my2", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5218:{uuid:5218,name:"元素3", path:"my3", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5, + 5218:{uuid:5218,name:"元素3", path:"my3", lv:2,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1.5,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5219:{uuid:5219,name:"牛头战士",path:"mn1", lv:2,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5219:{uuid:5219,name:"牛头战士",path:"mn1", lv:2,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5220:{uuid:5220,name:"牛头战士",path:"mn2", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2, + 5220:{uuid:5220,name:"牛头战士",path:"mn2", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5221:{uuid:5221,name:"牛头战士",path:"mn3", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5221:{uuid:5221,name:"牛头战士",path:"mn3", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5222:{uuid:5222,name:"独眼巨人",path:"md1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5222:{uuid:5222,name:"独眼巨人",path:"md1", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5223:{uuid:5223,name:"独眼巨人",path:"md2", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1, + 5223:{uuid:5223,name:"独眼巨人",path:"md2", lv:1,kind:1,type:0,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5224:{uuid:5224,name:"独眼巨人",path:"md3", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2, + 5224:{uuid:5224,name:"独眼巨人",path:"md3", lv:1,kind:1,type:1,hp:200,ap:5,dis:400,a_cd:1.2,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5225:{uuid:5225,name:"精英独眼",path:"md4", lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1, + 5225:{uuid:5225,name:"精英独眼",path:"md4", lv:1,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5226:{uuid:5226,name:"精英牛头",path:"mn4", lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1, + 5226:{uuid:5226,name:"精英牛头",path:"mn4", lv:1,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"}, - 5227:{uuid:5227,name:"精英兽人",path:"mor4", lv:3,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1, + 5227:{uuid:5227,name:"精英兽人",path:"mor4", lv:1,kind:1,type:2,hp:200,ap:5,dis:400,a_cd:1,quality:HeroQuality.WHITE, crt:5,crt_d:0,crt_no:false,dod:0,dod_no:false,speed:30,skills:[6001],info:"说明"} }; diff --git a/assets/script/game/map/CardComp.ts b/assets/script/game/map/CardComp.ts index 472a63d8..cd45e350 100644 --- a/assets/script/game/map/CardComp.ts +++ b/assets/script/game/map/CardComp.ts @@ -11,6 +11,7 @@ import { smc } from "../common/SingletonModuleComp"; import { HeroSkillList, SkillSet } from "../common/config/SkillSet"; import { cardType, getRandomCardUUID, Quality, SuperCards } from "../common/config/CardSet"; import { EquipInfo } from "../common/config/Equips"; +import { FightSet } from "../common/config/Mission"; const { ccclass, property } = _decorator; @@ -21,11 +22,10 @@ export class CardComp extends CCComp { c_uuid:number=0; c_type:number=0; //1英雄,2 技能.3 装备 4.功能卡牌 is_used:boolean=false; - + cost_gold:number=0; onLoad(){ // this.on(GameEvent.HeroSelect,this.hero_select,this) // this.on(GameEvent.HeroSkillSelect,this.hero_skill_select,this) - // this.on(GameEvent.CardRefresh,this.rad,this) } start() { @@ -39,7 +39,7 @@ export class CardComp extends CCComp { hero_select(args: any){ this.c_type=cardType.HERO this.c_uuid=args.uuid - console.log("card hero_select c_uuid:"+this.c_uuid) + console.log("[cardcomp]:card hero_select c_uuid:"+this.c_uuid) this.show_hero(this.c_uuid) this.node.getChildByName("show").active=false this.node.getChildByName("anim").getChildByName("up").getComponent(Animation).play('carsup') @@ -50,7 +50,7 @@ export class CardComp extends CCComp { } hero_skill_select(args: any){ this.c_type=cardType.SKILL - console.log("card hero_skill_select",args) + console.log("[cardcomp]:card hero_skill_select",args) this.c_uuid=args.uuid this.node.getChildByName("show").active=false this.node.getChildByName("anim").getChildByName("up").getComponent(Animation).play('carsup') @@ -72,7 +72,7 @@ export class CardComp extends CCComp { }, 0.1); } func_select(args: any){ - console.log("card func_select",args) + console.log("[cardcomp]:card func_select",args) this.c_type=cardType.SPECIAL this.c_uuid=args.uuid this.node.getChildByName("show").active=false @@ -86,7 +86,7 @@ export class CardComp extends CCComp { random_select(){ let card =getRandomCardUUID() //随机获取卡牌类型 - console.log("rad 开始请求卡牌",card) + console.log("[cardcomp]:rad 开始请求卡牌",card) switch(card.type){ case cardType.HERO: this.hero_select(card) @@ -106,17 +106,8 @@ export class CardComp extends CCComp { show_skill(uuid:number){ let show=this.node.getChildByName("show") show.getChildByName("name").getChildByName("name").getComponent(Label).string=SkillSet[uuid].name - show.getChildByName("q1").active=SkillSet[uuid].quality==Quality.WHITE - show.getChildByName("q2").active=SkillSet[uuid].quality==Quality.GREEN - show.getChildByName("q3").active=SkillSet[uuid].quality==Quality.BLUE - show.getChildByName("q4").active=SkillSet[uuid].quality==Quality.PURPLE - show.getChildByName("q5").active=SkillSet[uuid].quality==Quality.ORANGE - show.getChildByName("mask").getChildByName("q1").active=SkillSet[uuid].quality==Quality.WHITE - show.getChildByName("mask").getChildByName("q2").active=SkillSet[uuid].quality==Quality.GREEN - show.getChildByName("mask").getChildByName("q3").active=SkillSet[uuid].quality==Quality.BLUE - show.getChildByName("mask").getChildByName("q4").active=SkillSet[uuid].quality==Quality.PURPLE - show.getChildByName("mask").getChildByName("q5").active=SkillSet[uuid].quality==Quality.ORANGE - this.do_card_bg_show() + this.do_card_bg_show(SkillSet[uuid].quality) + this.node.getChildByName("Button").getChildByName("coins").active=false var icon_path = "game/skills/skill_icon" resources.load(icon_path, SpriteAtlas, (err: any, atlas) => { const sprite = show.getChildByName("mask").getChildByName("skill").getComponent(Sprite); @@ -124,28 +115,20 @@ export class CardComp extends CCComp { }); show.getChildByName("info").getComponent(Label).string=SkillSet[uuid].info } + show_hero(uuid:number){ let show=this.node.getChildByName("show") - this.do_card_bg_show() + show.getChildByName("name").getChildByName("name").getComponent(Label).string=HeroInfo[uuid].name + this.do_card_bg_show(HeroInfo[uuid].quality) + this.node.getChildByName("Button").getChildByName("coins").active=false // show.getChildByName("ap").active=true // show.getChildByName("hp").active=true - show.getChildByName("name").getChildByName("name").getComponent(Label).string=HeroInfo[uuid].name // show.getChildByName("ap").getChildByName("num").getComponent(Label).string=HeroInfo[uuid].ap.toString() // show.getChildByName("hp").getChildByName("num").getComponent(Label).string=HeroInfo[uuid].hp.toString() // show.getChildByName("type").getChildByName("war").active=HeroInfo[uuid].type==0 // show.getChildByName("type").getChildByName("bow").active=HeroInfo[uuid].type==1 // show.getChildByName("type").getChildByName("mag").active=HeroInfo[uuid].type==2 // show.getChildByName("lv").getChildByName("num").getComponent(Label).string=HeroInfo[uuid].lv.toString() - show.getChildByName("q1").active=HeroInfo[uuid].quality==Quality.WHITE - show.getChildByName("q2").active=HeroInfo[uuid].quality==Quality.GREEN - show.getChildByName("q3").active=HeroInfo[uuid].quality==Quality.BLUE - show.getChildByName("q4").active=HeroInfo[uuid].quality==Quality.PURPLE - show.getChildByName("q5").active=HeroInfo[uuid].quality==Quality.ORANGE - show.getChildByName("mask").getChildByName("q1").active=HeroInfo[uuid].quality==Quality.WHITE - show.getChildByName("mask").getChildByName("q2").active=HeroInfo[uuid].quality==Quality.GREEN - show.getChildByName("mask").getChildByName("q3").active=HeroInfo[uuid].quality==Quality.BLUE - show.getChildByName("mask").getChildByName("q4").active=HeroInfo[uuid].quality==Quality.PURPLE - show.getChildByName("mask").getChildByName("q5").active=HeroInfo[uuid].quality==Quality.ORANGE var icon_path = "game/heros/herois" resources.load(icon_path, SpriteAtlas, (err: any, atlas) => { const sprite = show.getChildByName("mask").getChildByName("hero").getComponent(Sprite); @@ -154,20 +137,11 @@ export class CardComp extends CCComp { show.getChildByName("info").getComponent(Label).string=HeroInfo[uuid].info } + show_equip(uuid:number){ let show=this.node.getChildByName("show") - this.do_card_bg_show() - show.getChildByName("q1").active=EquipInfo[uuid].quality==Quality.WHITE - show.getChildByName("q2").active=EquipInfo[uuid].quality==Quality.GREEN - show.getChildByName("q3").active=EquipInfo[uuid].quality==Quality.BLUE - show.getChildByName("q4").active=EquipInfo[uuid].quality==Quality.PURPLE - show.getChildByName("q5").active=EquipInfo[uuid].quality==Quality.ORANGE - show.getChildByName("mask").getChildByName("q1").active=EquipInfo[uuid].quality==Quality.WHITE - show.getChildByName("mask").getChildByName("q2").active=EquipInfo[uuid].quality==Quality.GREEN - show.getChildByName("mask").getChildByName("q3").active=EquipInfo[uuid].quality==Quality.BLUE - show.getChildByName("mask").getChildByName("q4").active=EquipInfo[uuid].quality==Quality.PURPLE - show.getChildByName("mask").getChildByName("q5").active=EquipInfo[uuid].quality==Quality.ORANGE show.getChildByName("name").getChildByName("name").getComponent(Label).string=EquipInfo[uuid].name + this.do_card_bg_show(EquipInfo[uuid].quality) var icon_path = "game/heros/equips" resources.load(icon_path, SpriteAtlas, (err: any, atlas) => { const sprite = show.getChildByName("mask").getChildByName("equip").getComponent(Sprite); @@ -175,21 +149,11 @@ export class CardComp extends CCComp { }); show.getChildByName("info").getComponent(Label).string=EquipInfo[uuid].info } + show_func(uuid:number){ let show=this.node.getChildByName("show") - this.do_card_bg_show() - show.getChildByName("q1").active=SuperCards[uuid].quality==Quality.WHITE - show.getChildByName("q2").active=SuperCards[uuid].quality==Quality.GREEN - show.getChildByName("q3").active=SuperCards[uuid].quality==Quality.BLUE - show.getChildByName("q4").active=SuperCards[uuid].quality==Quality.PURPLE - show.getChildByName("q5").active=SuperCards[uuid].quality==Quality.ORANGE - show.getChildByName("mask").getChildByName("q1").active=SuperCards[uuid].quality==Quality.WHITE - show.getChildByName("mask").getChildByName("q2").active=SuperCards[uuid].quality==Quality.GREEN - show.getChildByName("mask").getChildByName("q3").active=SuperCards[uuid].quality==Quality.BLUE - show.getChildByName("mask").getChildByName("q4").active=SuperCards[uuid].quality==Quality.PURPLE - show.getChildByName("mask").getChildByName("q5").active=SuperCards[uuid].quality==Quality.ORANGE show.getChildByName("name").getChildByName("name").getComponent(Label).string=SuperCards[uuid].name - + this.do_card_bg_show(SuperCards[uuid].quality) var icon_path = "game/heros/cards" resources.load(icon_path, SpriteAtlas, (err: any, atlas) => { @@ -198,7 +162,8 @@ export class CardComp extends CCComp { }); show.getChildByName("info").getComponent(Label).string=SuperCards[uuid].info } - do_card_bg_show(){ + + do_card_bg_show(q:number=Quality.WHITE){ this.node.getChildByName("Button").getChildByName("Label").getComponent(Label).string=this.check_heros() let show=this.node.getChildByName("show") show.getChildByName("ap").active=false @@ -225,6 +190,36 @@ export class CardComp extends CCComp { show.getChildByName("type").getChildByName("name").getComponent(Label).string="特效" break } + show.getChildByName("q1").active=q==Quality.WHITE + show.getChildByName("q2").active=q==Quality.GREEN + show.getChildByName("q3").active=q==Quality.BLUE + show.getChildByName("q4").active=q==Quality.PURPLE + show.getChildByName("q5").active=q==Quality.ORANGE + show.getChildByName("mask").getChildByName("q1").active=q==Quality.WHITE + show.getChildByName("mask").getChildByName("q2").active=q==Quality.GREEN + show.getChildByName("mask").getChildByName("q3").active=q==Quality.BLUE + show.getChildByName("mask").getChildByName("q4").active=q==Quality.PURPLE + show.getChildByName("mask").getChildByName("q5").active=q==Quality.ORANGE + this.node.getChildByName("Button").getChildByName("coins").active=true + this.node.getChildByName("Button").getChildByName("coins").getChildByName("num").getComponent(Label).string=this.get_cost_gold(q).toString() + } + + get_cost_gold(quality:number){ + switch(quality){ + case Quality.GREEN: + return FightSet.GREEN_GOLD + + case Quality.BLUE: + return FightSet.BLUE_GOLD + + case Quality.PURPLE: + return FightSet.PURPLE_GOLD + + case Quality.ORANGE: + return FightSet.ORANGE_GOLD + default: + return 0 + } } check_heros(){ // let heros=ecs.query(ecs.allOf(HeroModelComp)) @@ -238,33 +233,45 @@ export class CardComp extends CCComp { // } return "购买" } + reset_card(){ + this.cost_gold=0 + this.c_type=0 + this.c_uuid=0 + this.is_used=false + } use_card(){ switch(this.c_type){ case cardType.HERO: - if(smc.vmdata.mission_data.gold< smc.vmdata.mission_data.call_gold){ - oops.gui.toast("金币不足", false); - return - } oops.message.dispatchEvent(GameEvent.UseHeroCard,{uuid:this.c_uuid}) - smc.vmdata.mission_data.gold-=smc.vmdata.mission_data.call_gold oops.message.dispatchEvent(GameEvent.CardsClose) break case cardType.SKILL: - console.log("use_card 技能卡") + console.log("[cardcomp]:use_card 技能卡") oops.message.dispatchEvent(GameEvent.UseSkillCard,{uuid:this.c_uuid}) oops.message.dispatchEvent(GameEvent.CardsClose) break case cardType.EQUIP: - console.log("use_card 装备卡") + console.log("[cardcomp]:use_card 装备卡") + if(!this.cost_gold_check()) return oops.message.dispatchEvent(GameEvent.EquipAdd,{uuid:this.c_uuid,type:EquipInfo[this.c_uuid].type}) oops.message.dispatchEvent(GameEvent.CardsClose) break case cardType.SPECIAL: - console.log("use_card 功能卡") + console.log("[cardcomp]:use_card 功能卡") + if(!this.cost_gold_check()) return oops.message.dispatchEvent(GameEvent.UseSpecialCard,{uuid:this.c_uuid}) oops.message.dispatchEvent(GameEvent.CardsClose) break } + this.reset_card() + } + cost_gold_check(){ + if(smc.vmdata.mission_data.gold< this.cost_gold){ + oops.gui.toast("[cardcomp]:金币不足", false); + return false + } + smc.vmdata.mission_data.gold-=this.cost_gold + return true } reset() { this.node.destroy(); diff --git a/assets/script/game/map/CardsComp.ts b/assets/script/game/map/CardsComp.ts index fef5b334..1b7552a3 100644 --- a/assets/script/game/map/CardsComp.ts +++ b/assets/script/game/map/CardsComp.ts @@ -185,8 +185,8 @@ export class CardsCompComp extends CCComp { //放弃选择 give_up_select(){ this.hide() - let mission_data=smc.vmdata.mission_data - mission_data.gold+=(mission_data.back_gold+mission_data.buff_back_gold) //返还金币 + // let mission_data=smc.vmdata.mission_data + // mission_data.gold+=(mission_data.back_gold+mission_data.buff_back_gold) //返还金币 } /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index 1242f929..d67d356c 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -160,6 +160,9 @@ export class MissionComp extends CCComp { mission_data.gold-=(mission_data.refresh_gold+mission_data.buff_refresh_gold) } + call_friend_card(){ + oops.message.dispatchEvent(GameEvent.HeroSelect) + } call_equip_card(){ let mission_data=smc.vmdata.mission_data if(mission_data.gold < (mission_data.refresh_gold+mission_data.buff_refresh_gold)){ diff --git a/assets/script/todo.md b/assets/script/todo.md index 028227e6..366c0b87 100644 --- a/assets/script/todo.md +++ b/assets/script/todo.md @@ -21,16 +21,17 @@ - [x] 每攻击n次后 增加1金币 - [x] 死亡 , 被攻击触发 2次 - [x] 暴击闪避 加入 -- [ ] 卡牌设定,卡牌icon -- [ ] 清理技能动画 及设置 +- [x] 卡牌设定,卡牌icon +- [x] 清理技能动画 及设置 +- [x] 技能需要重新设计 - [ ] 伙伴特殊技能设定 -- [ ] 技能需要重新设计 - [x] debuff 设定 易伤 为次数和伤害累加 - [ ] 冰冻 眩晕 功能更新 还需要检验 -- [ ] 分按钮三选一, 装备, 功能卡, 副将和技能,特殊情况下 触发更换和获取 -- [ ] 修改 发现都是1金币,加白色0金币 绿色+1金币,蓝色+2金币 +- [x] 分按钮三选一, 装备, 功能卡, +- [ ] 副将和技能,特殊情况下 触发更换和获取 +- [x] 修改 发现都是1金币,加白色0金币 绿色+1金币,蓝色+2金币 - [ ] 刷新免费1回合,看广告 再刷新一回 -- [ ] 广告拿紫色品质, 各品质装备 属性相差20% ,紫色品质 一定几率出现,出现后 10秒后消失 +- [ ] 广告拿紫色品质, 各品质装备 属性相差20% ,紫色品质 一定几率出现,出现后 10秒后消失 - [ ] 装备设定,借助AI - [ ] 添加玩家自主 激活额外boss 按钮,额外boss 有特殊事件 - [ ]