diff --git a/assets/resources/common/prefab/window.prefab b/assets/resources/common/prefab/window.prefab index e39d4aee..4184bb68 100644 --- a/assets/resources/common/prefab/window.prefab +++ b/assets/resources/common/prefab/window.prefab @@ -22,32 +22,35 @@ "__id__": 2 }, { - "__id__": 18 + "__id__": 19 }, { - "__id__": 26 + "__id__": 27 }, { - "__id__": 34 + "__id__": 35 }, { - "__id__": 40 + "__id__": 43 + }, + { + "__id__": 49 } ], "_active": true, "_components": [ { - "__id__": 112 + "__id__": 127 }, { - "__id__": 114 + "__id__": 129 }, { - "__id__": 116 + "__id__": 131 } ], "_prefab": { - "__id__": 218 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", @@ -136,6 +139,9 @@ }, { "__id__": 16 + }, + { + "__id__": 18 } ], "removedComponents": [] @@ -282,9 +288,19 @@ "dbPtEc0lVC6b6/8Lozo2Vm" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", - "_name": "lab_title", + "_name": "Popup01_Basic_Single", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -294,22 +310,22 @@ "_active": true, "_components": [ { - "__id__": 19 + "__id__": 20 }, { - "__id__": 21 + "__id__": 22 }, { - "__id__": 23 + "__id__": 24 } ], "_prefab": { - "__id__": 25 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 180.032, + "y": 0, "z": 0 }, "_lrot": { @@ -341,11 +357,186 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 21 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 600, + "height": 450 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f0m93vukNMvoxkQHoI+iL8" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@40431", + "__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": "64eEPGbtBEbJ9/zzda37BB" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 54, + "_originalHeight": 63, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9dffcflphKiYzt4QgHX9ar" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ea5tjOY21ESrUMf0NMGVSc", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lab_title", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 28 + }, + { + "__id__": 30 + }, + { + "__id__": 32 + } + ], + "_prefab": { + "__id__": 34 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 185.544, + "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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 27 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -369,11 +560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 31 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -437,11 +628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 27 }, "_enabled": false, "__prefab": { - "__id__": 24 + "__id__": 33 }, "_params": [], "_dataID": "", @@ -476,17 +667,17 @@ "_active": false, "_components": [ { - "__id__": 27 + "__id__": 36 }, { - "__id__": 29 + "__id__": 38 }, { - "__id__": 31 + "__id__": 40 } ], "_prefab": { - "__id__": 33 + "__id__": 42 }, "_lpos": { "__type__": "cc.Vec3", @@ -523,11 +714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -551,11 +742,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 39 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -619,11 +810,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 35 }, "_enabled": false, "__prefab": { - "__id__": 32 + "__id__": 41 }, "_params": [], "_dataID": "", @@ -658,14 +849,14 @@ "_active": true, "_components": [ { - "__id__": 35 + "__id__": 44 }, { - "__id__": 37 + "__id__": 46 } ], "_prefab": { - "__id__": 39 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -702,15 +893,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", - "width": 560, + "width": 540, "height": 26.46 }, "_anchorPoint": { @@ -730,11 +921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 47 }, "_lineHeight": 21, "_string": "RichText", @@ -743,12 +934,12 @@ "_fontSize": 20, "_fontColor": { "__type__": "cc.Color", - "r": 46, - "g": 46, - "b": 46, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, - "_maxWidth": 560, + "_maxWidth": 540, "_fontFamily": "Arial", "_font": null, "_isSystemFontUsed": true, @@ -785,28 +976,28 @@ }, "_children": [ { - "__id__": 41 + "__id__": 50 }, { - "__id__": 76 + "__id__": 89 } ], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 122 }, { - "__id__": 109 + "__id__": 124 } ], "_prefab": { - "__id__": 111 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -181.511, + "y": -165.844, "z": 0 }, "_lrot": { @@ -838,30 +1029,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 40 + "__id__": 49 }, "_children": [ { - "__id__": 42 + "__id__": 51 } ], "_active": true, "_components": [ { - "__id__": 66 + "__id__": 79 }, { - "__id__": 68 + "__id__": 81 }, { - "__id__": 70 + "__id__": 83 }, { - "__id__": 73 + "__id__": 86 } ], "_prefab": { - "__id__": 75 + "__id__": 88 }, "_lpos": { "__type__": "cc.Vec3", @@ -896,17 +1087,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 41 + "__id__": 50 }, "_prefab": { - "__id__": 43 + "__id__": 52 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 42 + "__id__": 51 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -914,7 +1105,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 44 + "__id__": 53 }, "targetOverrides": null }, @@ -927,44 +1118,50 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 45 - }, - { - "__id__": 47 - }, - { - "__id__": 48 - }, - { - "__id__": 49 - }, - { - "__id__": 50 - }, - { - "__id__": 52 - }, { "__id__": 54 }, { "__id__": 56 }, + { + "__id__": 57 + }, { "__id__": 58 }, { - "__id__": 60 + "__id__": 59 }, { "__id__": 61 }, { - "__id__": 62 + "__id__": 63 }, { - "__id__": 64 + "__id__": 65 + }, + { + "__id__": 67 + }, + { + "__id__": 69 + }, + { + "__id__": 70 + }, + { + "__id__": 71 + }, + { + "__id__": 73 + }, + { + "__id__": 75 + }, + { + "__id__": 77 } ], "removedComponents": [] @@ -972,7 +1169,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 55 }, "propertyPath": [ "_name" @@ -988,7 +1185,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 55 }, "propertyPath": [ "_lpos" @@ -1003,7 +1200,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 55 }, "propertyPath": [ "_lrot" @@ -1019,7 +1216,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 55 }, "propertyPath": [ "_euler" @@ -1034,7 +1231,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 51 + "__id__": 60 }, "propertyPath": [ "_active" @@ -1050,7 +1247,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 53 + "__id__": 62 }, "propertyPath": [ "_lpos" @@ -1071,7 +1268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 55 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1092,7 +1289,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 57 + "__id__": 66 }, "propertyPath": [ "_contentSize" @@ -1112,7 +1309,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 59 + "__id__": 68 }, "propertyPath": [ "_top" @@ -1128,7 +1325,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 59 + "__id__": 68 }, "propertyPath": [ "_bottom" @@ -1138,7 +1335,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 55 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1148,7 +1345,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 63 + "__id__": 72 }, "propertyPath": [ "_color" @@ -1170,7 +1367,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 65 + "__id__": 74 }, "propertyPath": [ "_color" @@ -1189,17 +1386,53 @@ "72Qmr45pdBjaa4/XGRGS5u" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 76 + }, + "propertyPath": [ + "_string" + ], + "value": "确认" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cea0FpTiVBEprBOaYQFSav" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 78 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 54, + "height": 35.5 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "a4sqCI1VpI8YJnOwF8QknG" + ] + }, { "__type__": "cc.UITransform", "_name": "btn_ok", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -1223,11 +1456,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 82 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1265,15 +1498,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 84 }, "clickEvents": [ { - "__id__": 72 + "__id__": 85 } ], "_interactable": true, @@ -1313,7 +1546,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 41 + "__id__": 50 }, "_id": "" }, @@ -1337,11 +1570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 50 }, "_enabled": false, "__prefab": { - "__id__": 74 + "__id__": 87 }, "_alignFlags": 12, "_target": null, @@ -1386,30 +1619,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 40 + "__id__": 49 }, "_children": [ { - "__id__": 77 + "__id__": 90 } ], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 112 }, { - "__id__": 99 + "__id__": 114 }, { - "__id__": 101 + "__id__": 116 }, { - "__id__": 104 + "__id__": 119 } ], "_prefab": { - "__id__": 106 + "__id__": 121 }, "_lpos": { "__type__": "cc.Vec3", @@ -1444,17 +1677,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 76 + "__id__": 89 }, "_prefab": { - "__id__": 78 + "__id__": 91 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 77 + "__id__": 90 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -1462,7 +1695,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 79 + "__id__": 92 }, "targetOverrides": null }, @@ -1475,38 +1708,41 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 80 - }, - { - "__id__": 82 - }, - { - "__id__": 83 - }, - { - "__id__": 84 - }, - { - "__id__": 85 - }, - { - "__id__": 87 - }, - { - "__id__": 89 - }, - { - "__id__": 91 - }, { "__id__": 93 }, { - "__id__": 94 + "__id__": 95 }, { "__id__": 96 + }, + { + "__id__": 97 + }, + { + "__id__": 98 + }, + { + "__id__": 100 + }, + { + "__id__": 102 + }, + { + "__id__": 104 + }, + { + "__id__": 106 + }, + { + "__id__": 107 + }, + { + "__id__": 109 + }, + { + "__id__": 110 } ], "removedComponents": [] @@ -1514,7 +1750,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 81 + "__id__": 94 }, "propertyPath": [ "_name" @@ -1530,7 +1766,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 81 + "__id__": 94 }, "propertyPath": [ "_lpos" @@ -1545,7 +1781,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 81 + "__id__": 94 }, "propertyPath": [ "_lrot" @@ -1561,7 +1797,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 81 + "__id__": 94 }, "propertyPath": [ "_euler" @@ -1576,7 +1812,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 86 + "__id__": 99 }, "propertyPath": [ "_active" @@ -1592,7 +1828,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 101 }, "propertyPath": [ "_lpos" @@ -1613,7 +1849,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 103 }, "propertyPath": [ "_contentSize" @@ -1633,7 +1869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 92 + "__id__": 105 }, "propertyPath": [ "_active" @@ -1649,7 +1885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 86 + "__id__": 99 }, "propertyPath": [ "_lpos" @@ -1664,7 +1900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 95 + "__id__": 108 }, "propertyPath": [ "_top" @@ -1680,24 +1916,40 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 95 + "__id__": 108 }, "propertyPath": [ "_bottom" ], "value": 22.7625 }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 111 + }, + "propertyPath": [ + "_string" + ], + "value": "取消" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cea0FpTiVBEprBOaYQFSav" + ] + }, { "__type__": "cc.UITransform", "_name": "btn_cancel", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 113 }, "_contentSize": { "__type__": "cc.Size", @@ -1721,11 +1973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 115 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1763,15 +2015,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 117 }, "clickEvents": [ { - "__id__": 103 + "__id__": 118 } ], "_interactable": true, @@ -1811,7 +2063,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 76 + "__id__": 89 }, "_id": "" }, @@ -1835,11 +2087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 89 }, "_enabled": false, "__prefab": { - "__id__": 105 + "__id__": 120 }, "_alignFlags": 36, "_target": null, @@ -1884,11 +2136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 123 }, "_contentSize": { "__type__": "cc.Size", @@ -1912,11 +2164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 125 }, "_resizeMode": 1, "_layoutType": 1, @@ -1967,7 +2219,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 128 }, "_contentSize": { "__type__": "cc.Size", @@ -1995,7 +2247,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 130 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2037,25 +2289,25 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 132 }, "lab_title": { - "__id__": 21 + "__id__": 30 }, "lab_content": { - "__id__": 37 + "__id__": 46 }, "lab_ok": { - "__id__": 118 + "__id__": 133 }, "lab_cancel": { - "__id__": 168 + "__id__": 183 }, "btn_ok": { - "__id__": 41 + "__id__": 50 }, "btn_cancel": { - "__id__": 76 + "__id__": 89 }, "_id": "" }, @@ -2069,11 +2321,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 182 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2085,7 +2337,7 @@ "b": 255, "a": 255 }, - "_string": "刷新", + "_string": "确认", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 25, @@ -2135,20 +2387,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 120 + "__id__": 135 }, "_children": [], "_active": true, "_components": [ { - "__id__": 164 + "__id__": 179 }, { - "__id__": 118 + "__id__": 133 } ], "_prefab": { - "__id__": 166 + "__id__": 181 }, "_lpos": { "__type__": "cc.Vec3", @@ -2185,33 +2437,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 42 + "__id__": 51 }, "_children": [ { - "__id__": 119 + "__id__": 134 }, { - "__id__": 121 + "__id__": 136 }, { - "__id__": 139 + "__id__": 154 } ], "_active": true, "_components": [ { - "__id__": 157 + "__id__": 172 }, { - "__id__": 159 + "__id__": 174 }, { - "__id__": 161 + "__id__": 176 } ], "_prefab": { - "__id__": 163 + "__id__": 178 }, "_lpos": { "__type__": "cc.Vec3", @@ -2250,27 +2502,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 120 + "__id__": 135 }, "_children": [ { - "__id__": 122 + "__id__": 137 }, { - "__id__": 128 + "__id__": 143 } ], "_active": false, "_components": [ { - "__id__": 134 + "__id__": 149 }, { - "__id__": 136 + "__id__": 151 } ], "_prefab": { - "__id__": 138 + "__id__": 153 }, "_lpos": { "__type__": "cc.Vec3", @@ -2307,20 +2559,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 121 + "__id__": 136 }, "_children": [], "_active": true, "_components": [ { - "__id__": 123 + "__id__": 138 }, { - "__id__": 125 + "__id__": 140 } ], "_prefab": { - "__id__": 127 + "__id__": 142 }, "_lpos": { "__type__": "cc.Vec3", @@ -2357,11 +2609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -2385,11 +2637,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 141 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2443,20 +2695,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 121 + "__id__": 136 }, "_children": [], "_active": true, "_components": [ { - "__id__": 129 + "__id__": 144 }, { - "__id__": 131 + "__id__": 146 } ], "_prefab": { - "__id__": 133 + "__id__": 148 }, "_lpos": { "__type__": "cc.Vec3", @@ -2493,11 +2745,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 145 }, "_contentSize": { "__type__": "cc.Size", @@ -2521,11 +2773,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 147 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2602,11 +2854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 136 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 150 }, "_contentSize": { "__type__": "cc.Size", @@ -2630,11 +2882,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 136 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 152 }, "_resizeMode": 1, "_layoutType": 1, @@ -2683,27 +2935,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 120 + "__id__": 135 }, "_children": [ { - "__id__": 140 + "__id__": 155 }, { - "__id__": 146 + "__id__": 161 } ], "_active": false, "_components": [ { - "__id__": 152 + "__id__": 167 }, { - "__id__": 154 + "__id__": 169 } ], "_prefab": { - "__id__": 156 + "__id__": 171 }, "_lpos": { "__type__": "cc.Vec3", @@ -2740,20 +2992,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 156 }, { - "__id__": 143 + "__id__": 158 } ], "_prefab": { - "__id__": 145 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -2790,11 +3042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 157 }, "_contentSize": { "__type__": "cc.Size", @@ -2818,11 +3070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 159 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2879,20 +3131,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 147 + "__id__": 162 }, { - "__id__": 149 + "__id__": 164 } ], "_prefab": { - "__id__": 151 + "__id__": 166 }, "_lpos": { "__type__": "cc.Vec3", @@ -2929,11 +3181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 146 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 163 }, "_contentSize": { "__type__": "cc.Size", @@ -2957,11 +3209,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 146 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 165 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3038,11 +3290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 168 }, "_contentSize": { "__type__": "cc.Size", @@ -3066,11 +3318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 170 }, "_resizeMode": 1, "_layoutType": 1, @@ -3117,11 +3369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", @@ -3145,11 +3397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 175 }, "_alignFlags": 45, "_target": null, @@ -3181,11 +3433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 177 }, "_resizeMode": 1, "_layoutType": 2, @@ -3232,11 +3484,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 180 }, "_contentSize": { "__type__": "cc.Size", @@ -3277,11 +3529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 232 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3293,7 +3545,7 @@ "b": 255, "a": 255 }, - "_string": "刷新", + "_string": "取消", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 25, @@ -3343,20 +3595,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 170 + "__id__": 185 }, "_children": [], "_active": true, "_components": [ { - "__id__": 214 + "__id__": 229 }, { - "__id__": 168 + "__id__": 183 } ], "_prefab": { - "__id__": 216 + "__id__": 231 }, "_lpos": { "__type__": "cc.Vec3", @@ -3393,33 +3645,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 77 + "__id__": 90 }, "_children": [ { - "__id__": 169 + "__id__": 184 }, { - "__id__": 171 + "__id__": 186 }, { - "__id__": 189 + "__id__": 204 } ], "_active": true, "_components": [ { - "__id__": 207 + "__id__": 222 }, { - "__id__": 209 + "__id__": 224 }, { - "__id__": 211 + "__id__": 226 } ], "_prefab": { - "__id__": 213 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -3458,27 +3710,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 170 + "__id__": 185 }, "_children": [ { - "__id__": 172 + "__id__": 187 }, { - "__id__": 178 + "__id__": 193 } ], "_active": false, "_components": [ { - "__id__": 184 + "__id__": 199 }, { - "__id__": 186 + "__id__": 201 } ], "_prefab": { - "__id__": 188 + "__id__": 203 }, "_lpos": { "__type__": "cc.Vec3", @@ -3515,20 +3767,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 171 + "__id__": 186 }, "_children": [], "_active": true, "_components": [ { - "__id__": 173 + "__id__": 188 }, { - "__id__": 175 + "__id__": 190 } ], "_prefab": { - "__id__": 177 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -3565,11 +3817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 172 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -3593,11 +3845,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 172 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3651,20 +3903,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 171 + "__id__": 186 }, "_children": [], "_active": true, "_components": [ { - "__id__": 179 + "__id__": 194 }, { - "__id__": 181 + "__id__": 196 } ], "_prefab": { - "__id__": 183 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -3701,11 +3953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 178 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -3729,11 +3981,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 178 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 197 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3810,11 +4062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -3838,11 +4090,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 202 }, "_resizeMode": 1, "_layoutType": 1, @@ -3891,27 +4143,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 170 + "__id__": 185 }, "_children": [ { - "__id__": 190 + "__id__": 205 }, { - "__id__": 196 + "__id__": 211 } ], "_active": false, "_components": [ { - "__id__": 202 + "__id__": 217 }, { - "__id__": 204 + "__id__": 219 } ], "_prefab": { - "__id__": 206 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -3948,20 +4200,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 189 + "__id__": 204 }, "_children": [], "_active": true, "_components": [ { - "__id__": 191 + "__id__": 206 }, { - "__id__": 193 + "__id__": 208 } ], "_prefab": { - "__id__": 195 + "__id__": 210 }, "_lpos": { "__type__": "cc.Vec3", @@ -3998,11 +4250,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 190 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 207 }, "_contentSize": { "__type__": "cc.Size", @@ -4026,11 +4278,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 190 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 209 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4087,20 +4339,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 189 + "__id__": 204 }, "_children": [], "_active": true, "_components": [ { - "__id__": 197 + "__id__": 212 }, { - "__id__": 199 + "__id__": 214 } ], "_prefab": { - "__id__": 201 + "__id__": 216 }, "_lpos": { "__type__": "cc.Vec3", @@ -4137,11 +4389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -4165,11 +4417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4246,11 +4498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", @@ -4274,11 +4526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 220 }, "_resizeMode": 1, "_layoutType": 1, @@ -4325,11 +4577,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", @@ -4353,11 +4605,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 225 }, "_alignFlags": 45, "_target": null, @@ -4389,11 +4641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 227 }, "_resizeMode": 1, "_layoutType": 2, @@ -4440,11 +4692,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -4491,18 +4743,24 @@ "instance": null, "targetOverrides": [ { - "__id__": 219 + "__id__": 234 }, { - "__id__": 221 + "__id__": 236 + }, + { + "__id__": 238 + }, + { + "__id__": 240 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 77 + "__id__": 90 }, { - "__id__": 42 + "__id__": 51 }, { "__id__": 2 @@ -4511,18 +4769,36 @@ }, { "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 116 - }, + "source": null, "sourceInfo": null, "propertyPath": [ "lab_ok" ], "target": { - "__id__": 42 + "__id__": 51 }, "targetInfo": { - "__id__": 220 + "__id__": 235 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cea0FpTiVBEprBOaYQFSav" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "lab_cancel" + ], + "target": { + "__id__": 90 + }, + "targetInfo": { + "__id__": 237 } }, { @@ -4534,17 +4810,39 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 116 + "__id__": 131 + }, + "sourceInfo": null, + "propertyPath": [ + "lab_ok" + ], + "target": { + "__id__": 51 + }, + "targetInfo": { + "__id__": 239 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cea0FpTiVBEprBOaYQFSav" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 131 }, "sourceInfo": null, "propertyPath": [ "lab_cancel" ], "target": { - "__id__": 77 + "__id__": 90 }, "targetInfo": { - "__id__": 222 + "__id__": 241 } }, { diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index ce18c20f..85a38ab8 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -22,38 +22,38 @@ "__id__": 2 }, { - "__id__": 10 + "__id__": 11 }, { - "__id__": 22 + "__id__": 23 }, { - "__id__": 34 + "__id__": 35 } ], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 46 }, { - "__id__": 47 + "__id__": 48 }, { - "__id__": 49 + "__id__": 50 }, { - "__id__": 51 + "__id__": 52 }, { - "__id__": 53 + "__id__": 54 }, { - "__id__": 55 + "__id__": 56 } ], "_prefab": { - "__id__": 57 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -130,6 +130,9 @@ }, { "__id__": 9 + }, + { + "__id__": 10 } ], "removedComponents": [] @@ -196,6 +199,16 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "anm", @@ -208,23 +221,23 @@ "_active": true, "_components": [ { - "__id__": 11 + "__id__": 12 }, { - "__id__": 13 + "__id__": 14 }, { - "__id__": 15 + "__id__": 16 }, { - "__id__": 17 + "__id__": 18 }, { - "__id__": 19 + "__id__": 20 } ], "_prefab": { - "__id__": 21 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -261,11 +274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 13 }, "_contentSize": { "__type__": "cc.Size", @@ -289,11 +302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 15 }, "_id": "" }, @@ -307,11 +320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 17 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -355,11 +368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 19 }, "playOnLoad": true, "_clips": [ @@ -397,11 +410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 21 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -449,14 +462,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 23 + "__id__": 24 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 22 + "__id__": 23 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -464,7 +477,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 24 + "__id__": 25 }, "targetOverrides": null }, @@ -478,10 +491,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 25 - }, - { - "__id__": 27 + "__id__": 26 }, { "__id__": 28 @@ -496,7 +506,10 @@ "__id__": 31 }, { - "__id__": 33 + "__id__": 32 + }, + { + "__id__": 34 } ], "removedComponents": [] @@ -504,7 +517,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_name" @@ -520,7 +533,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -535,7 +548,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -551,7 +564,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -566,7 +579,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_active" @@ -576,7 +589,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 32 + "__id__": 33 }, "propertyPath": [ "_contentSize" @@ -596,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -615,14 +628,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 36 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 35 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -630,7 +643,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 37 }, "targetOverrides": null }, @@ -644,10 +657,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 - }, - { - "__id__": 39 + "__id__": 38 }, { "__id__": 40 @@ -659,7 +669,10 @@ "__id__": 42 }, { - "__id__": 44 + "__id__": 43 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -667,7 +680,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_name" @@ -683,7 +696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lpos" @@ -698,7 +711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lrot" @@ -714,7 +727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_euler" @@ -729,7 +742,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -750,7 +763,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lscale" @@ -772,7 +785,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -800,10 +813,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 49 }, "anm": { - "__id__": 13 + "__id__": 14 }, "_id": "" }, @@ -821,7 +834,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 51 }, "debugMode": false, "_id": "" @@ -840,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -908,7 +921,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 57 }, "playOnLoad": false, "_clips": [], @@ -932,10 +945,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 34 + "__id__": 35 }, { - "__id__": 22 + "__id__": 23 }, { "__id__": 2 diff --git a/assets/resources/game/heros/ha2.prefab b/assets/resources/game/heros/ha2.prefab index bc20d0a1..9db47c8e 100644 --- a/assets/resources/game/heros/ha2.prefab +++ b/assets/resources/game/heros/ha2.prefab @@ -22,35 +22,35 @@ "__id__": 2 }, { - "__id__": 10 + "__id__": 11 }, { - "__id__": 22 + "__id__": 23 }, { - "__id__": 34 + "__id__": 35 } ], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 46 }, { - "__id__": 47 + "__id__": 48 }, { - "__id__": 49 + "__id__": 50 }, { - "__id__": 51 + "__id__": 52 }, { - "__id__": 53 + "__id__": 54 } ], "_prefab": { - "__id__": 55 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -127,6 +127,9 @@ }, { "__id__": 9 + }, + { + "__id__": 10 } ], "removedComponents": [] @@ -193,6 +196,16 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "anm", @@ -205,23 +218,23 @@ "_active": true, "_components": [ { - "__id__": 11 + "__id__": 12 }, { - "__id__": 13 + "__id__": 14 }, { - "__id__": 15 + "__id__": 16 }, { - "__id__": 17 + "__id__": 18 }, { - "__id__": 19 + "__id__": 20 } ], "_prefab": { - "__id__": 21 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -258,11 +271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 13 }, "_contentSize": { "__type__": "cc.Size", @@ -286,11 +299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 15 }, "_id": "" }, @@ -304,11 +317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 17 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -352,11 +365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 19 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -390,11 +403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 21 }, "playOnLoad": false, "_clips": [ @@ -446,14 +459,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 23 + "__id__": 24 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 22 + "__id__": 23 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -461,7 +474,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 24 + "__id__": 25 }, "targetOverrides": null }, @@ -475,10 +488,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 25 - }, - { - "__id__": 27 + "__id__": 26 }, { "__id__": 28 @@ -493,7 +503,10 @@ "__id__": 31 }, { - "__id__": 33 + "__id__": 32 + }, + { + "__id__": 34 } ], "removedComponents": [] @@ -501,7 +514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_name" @@ -517,7 +530,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -532,7 +545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -548,7 +561,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -563,7 +576,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_active" @@ -573,7 +586,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 32 + "__id__": 33 }, "propertyPath": [ "_contentSize" @@ -593,7 +606,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -612,14 +625,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 36 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 35 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -627,7 +640,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 37 }, "targetOverrides": null }, @@ -641,10 +654,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 - }, - { - "__id__": 39 + "__id__": 38 }, { "__id__": 40 @@ -656,7 +666,10 @@ "__id__": 42 }, { - "__id__": 44 + "__id__": 43 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -664,7 +677,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_name" @@ -680,7 +693,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lpos" @@ -695,7 +708,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lrot" @@ -711,7 +724,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_euler" @@ -726,7 +739,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -747,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lscale" @@ -769,7 +782,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -797,10 +810,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 49 }, "anm": { - "__id__": 13 + "__id__": 14 }, "_id": "" }, @@ -818,7 +831,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 51 }, "debugMode": false, "_id": "" @@ -837,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -871,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -908,10 +921,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 34 + "__id__": 35 }, { - "__id__": 22 + "__id__": 23 }, { "__id__": 2 diff --git a/assets/resources/game/heros/ha3.prefab b/assets/resources/game/heros/ha3.prefab index c2ae44fa..82567897 100644 --- a/assets/resources/game/heros/ha3.prefab +++ b/assets/resources/game/heros/ha3.prefab @@ -22,38 +22,38 @@ "__id__": 2 }, { - "__id__": 10 + "__id__": 11 }, { - "__id__": 22 + "__id__": 23 }, { - "__id__": 34 + "__id__": 35 } ], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 46 }, { - "__id__": 47 + "__id__": 48 }, { - "__id__": 49 + "__id__": 50 }, { - "__id__": 51 + "__id__": 52 }, { - "__id__": 53 + "__id__": 54 }, { - "__id__": 55 + "__id__": 56 } ], "_prefab": { - "__id__": 57 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -130,6 +130,9 @@ }, { "__id__": 9 + }, + { + "__id__": 10 } ], "removedComponents": [] @@ -196,6 +199,16 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "anm", @@ -208,23 +221,23 @@ "_active": true, "_components": [ { - "__id__": 11 + "__id__": 12 }, { - "__id__": 13 + "__id__": 14 }, { - "__id__": 15 + "__id__": 16 }, { - "__id__": 17 + "__id__": 18 }, { - "__id__": 19 + "__id__": 20 } ], "_prefab": { - "__id__": 21 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -261,11 +274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 13 }, "_contentSize": { "__type__": "cc.Size", @@ -289,11 +302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 15 }, "_id": "" }, @@ -307,11 +320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 17 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -355,11 +368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 19 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -393,11 +406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 21 }, "playOnLoad": false, "_clips": [ @@ -452,14 +465,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 23 + "__id__": 24 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 22 + "__id__": 23 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -467,7 +480,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 24 + "__id__": 25 }, "targetOverrides": null }, @@ -481,10 +494,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 25 - }, - { - "__id__": 27 + "__id__": 26 }, { "__id__": 28 @@ -499,7 +509,10 @@ "__id__": 31 }, { - "__id__": 33 + "__id__": 32 + }, + { + "__id__": 34 } ], "removedComponents": [] @@ -507,7 +520,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_name" @@ -523,7 +536,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -538,7 +551,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -554,7 +567,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -569,7 +582,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_active" @@ -579,7 +592,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 32 + "__id__": 33 }, "propertyPath": [ "_contentSize" @@ -599,7 +612,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -618,14 +631,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 36 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 35 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -633,7 +646,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 37 }, "targetOverrides": null }, @@ -647,10 +660,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 - }, - { - "__id__": 39 + "__id__": 38 }, { "__id__": 40 @@ -662,7 +672,10 @@ "__id__": 42 }, { - "__id__": 44 + "__id__": 43 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -670,7 +683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_name" @@ -686,7 +699,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lpos" @@ -701,7 +714,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lrot" @@ -717,7 +730,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_euler" @@ -732,7 +745,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -753,7 +766,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lscale" @@ -775,7 +788,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -803,10 +816,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 49 }, "anm": { - "__id__": 13 + "__id__": 14 }, "_id": "" }, @@ -824,7 +837,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 51 }, "debugMode": false, "_id": "" @@ -843,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -877,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -911,7 +924,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 57 }, "playOnLoad": false, "_clips": [], @@ -935,10 +948,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 34 + "__id__": 35 }, { - "__id__": 22 + "__id__": 23 }, { "__id__": 2 diff --git a/assets/resources/gui/ui3.plist.meta b/assets/resources/gui/ui3.plist.meta index f98cd574..0f965199 100644 --- a/assets/resources/gui/ui3.plist.meta +++ b/assets/resources/gui/ui3.plist.meta @@ -300,10 +300,10 @@ "height": 63, "rawWidth": 54, "rawHeight": 63, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 30, + "borderBottom": 33, + "borderLeft": 27, + "borderRight": 27, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/script/game/map/HeroBoxComp.ts b/assets/script/game/map/HeroBoxComp.ts index be354046..dff5e828 100644 --- a/assets/script/game/map/HeroBoxComp.ts +++ b/assets/script/game/map/HeroBoxComp.ts @@ -172,7 +172,6 @@ export class HeroBoxComp extends CCComp { } oops.audio.playEffect("music/button"); - const heroName = this.model.hero_name ?? ""; const nextLv = heroLv + 1; const cost = MissionEconomy.getUpgradeCost(heroLv); // 金币不足：smalltip 气泡提示（挂载金币节点），不弹确认框 @@ -185,7 +184,7 @@ export class HeroBoxComp extends CCComp { // oops.gui 公共确认窗口（自定义 CommonPrompt：内容支持富文本高亮） oops.gui.open(UIID.Window, { title: `升级英雄`, - content: `${heroName} Lv.${heroLv} → Lv.${nextLv}\n消耗 ${cost} 金币\n\n${preview}`, + content: preview, okWord: "升级", cancelWord: "取消", needCancel: true, @@ -241,7 +240,7 @@ export class HeroBoxComp extends CCComp { const curDesc = buildSkillDescMoreRich(buildSource(heroLv)); const nextDesc = buildSkillDescMoreRich(buildSource(nextLv)); - return [ + return `` + [ `当前 Lv.${heroLv}：`, attrLine(heroLv), curDesc, @@ -249,7 +248,7 @@ export class HeroBoxComp extends CCComp { `升级后 Lv.${nextLv}：`, attrLine(nextLv), nextDesc, - ].filter(s => s !== undefined).join("\n"); + ].filter(s => s !== undefined).join("\n") + ``; } /** 累加等级额外加成（≤目标等级的所有档位） */