diff --git a/assets/resources/game/gui/hchip.prefab b/assets/resources/game/gui/hchip.prefab index 1da653e9..bbd3c14f 100644 --- a/assets/resources/game/gui/hchip.prefab +++ b/assets/resources/game/gui/hchip.prefab @@ -25,23 +25,26 @@ "__id__": 11 }, { - "__id__": 17 + "__id__": 20 }, { - "__id__": 37 + "__id__": 29 + }, + { + "__id__": 49 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 55 }, { - "__id__": 45 + "__id__": 57 } ], "_prefab": { - "__id__": 47 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -74,7 +77,7 @@ }, { "__type__": "cc.Node", - "_name": "bg", + "_name": "g1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -111,8 +114,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -139,8 +142,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 110, - "height": 110 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -170,13 +173,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 254, - "g": 214, - "b": 79, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0d78a", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b03fe", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -285,7 +288,7 @@ }, { "__type__": "cc.Node", - "_name": "CardFrame01_Glow", + "_name": "g2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -299,15 +302,18 @@ }, { "__id__": 14 + }, + { + "__id__": 16 } ], "_prefab": { - "__id__": 16 + "__id__": 19 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0.9769999999999754, - "y": 1.9529999999999745, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -319,8 +325,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.6, - "y": 0.6, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -347,8 +353,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 226, - "height": 226 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -359,7 +365,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "75T2T4wr1GhbC983WR3hQE" + "fileId": "a2FW64jg9Fep4zbM4g01/s" }, { "__type__": "cc.Sprite", @@ -384,12 +390,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a4212", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@62e5d", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -404,7 +410,79 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b7N2cM2+NGjZUfDwhbVmgC" + "fileId": "43VyOWizdIUaoyNE+qmdn+" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "clickEvents": [ + { + "__id__": 18 + } + ], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 0.95, + "_target": { + "__id__": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "71xU2LI+9NbJahof7X6yv0" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "dc8e3zoHO1Bq7v2cjEJd0Za", + "handler": "show_info", + "customEventData": "" }, { "__type__": "cc.PrefabInfo", @@ -414,7 +492,218 @@ "asset": { "__id__": 0 }, - "fileId": "196eXuSHBAJbzxF4vaPPTK", + "fileId": "e1GVTtYVJFipnCyI+IARAA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "g3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 21 + }, + { + "__id__": 23 + }, + { + "__id__": 25 + } + ], + "_prefab": { + "__id__": 28 + }, + "_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.7, + "y": 0.7, + "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__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 160 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12RmIrgsVFDKtiGitqnpzW" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_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@419a0", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "97WqgnsqZDcqAbAI5Ven6d" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "clickEvents": [ + { + "__id__": 27 + } + ], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 0.95, + "_target": { + "__id__": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "86Sm95lb9BSIidXsxtRW11" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "dc8e3zoHO1Bq7v2cjEJd0Za", + "handler": "show_info", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "73PtRDLM5E2LXGFIXpSiwS", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -429,26 +718,26 @@ }, "_children": [ { - "__id__": 18 + "__id__": 30 }, { - "__id__": 24 + "__id__": 36 } ], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 42 }, { - "__id__": 32 + "__id__": 44 }, { - "__id__": 34 + "__id__": 46 } ], "_prefab": { - "__id__": 36 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -485,20 +774,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 17 + "__id__": 29 }, "_children": [], "_active": true, "_components": [ { - "__id__": 19 + "__id__": 31 }, { - "__id__": 21 + "__id__": 33 } ], "_prefab": { - "__id__": 23 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -535,11 +824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -563,11 +852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 34 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -621,20 +910,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 17 + "__id__": 29 }, "_children": [], "_active": false, "_components": [ { - "__id__": 25 + "__id__": 37 }, { - "__id__": 27 + "__id__": 39 } ], "_prefab": { - "__id__": 29 + "__id__": 41 }, "_lpos": { "__type__": "cc.Vec3", @@ -671,11 +960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 38 }, "_contentSize": { "__type__": "cc.Size", @@ -699,11 +988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 40 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -757,16 +1046,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 43 }, "_contentSize": { "__type__": "cc.Size", - "width": 90, - "height": 90 + "width": 95, + "height": 95 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -785,13 +1074,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 45 }, - "_type": 3, + "_type": 0, "_inverted": false, "_segments": 64, "_alphaThreshold": 0.1, @@ -802,16 +1091,16 @@ "fileId": "2fhdxMbT1G1YFGRp1uFNb5" }, { - "__type__": "cc.Sprite", + "__type__": "cc.Graphics", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 47 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -823,28 +1112,29 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@54ac8", - "__expectedType__": "cc.SpriteFrame" + "_lineWidth": 1, + "_strokeColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 }, - "_type": 1, - "_fillType": 1, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "_lineJoin": 2, + "_lineCap": 0, + "_fillColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 }, - "_fillStart": 0.03, - "_fillRange": 1, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, + "_miterLimit": 10, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8fddGLxJhK9IaZrqfS4C0k" + "fileId": "d0h3UAYFZC76TAikPDQpkE" }, { "__type__": "cc.PrefabInfo", @@ -871,14 +1161,14 @@ "_active": true, "_components": [ { - "__id__": 38 + "__id__": 50 }, { - "__id__": 40 + "__id__": 52 } ], "_prefab": { - "__id__": 42 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", @@ -915,11 +1205,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -943,11 +1233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 53 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1028,7 +1318,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1056,7 +1346,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 58 }, "_id": "" }, diff --git a/assets/resources/game/heros/pd1.prefab b/assets/resources/game/heros/pld1.prefab similarity index 99% rename from assets/resources/game/heros/pd1.prefab rename to assets/resources/game/heros/pld1.prefab index f837fe50..fbe6e107 100644 --- a/assets/resources/game/heros/pd1.prefab +++ b/assets/resources/game/heros/pld1.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "pd1", + "_name": "pld1", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "pd1", + "_name": "pld1", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, diff --git a/assets/resources/game/heros/pd1.prefab.meta b/assets/resources/game/heros/pld1.prefab.meta similarity index 87% rename from assets/resources/game/heros/pd1.prefab.meta rename to assets/resources/game/heros/pld1.prefab.meta index 60a3bb09..82392b4d 100644 --- a/assets/resources/game/heros/pd1.prefab.meta +++ b/assets/resources/game/heros/pld1.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "pd1" + "syncNodeName": "pld1" } } diff --git a/assets/resources/game/heros/uiheros/pd1.prefab b/assets/resources/game/heros/uiheros/pld1.prefab similarity index 99% rename from assets/resources/game/heros/uiheros/pd1.prefab rename to assets/resources/game/heros/uiheros/pld1.prefab index 57a53613..f5626644 100644 --- a/assets/resources/game/heros/uiheros/pd1.prefab +++ b/assets/resources/game/heros/uiheros/pld1.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "pd1", + "_name": "pld1", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "pd1", + "_name": "pld1", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, diff --git a/assets/resources/game/heros/uiheros/pd1.prefab.meta b/assets/resources/game/heros/uiheros/pld1.prefab.meta similarity index 87% rename from assets/resources/game/heros/uiheros/pd1.prefab.meta rename to assets/resources/game/heros/uiheros/pld1.prefab.meta index d3394e77..2e1c1f3f 100644 --- a/assets/resources/game/heros/uiheros/pd1.prefab.meta +++ b/assets/resources/game/heros/uiheros/pld1.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "pd1" + "syncNodeName": "pld1" } } diff --git a/assets/resources/gui/element/item_info.prefab b/assets/resources/gui/element/item_info.prefab index be025579..4f7ffa4a 100644 --- a/assets/resources/gui/element/item_info.prefab +++ b/assets/resources/gui/element/item_info.prefab @@ -34,26 +34,26 @@ "__id__": 78 }, { - "__id__": 108 + "__id__": 87 }, { - "__id__": 133 + "__id__": 112 }, { - "__id__": 139 + "__id__": 118 } ], "_active": true, "_components": [ { - "__id__": 145 + "__id__": 124 }, { - "__id__": 147 + "__id__": 126 } ], "_prefab": { - "__id__": 149 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", @@ -407,7 +407,7 @@ "__id__": 45 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 51 @@ -1189,8 +1189,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 56, - "height": 62 + "width": 71, + "height": 65 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1231,7 +1231,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1833,674 +1833,128 @@ }, { "__type__": "cc.Node", - "_name": "hero", "_objFlags": 0, - "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [ + "_prefab": { + "__id__": 79 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 78 + }, + "asset": { + "__uuid__": "1331ab21-9111-4f46-b039-db7ab85aef63", + "__expectedType__": "cc.Prefab" + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": { + "__id__": 80 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "9fqktrZ6NN+7v4hXaEt9rb", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ { - "__id__": 79 + "__id__": 81 + }, + { + "__id__": 83 + }, + { + "__id__": 84 }, { "__id__": 85 - } - ], - "_active": true, - "_components": [ - { - "__id__": 105 - } - ], - "_prefab": { - "__id__": 107 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -278, - "y": 140, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 78 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 80 }, - { - "__id__": 82 - } - ], - "_prefab": { - "__id__": 84 - }, - "_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__": 79 - }, - "_enabled": true, - "__prefab": { - "__id__": 81 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 110, - "height": 110 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "96FpU0rTNMDIerCCc22UPP" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 79 - }, - "_enabled": true, - "__prefab": { - "__id__": 83 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 31, - "g": 255, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0d78a", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "15d1Q5nFxJuY0D8omUjTIV" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "caXVvoSWJEj5JWRM4u4cti", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "hero", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 78 - }, - "_children": [ { "__id__": 86 - }, - { - "__id__": 92 } ], - "_active": true, - "_components": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - } - ], - "_prefab": { - "__id__": 104 + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 82 }, - "_lpos": { + "propertyPath": [ + "_name" + ], + "value": "hero" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c46/YsCPVOJYA4mWEpNYRx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 82 + }, + "propertyPath": [ + "_lpos" + ], + "value": { "__type__": "cc.Vec3", - "x": 0, - "y": 0.1, + "x": -277.953, + "y": 139, "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 82 }, - "_lrot": { + "propertyPath": [ + "_lrot" + ], + "value": { "__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": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 85 + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 82 }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 87 - }, - { - "__id__": 89 - } + "propertyPath": [ + "_euler" ], - "_prefab": { - "__id__": 91 - }, - "_lpos": { + "value": { "__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__": 86 + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 82 }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 92, - "height": 114 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "fcZ28hLrNDRaTW42n/4JHP" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 86 - }, - "_enabled": true, - "__prefab": { - "__id__": 90 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "37051f6a-2eb0-4e6f-8e6b-c8aa7bc1066d@8c932", - "__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": "14bia/EZpAS5K433geS7N3" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b6X4cJoOFEVph2BEVx/Tbr", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "x", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 85 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 93 - }, - { - "__id__": 95 - } + "propertyPath": [ + "_active" ], - "_prefab": { - "__id__": 97 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0.40588235294126207, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.5882352941176471, - "y": 0.5882352941176471, - "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__": 92 - }, - "_enabled": true, - "__prefab": { - "__id__": 94 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 62, - "height": 84 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "28Gnxgl+lBNqrSU2MVARya" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 92 - }, - "_enabled": true, - "__prefab": { - "__id__": 96 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 243, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f9da9c46-8bab-4ee1-8e08-473a2fffc6f6@f9941", - "__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": "8ewnm4qv1Ao51mCAI1UAH6" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "78SXT5+mVKvo2cmwRZWBM+", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 85 - }, - "_enabled": true, - "__prefab": { - "__id__": 99 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 91, - "height": 91 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "30+/k73U1EdZPvY7m+FNEe" - }, - { - "__type__": "cc.Mask", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 85 - }, - "_enabled": true, - "__prefab": { - "__id__": 101 - }, - "_type": 3, - "_inverted": false, - "_segments": 64, - "_alphaThreshold": 0.1, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "24VAYvJ+pLc5cBK9bI0Vzi" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 85 - }, - "_enabled": true, - "__prefab": { - "__id__": 103 - }, - "_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@54ac8", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1e84xNQ/pOy6Y1fV6ZUFPu" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f2XAtNtiVNYYwDP4r+VbPq", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 78 - }, - "_enabled": true, - "__prefab": { - "__id__": 106 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "67a6qDfG9Kqrz19HnetTPj" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "98MQqtI6NDPpi/fUspsfAE", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + "value": false }, { "__type__": "cc.Node", @@ -2512,23 +1966,23 @@ }, "_children": [ { - "__id__": 109 + "__id__": 88 }, { - "__id__": 121 + "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 106 }, { - "__id__": 129 + "__id__": 108 } ], "_prefab": { - "__id__": 132 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -2563,17 +2017,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 108 + "__id__": 87 }, "_prefab": { - "__id__": 110 + "__id__": 89 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 109 + "__id__": 88 }, "asset": { "__uuid__": "915a4408-90ea-4c30-9974-05d96c0c27f1", @@ -2581,7 +2035,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 111 + "__id__": 90 }, "targetOverrides": null }, @@ -2595,22 +2049,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 112 + "__id__": 91 }, { - "__id__": 114 + "__id__": 93 }, { - "__id__": 115 + "__id__": 94 }, { - "__id__": 116 + "__id__": 95 }, { - "__id__": 117 + "__id__": 96 }, { - "__id__": 119 + "__id__": 98 } ], "removedComponents": [] @@ -2618,7 +2072,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 113 + "__id__": 92 }, "propertyPath": [ "_name" @@ -2634,7 +2088,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 113 + "__id__": 92 }, "propertyPath": [ "_lpos" @@ -2649,7 +2103,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 113 + "__id__": 92 }, "propertyPath": [ "_lrot" @@ -2665,7 +2119,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 113 + "__id__": 92 }, "propertyPath": [ "_euler" @@ -2680,7 +2134,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 118 + "__id__": 97 }, "propertyPath": [ "_lscale" @@ -2701,7 +2155,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 120 + "__id__": 99 }, "propertyPath": [ "_contentSize" @@ -2724,20 +2178,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 108 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 101 }, { - "__id__": 124 + "__id__": 103 } ], "_prefab": { - "__id__": 126 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -2774,11 +2228,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 102 }, "_contentSize": { "__type__": "cc.Size", @@ -2802,11 +2256,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 104 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2883,11 +2337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", @@ -2911,15 +2365,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 109 }, "clickEvents": [ { - "__id__": 131 + "__id__": 110 } ], "_interactable": true, @@ -3000,14 +2454,14 @@ "_active": true, "_components": [ { - "__id__": 134 + "__id__": 113 }, { - "__id__": 136 + "__id__": 115 } ], "_prefab": { - "__id__": 138 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", @@ -3044,11 +2498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 114 }, "_contentSize": { "__type__": "cc.Size", @@ -3072,11 +2526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3136,14 +2590,14 @@ "_active": true, "_components": [ { - "__id__": 140 + "__id__": 119 }, { - "__id__": 142 + "__id__": 121 } ], "_prefab": { - "__id__": 144 + "__id__": 123 }, "_lpos": { "__type__": "cc.Vec3", @@ -3180,11 +2634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 120 }, "_contentSize": { "__type__": "cc.Size", @@ -3208,11 +2662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 118 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 122 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3293,7 +2747,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -3321,7 +2775,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 127 }, "_id": "" }, @@ -3342,7 +2796,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 109 + "__id__": 88 + }, + { + "__id__": 78 } ] } diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 6cba8781..a260a42a 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -31738,7 +31738,7 @@ "__id__": 1462 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 1482 @@ -32863,7 +32863,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 1155.5, + "y": 1160, "z": 0 }, "_lrot": { @@ -32875,8 +32875,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, "_mobility": 0, @@ -32903,8 +32903,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 720, - "height": 249 + "width": 360, + "height": 120 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -33593,7 +33593,7 @@ "__id__": 1546 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 2905 diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index be761f94..dad81ee9 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -40,17 +40,17 @@ export class SingletonModuleComp extends ecs.Comp { }; /** 游戏主角 */ heros:any={ - 5001:{uuid:5001,lv:1,exp:0,slv:1,num:100,x1:10}, - 5002:{uuid:5002,lv:2,exp:0,slv:0,num:80,x1:0}, - 5003:{uuid:5003,lv:3,exp:0,slv:0,num:90,x1:0}, + 5001:{uuid:5001,lv:1,exp:0,slv:1,num:100,x1:0}, + 5002:{uuid:5002,lv:2,exp:0,slv:1,num:80,x1:0}, + 5003:{uuid:5003,lv:3,exp:0,slv:1,num:90,x1:0}, 5004:{uuid:5004,lv:1,exp:0,slv:1,num:100,x1:0}, - 5005:{uuid:5005,lv:2,exp:0,slv:0,num:80,x1:0}, - 5006:{uuid:5006,lv:3,exp:0,slv:0,num:90,x1:0}, - 5007:{uuid:5007,lv:3,exp:0,slv:0,num:90,x1:0}, - 5008:{uuid:5008,lv:3,exp:0,slv:0,num:90,x1:0}, - 5009:{uuid:5009,lv:3,exp:0,slv:0,num:90,x1:0}, - 5010:{uuid:5010,lv:3,exp:0,slv:0,num:90,x1:0}, - 5011:{uuid:5011,lv:3,exp:0,slv:0,num:90,x1:0}, + 5005:{uuid:5005,lv:2,exp:0,slv:1,num:80,x1:0}, + 5006:{uuid:5006,lv:3,exp:0,slv:1,num:90,x1:0}, + 5007:{uuid:5007,lv:3,exp:0,slv:1,num:90,x1:0}, + 5008:{uuid:5008,lv:3,exp:0,slv:1,num:90,x1:0}, + 5009:{uuid:5009,lv:3,exp:0,slv:1,num:90,x1:0}, + 5010:{uuid:5010,lv:3,exp:0,slv:1,num:90,x1:0}, + 5011:{uuid:5011,lv:3,exp:0,slv:1,num:90,x1:0}, }; goods:any=[ {uuid:9001,num:100000,type:0,cost:0,inventory:5}, @@ -60,8 +60,8 @@ export class SingletonModuleComp extends ecs.Comp { ]; items:any={ 1001:{uuid:1001,num:10,x1:1}, - 1002:{uuid:1002,num:10,x1:0}, - 1003:{uuid:1003,num:10,x1:0}, + 1002:{uuid:1002,num:10,x1:1}, + 1003:{uuid:1003,num:10,x1:1}, 1004:{uuid:1004,num:1000,x1:0}, 1005:{uuid:1005,num:1000,x1:0}, 1006:{uuid:1006,num:1000,x1:0}, @@ -75,6 +75,8 @@ export class SingletonModuleComp extends ecs.Comp { 1014:{uuid:1014,num:1000,x1:0}, 1015:{uuid:1015,num:1000,x1:0}, 1016:{uuid:1016,num:1000,x1:0}, + 9001:{uuid:9001,num:1000,x1:1000}, + 9003:{uuid:9003,num:1000,x1:2000}, }; fight_heros=[5001] mheros:any = []; diff --git a/assets/script/game/hero/HChipComp.ts b/assets/script/game/hero/HChipComp.ts index a58c3610..c2835eed 100644 --- a/assets/script/game/hero/HChipComp.ts +++ b/assets/script/game/hero/HChipComp.ts @@ -19,7 +19,7 @@ export class HChipComp extends Component { } show_info(){ - if(this.node.parent.name=="reward") return + if(this.node.parent.name=="reward"||this.node.parent.name=="item_info") return oops.gui.open(UIID.ItemInfo, {uuid:this.h_uuid,type:2}); } @@ -35,17 +35,10 @@ export class HChipComp extends Component { }else{ this.node.getChildByName("num").getComponent(Label).string = ""; } - switch(HeroInfo[uuid].quality){ - case 1: - this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["BLUE"]); - break; - case 2: - this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["YELLOW"]); - break; - case 3: - this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["RED"]); - break; - } + this.node.getChildByName("g1").active=HeroInfo[uuid].quality==1 + this.node.getChildByName("g2").active=HeroInfo[uuid].quality==2 + this.node.getChildByName("g3").active=HeroInfo[uuid].quality==3 + } } diff --git a/assets/script/game/map/ItemInfoComp.ts b/assets/script/game/map/ItemInfoComp.ts index 82e0490b..3608cdcf 100644 --- a/assets/script/game/map/ItemInfoComp.ts +++ b/assets/script/game/map/ItemInfoComp.ts @@ -6,6 +6,8 @@ import { UIID } from "../common/config/GameUIConfig"; import { Items } from "../common/config/Items"; import { SkillSet } from "../common/config/SkillSet"; import { HeroInfo, HeroSet } from "../common/config/heroSet"; +import { Hero } from "../hero/Hero"; +import { HChipComp } from "../hero/HChipComp"; const { ccclass, property } = _decorator; /** 视图层对象 */ @@ -61,14 +63,11 @@ export class ItemInfoComp extends CCComp { } if(args.type==2){ //英雄碎片 - this.node.getChildByName("hero").active = true + this.node.getChildByName("hero").active = true; this.node.getChildByName("name").getComponent(Label).string=HeroInfo[args.uuid].name+" 碎片" this.node.getChildByName("info").getComponent(Label).string="「"+HeroInfo[args.uuid].name+"」碎片,用于英雄升阶" - var icon_path = "game/heros/herois" - resources.load(icon_path, SpriteAtlas, (err: any, atlas) => { - const sprite = this.node.getChildByName("hero").getChildByName("hero").getChildByName("icon").getComponent(Sprite); - sprite.spriteFrame = atlas.getSpriteFrame(HeroInfo[args.uuid].path); - }); + let HChip=this.node.getChildByName("hero").getComponent(HChipComp); + HChip.update_data(args.uuid) } } diff --git a/assets/script/game/map/MissionHomeComp.ts b/assets/script/game/map/MissionHomeComp.ts index 76cefce4..3c89877d 100644 --- a/assets/script/game/map/MissionHomeComp.ts +++ b/assets/script/game/map/MissionHomeComp.ts @@ -77,8 +77,22 @@ export class MissionHomeComp extends CCComp { let height=Math.ceil(hc / 4)*135 parent.getComponent(UITransform).height=height for (let i = 0; i < hc; i++) { + if (HeroInfo[HeroList[i]].quality==3) { let hcc =ecs.getEntity(HeroSelect) hcc.load(HeroList[i],parent) + } + } + for (let i = 0; i < hc; i++) { + if (HeroInfo[HeroList[i]].quality==2) { + let hcc =ecs.getEntity(HeroSelect) + hcc.load(HeroList[i],parent) + } + } + for (let i = 0; i < hc; i++) { + if (HeroInfo[HeroList[i]].quality==1) { + let hcc =ecs.getEntity(HeroSelect) + hcc.load(HeroList[i],parent) + } } this.update_hero_cards() }