diff --git a/assets/resources/gui/element/smalltip.prefab b/assets/resources/gui/element/smalltip.prefab index b5e3859c..16d6d5f9 100644 --- a/assets/resources/gui/element/smalltip.prefab +++ b/assets/resources/gui/element/smalltip.prefab @@ -26,10 +26,13 @@ "_components": [ { "__id__": 30 + }, + { + "__id__": 32 } ], "_prefab": { - "__id__": 32 + "__id__": 34 }, "_lpos": { "__type__": "cc.Vec3", @@ -187,8 +190,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 300, - "height": 140 + "width": 399.6, + "height": 159.6 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -322,7 +325,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -35.2, + "y": -40.1, "z": 0 }, "_lrot": { @@ -534,7 +537,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 84, + "width": 149.9, "height": 54.4 }, "_anchorPoint": { @@ -570,14 +573,14 @@ "b": 255, "a": 255 }, - "_string": "卡成升级", + "_string": "卡成升级........................", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, + "_actualFontSize": 21, "_fontSize": 20, "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, + "_lineHeight": 23, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -643,8 +646,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 150, - "height": 70 + "width": 199.8, + "height": 79.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -743,6 +746,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1ctkO0TStCjK1FILIEJzwK" }, + { + "__type__": "366cayIQXtAzJLimznQOpMz", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 33 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ffW/hlSrtP1I4iporD0DuU" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index c206ec83..18a85972 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,26 +22,26 @@ "__id__": 2 }, { - "__id__": 275 + "__id__": 280 }, { - "__id__": 257 + "__id__": 262 } ], "_active": true, "_components": [ { - "__id__": 284 + "__id__": 289 }, { - "__id__": 286 + "__id__": 291 }, { - "__id__": 288 + "__id__": 293 } ], "_prefab": { - "__id__": 290 + "__id__": 295 }, "_lpos": { "__type__": "cc.Vec3", @@ -91,23 +91,23 @@ "__id__": 77 }, { - "__id__": 121 + "__id__": 125 } ], "_active": true, "_components": [ { - "__id__": 251 + "__id__": 256 }, { - "__id__": 253 + "__id__": 258 }, { - "__id__": 255 + "__id__": 260 } ], "_prefab": { - "__id__": 274 + "__id__": 279 }, "_lpos": { "__type__": "cc.Vec3", @@ -1163,23 +1163,23 @@ "__id__": 78 }, { - "__id__": 94 + "__id__": 98 }, { - "__id__": 103 + "__id__": 107 } ], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 120 }, { - "__id__": 118 + "__id__": 122 } ], "_prefab": { - "__id__": 120 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -1236,7 +1236,7 @@ }, "targetOverrides": [ { - "__id__": 91 + "__id__": 95 } ] }, @@ -1269,6 +1269,12 @@ }, { "__id__": 89 + }, + { + "__id__": 91 + }, + { + "__id__": 93 } ], "removedComponents": [] @@ -1379,6 +1385,49 @@ "7228fRtBlHhKwOIL9H6qr/" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 92 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 40, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11zOlOXhVHUJv5IO7G4ABU", + "bfLo+sXdxPSY6pJ+TTshHA" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 174.36865234375, + "height": 30 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11zOlOXhVHUJv5IO7G4ABU", + "e03E8E9MNHWqlyzsRwdhQj" + ] + }, { "__type__": "cc.TargetOverrideInfo", "source": null, @@ -1387,10 +1436,10 @@ "fragment_node" ], "target": { - "__id__": 92 + "__id__": 96 }, "targetInfo": { - "__id__": 93 + "__id__": 97 } }, { @@ -1410,14 +1459,14 @@ "__id__": 77 }, "_prefab": { - "__id__": 95 + "__id__": 99 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 94 + "__id__": 98 }, "asset": { "__uuid__": "b0c70366-b71c-4ccd-b0fd-90af5149be5e", @@ -1425,7 +1474,7 @@ }, "fileId": "f2zPd6AOdBrIgj89xLzmRM", "instance": { - "__id__": 96 + "__id__": 100 }, "targetOverrides": null }, @@ -1438,20 +1487,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, { "__id__": 101 }, { - "__id__": 102 + "__id__": 103 + }, + { + "__id__": 104 + }, + { + "__id__": 105 + }, + { + "__id__": 106 } ], "removedComponents": [] @@ -1459,7 +1508,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 102 }, "propertyPath": [ "_name" @@ -1475,7 +1524,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 102 }, "propertyPath": [ "_lpos" @@ -1490,7 +1539,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 102 }, "propertyPath": [ "_lrot" @@ -1506,7 +1555,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 102 }, "propertyPath": [ "_euler" @@ -1521,7 +1570,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 102 }, "propertyPath": [ "_active" @@ -1535,14 +1584,14 @@ "__id__": 77 }, "_prefab": { - "__id__": 104 + "__id__": 108 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 103 + "__id__": 107 }, "asset": { "__uuid__": "6ab76980-0704-4190-9acf-ec5ab44a33b0", @@ -1550,7 +1599,7 @@ }, "fileId": "84hrfbDo1AOq3VROGZvWWt", "instance": { - "__id__": 105 + "__id__": 109 }, "targetOverrides": null }, @@ -1563,26 +1612,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 106 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, { "__id__": 110 }, - { - "__id__": 111 - }, { "__id__": 112 }, + { + "__id__": 113 + }, { "__id__": 114 + }, + { + "__id__": 115 + }, + { + "__id__": 116 + }, + { + "__id__": 118 } ], "removedComponents": [] @@ -1590,7 +1639,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 111 }, "propertyPath": [ "_name" @@ -1606,7 +1655,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 111 }, "propertyPath": [ "_lpos" @@ -1621,7 +1670,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 111 }, "propertyPath": [ "_lrot" @@ -1637,7 +1686,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 111 }, "propertyPath": [ "_euler" @@ -1652,7 +1701,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 111 }, "propertyPath": [ "_active" @@ -1662,7 +1711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 113 + "__id__": 117 }, "propertyPath": [ "_active" @@ -1678,7 +1727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 115 + "__id__": 119 }, "propertyPath": [ "_active" @@ -1701,7 +1750,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -1729,7 +1778,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 123 }, "_alignFlags": 45, "_target": null, @@ -1778,23 +1827,23 @@ }, "_children": [ { - "__id__": 122 + "__id__": 126 }, { - "__id__": 130 + "__id__": 134 } ], "_active": true, "_components": [ { - "__id__": 246 + "__id__": 251 }, { - "__id__": 248 + "__id__": 253 } ], "_prefab": { - "__id__": 250 + "__id__": 255 }, "_lpos": { "__type__": "cc.Vec3", @@ -1831,23 +1880,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 121 + "__id__": 125 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 123 - }, - { - "__id__": 125 - }, { "__id__": 127 + }, + { + "__id__": 129 + }, + { + "__id__": 131 } ], "_prefab": { - "__id__": 129 + "__id__": 133 }, "_lpos": { "__type__": "cc.Vec3", @@ -1884,11 +1933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 128 }, "_contentSize": { "__type__": "cc.Size", @@ -1912,11 +1961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 130 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1957,11 +2006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 132 }, "_alignFlags": 44, "_target": null, @@ -2006,33 +2055,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 121 + "__id__": 125 }, "_children": [ { - "__id__": 131 + "__id__": 135 }, { - "__id__": 171 + "__id__": 175 }, { - "__id__": 202 + "__id__": 206 } ], "_active": true, "_components": [ { - "__id__": 239 + "__id__": 244 }, { - "__id__": 241 + "__id__": 246 }, { - "__id__": 243 + "__id__": 248 } ], "_prefab": { - "__id__": 245 + "__id__": 250 }, "_lpos": { "__type__": "cc.Vec3", @@ -2067,17 +2116,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 130 + "__id__": 134 }, "_prefab": { - "__id__": 132 + "__id__": 136 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 131 + "__id__": 135 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -2085,7 +2134,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 133 + "__id__": 137 }, "targetOverrides": null }, @@ -2098,20 +2147,11 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 134 - }, - { - "__id__": 136 - }, - { - "__id__": 137 - }, { "__id__": 138 }, { - "__id__": 139 + "__id__": 140 }, { "__id__": 141 @@ -2125,6 +2165,9 @@ { "__id__": 145 }, + { + "__id__": 146 + }, { "__id__": 147 }, @@ -2143,32 +2186,38 @@ { "__id__": 157 }, - { - "__id__": 158 - }, { "__id__": 159 }, { - "__id__": 160 + "__id__": 161 }, { "__id__": 162 }, + { + "__id__": 163 + }, { "__id__": 164 }, { - "__id__": 165 - }, - { - "__id__": 167 + "__id__": 166 }, { "__id__": 168 }, { - "__id__": 170 + "__id__": 169 + }, + { + "__id__": 171 + }, + { + "__id__": 172 + }, + { + "__id__": 174 } ], "removedComponents": [] @@ -2176,7 +2225,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 139 }, "propertyPath": [ "_name" @@ -2192,7 +2241,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 139 }, "propertyPath": [ "_lpos" @@ -2207,7 +2256,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 139 }, "propertyPath": [ "_lrot" @@ -2223,7 +2272,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 139 }, "propertyPath": [ "_euler" @@ -2238,7 +2287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 144 }, "propertyPath": [ "clickEvents", @@ -2258,7 +2307,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 144 }, "propertyPath": [ "clickEvents", @@ -2270,7 +2319,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 144 }, "propertyPath": [ "clickEvents", @@ -2282,7 +2331,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 148 }, "propertyPath": [ "_contentSize" @@ -2302,7 +2351,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 146 + "__id__": 150 }, "propertyPath": [ "_contentSize" @@ -2322,7 +2371,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 148 + "__id__": 152 }, "propertyPath": [ "_lpos" @@ -2343,7 +2392,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 150 + "__id__": 154 }, "propertyPath": [ "_contentSize" @@ -2363,7 +2412,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 152 + "__id__": 156 }, "propertyPath": [ "_contentSize" @@ -2383,7 +2432,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 154 + "__id__": 158 }, "propertyPath": [ "_contentSize" @@ -2403,7 +2452,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 156 + "__id__": 160 }, "propertyPath": [ "_lpos" @@ -2424,7 +2473,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 144 }, "propertyPath": [ "clickEvents", @@ -2436,7 +2485,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 148 + "__id__": 152 }, "propertyPath": [ "_active" @@ -2446,7 +2495,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 139 }, "propertyPath": [ "_active" @@ -2456,7 +2505,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 161 + "__id__": 165 }, "propertyPath": [ "_contentSize" @@ -2476,7 +2525,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 163 + "__id__": 167 }, "propertyPath": [ "_spriteFrame" @@ -2495,7 +2544,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 163 + "__id__": 167 }, "propertyPath": [ "_atlas" @@ -2508,7 +2557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 166 + "__id__": 170 }, "propertyPath": [ "_string" @@ -2524,7 +2573,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 166 + "__id__": 170 }, "propertyPath": [ "_fontSize" @@ -2534,7 +2583,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 169 + "__id__": 173 }, "propertyPath": [ "_contentSize" @@ -2554,7 +2603,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 166 + "__id__": 170 }, "propertyPath": [ "_actualFontSize" @@ -2565,17 +2614,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 130 + "__id__": 134 }, "_prefab": { - "__id__": 172 + "__id__": 176 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 171 + "__id__": 175 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -2583,7 +2632,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 173 + "__id__": 177 }, "targetOverrides": null }, @@ -2596,20 +2645,11 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 174 - }, - { - "__id__": 176 - }, - { - "__id__": 177 - }, { "__id__": 178 }, { - "__id__": 179 + "__id__": 180 }, { "__id__": 181 @@ -2623,6 +2663,9 @@ { "__id__": 185 }, + { + "__id__": 186 + }, { "__id__": 187 }, @@ -2646,6 +2689,12 @@ }, { "__id__": 201 + }, + { + "__id__": 203 + }, + { + "__id__": 205 } ], "removedComponents": [] @@ -2653,7 +2702,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 175 + "__id__": 179 }, "propertyPath": [ "_name" @@ -2669,7 +2718,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 175 + "__id__": 179 }, "propertyPath": [ "_lpos" @@ -2684,7 +2733,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 175 + "__id__": 179 }, "propertyPath": [ "_lrot" @@ -2700,7 +2749,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 175 + "__id__": 179 }, "propertyPath": [ "_euler" @@ -2715,7 +2764,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 180 + "__id__": 184 }, "propertyPath": [ "clickEvents", @@ -2735,7 +2784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 180 + "__id__": 184 }, "propertyPath": [ "clickEvents", @@ -2747,7 +2796,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 180 + "__id__": 184 }, "propertyPath": [ "clickEvents", @@ -2759,7 +2808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 184 + "__id__": 188 }, "propertyPath": [ "_contentSize" @@ -2779,7 +2828,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 186 + "__id__": 190 }, "propertyPath": [ "_contentSize" @@ -2799,7 +2848,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 188 + "__id__": 192 }, "propertyPath": [ "_lpos" @@ -2820,7 +2869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 190 + "__id__": 194 }, "propertyPath": [ "_contentSize" @@ -2840,7 +2889,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 192 + "__id__": 196 }, "propertyPath": [ "_contentSize" @@ -2860,7 +2909,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 194 + "__id__": 198 }, "propertyPath": [ "_contentSize" @@ -2880,7 +2929,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 196 + "__id__": 200 }, "propertyPath": [ "_lpos" @@ -2901,7 +2950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 198 + "__id__": 202 }, "propertyPath": [ "_fontSize" @@ -2917,7 +2966,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 200 + "__id__": 204 }, "propertyPath": [ "_contentSize" @@ -2937,7 +2986,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 198 + "__id__": 202 }, "propertyPath": [ "_actualFontSize" @@ -2948,17 +2997,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 130 + "__id__": 134 }, "_prefab": { - "__id__": 203 + "__id__": 207 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 202 + "__id__": 206 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -2966,7 +3015,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 204 + "__id__": 208 }, "targetOverrides": null }, @@ -2979,20 +3028,11 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 205 - }, - { - "__id__": 207 - }, - { - "__id__": 208 - }, { "__id__": 209 }, { - "__id__": 210 + "__id__": 211 }, { "__id__": 212 @@ -3006,6 +3046,9 @@ { "__id__": 216 }, + { + "__id__": 217 + }, { "__id__": 218 }, @@ -3025,22 +3068,31 @@ "__id__": 228 }, { - "__id__": 229 + "__id__": 230 }, { - "__id__": 231 + "__id__": 232 }, { "__id__": 233 }, { - "__id__": 234 + "__id__": 235 }, { - "__id__": 236 + "__id__": 237 }, { "__id__": 238 + }, + { + "__id__": 240 + }, + { + "__id__": 242 + }, + { + "__id__": 243 } ], "removedComponents": [] @@ -3048,7 +3100,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 206 + "__id__": 210 }, "propertyPath": [ "_name" @@ -3064,7 +3116,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 206 + "__id__": 210 }, "propertyPath": [ "_lpos" @@ -3079,7 +3131,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 206 + "__id__": 210 }, "propertyPath": [ "_lrot" @@ -3095,7 +3147,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 206 + "__id__": 210 }, "propertyPath": [ "_euler" @@ -3110,7 +3162,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 211 + "__id__": 215 }, "propertyPath": [ "clickEvents", @@ -3130,7 +3182,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 211 + "__id__": 215 }, "propertyPath": [ "clickEvents", @@ -3142,7 +3194,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 211 + "__id__": 215 }, "propertyPath": [ "clickEvents", @@ -3154,7 +3206,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 215 + "__id__": 219 }, "propertyPath": [ "_contentSize" @@ -3174,7 +3226,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 217 + "__id__": 221 }, "propertyPath": [ "_contentSize" @@ -3194,7 +3246,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 223 }, "propertyPath": [ "_lpos" @@ -3215,7 +3267,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 221 + "__id__": 225 }, "propertyPath": [ "_contentSize" @@ -3235,7 +3287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 223 + "__id__": 227 }, "propertyPath": [ "_contentSize" @@ -3255,7 +3307,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 225 + "__id__": 229 }, "propertyPath": [ "_contentSize" @@ -3275,7 +3327,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 227 + "__id__": 231 }, "propertyPath": [ "_lpos" @@ -3296,7 +3348,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 223 }, "propertyPath": [ "_active" @@ -3306,7 +3358,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 230 + "__id__": 234 }, "propertyPath": [ "_contentSize" @@ -3326,7 +3378,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 232 + "__id__": 236 }, "propertyPath": [ "_spriteFrame" @@ -3345,7 +3397,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 232 + "__id__": 236 }, "propertyPath": [ "_atlas" @@ -3358,7 +3410,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 235 + "__id__": 239 }, "propertyPath": [ "_fontSize" @@ -3374,7 +3426,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 237 + "__id__": 241 }, "propertyPath": [ "_contentSize" @@ -3394,24 +3446,34 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 235 + "__id__": 239 }, "propertyPath": [ "_actualFontSize" ], "value": 30 }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 239 + }, + "propertyPath": [ + "_string" + ], + "value": "天赋" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 130 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 245 }, "_contentSize": { "__type__": "cc.Size", @@ -3435,11 +3497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 130 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 247 }, "_alignFlags": 44, "_target": null, @@ -3471,11 +3533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 130 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 249 }, "_resizeMode": 1, "_layoutType": 1, @@ -3522,11 +3584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 252 }, "_contentSize": { "__type__": "cc.Size", @@ -3550,11 +3612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 254 }, "_alignFlags": 44, "_target": null, @@ -3603,7 +3665,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 257 }, "_contentSize": { "__type__": "cc.Size", @@ -3631,7 +3693,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 259 }, "_alignFlags": 21, "_target": null, @@ -3667,32 +3729,32 @@ }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 261 }, "start_btn": { "__id__": 18 }, "home_btn": { - "__id__": 171 + "__id__": 175 }, "hero_btn": { - "__id__": 131 + "__id__": 135 }, "rank_btn": null, "tals_btn": { - "__id__": 202 + "__id__": 206 }, "top_bar_node": { - "__id__": 257 + "__id__": 262 }, "heros_page": { "__id__": 78 }, "talents_page": { - "__id__": 94 + "__id__": 98 }, "ranks_page": { - "__id__": 103 + "__id__": 107 }, "_id": "" }, @@ -3707,14 +3769,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 258 + "__id__": 263 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 257 + "__id__": 262 }, "asset": { "__uuid__": "56aee962-4a5e-45ae-a779-999444d06d18", @@ -3722,7 +3784,7 @@ }, "fileId": "cboM54s0hM07XCtrpFp0/b", "instance": { - "__id__": 259 + "__id__": 264 }, "targetOverrides": null }, @@ -3735,18 +3797,6 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 260 - }, - { - "__id__": 262 - }, - { - "__id__": 263 - }, - { - "__id__": 264 - }, { "__id__": 265 }, @@ -3764,6 +3814,18 @@ }, { "__id__": 272 + }, + { + "__id__": 273 + }, + { + "__id__": 274 + }, + { + "__id__": 275 + }, + { + "__id__": 277 } ], "removedComponents": [] @@ -3771,7 +3833,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 261 + "__id__": 266 }, "propertyPath": [ "_name" @@ -3787,7 +3849,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 261 + "__id__": 266 }, "propertyPath": [ "_lpos" @@ -3802,7 +3864,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 261 + "__id__": 266 }, "propertyPath": [ "_lrot" @@ -3818,7 +3880,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 261 + "__id__": 266 }, "propertyPath": [ "_euler" @@ -3833,7 +3895,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 266 + "__id__": 271 }, "propertyPath": [ "_top" @@ -3849,7 +3911,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 266 + "__id__": 271 }, "propertyPath": [ "_alignFlags" @@ -3859,7 +3921,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 266 + "__id__": 271 }, "propertyPath": [ "_bottom" @@ -3869,7 +3931,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 261 + "__id__": 266 }, "propertyPath": [ "_active" @@ -3879,7 +3941,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 271 + "__id__": 276 }, "propertyPath": [ "_active" @@ -3895,7 +3957,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 273 + "__id__": 278 }, "propertyPath": [ "_active" @@ -3928,14 +3990,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 276 + "__id__": 281 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 275 + "__id__": 280 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -3943,7 +4005,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 277 + "__id__": 282 }, "targetOverrides": null }, @@ -3956,20 +4018,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 278 - }, - { - "__id__": 280 - }, - { - "__id__": 281 - }, - { - "__id__": 282 - }, { "__id__": 283 + }, + { + "__id__": 285 + }, + { + "__id__": 286 + }, + { + "__id__": 287 + }, + { + "__id__": 288 } ], "removedComponents": [] @@ -3977,7 +4039,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 279 + "__id__": 284 }, "propertyPath": [ "_name" @@ -3993,7 +4055,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 279 + "__id__": 284 }, "propertyPath": [ "_lpos" @@ -4008,7 +4070,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 279 + "__id__": 284 }, "propertyPath": [ "_lrot" @@ -4024,7 +4086,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 279 + "__id__": 284 }, "propertyPath": [ "_euler" @@ -4039,7 +4101,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 279 + "__id__": 284 }, "propertyPath": [ "_active" @@ -4056,7 +4118,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 290 }, "_contentSize": { "__type__": "cc.Size", @@ -4084,7 +4146,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 292 }, "_alignFlags": 45, "_target": null, @@ -4120,7 +4182,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 294 }, "debugMode": false, "_id": "" @@ -4141,42 +4203,42 @@ "instance": null, "targetOverrides": [ { - "__id__": 291 + "__id__": 296 }, { - "__id__": 294 + "__id__": 299 }, { - "__id__": 297 + "__id__": 302 }, { - "__id__": 300 + "__id__": 305 }, { - "__id__": 303 + "__id__": 308 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 257 + "__id__": 262 }, { - "__id__": 275 + "__id__": 280 }, { - "__id__": 202 + "__id__": 206 }, { - "__id__": 171 + "__id__": 175 }, { - "__id__": 131 + "__id__": 135 }, { - "__id__": 103 + "__id__": 107 }, { - "__id__": 94 + "__id__": 98 }, { "__id__": 78 @@ -4198,7 +4260,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 292 + "__id__": 297 }, "propertyPath": [ "hero1" @@ -4207,7 +4269,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 293 + "__id__": 298 } }, { @@ -4228,7 +4290,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 295 + "__id__": 300 }, "propertyPath": [ "hero2" @@ -4237,7 +4299,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 296 + "__id__": 301 } }, { @@ -4258,7 +4320,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 298 + "__id__": 303 }, "propertyPath": [ "hero3" @@ -4267,7 +4329,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 299 + "__id__": 304 } }, { @@ -4288,7 +4350,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 301 + "__id__": 306 }, "propertyPath": [ "hero4" @@ -4297,7 +4359,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 302 + "__id__": 307 } }, { @@ -4318,7 +4380,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 304 + "__id__": 309 }, "propertyPath": [ "hero5" @@ -4327,7 +4389,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 305 + "__id__": 310 } }, { diff --git a/assets/script/game/map/HerosListComp.ts b/assets/script/game/map/HerosListComp.ts index 69bc9e16..04bddb2d 100644 --- a/assets/script/game/map/HerosListComp.ts +++ b/assets/script/game/map/HerosListComp.ts @@ -146,7 +146,7 @@ export class HerosListComp extends CCComp { // 确保 smalltip 气泡初始隐藏,避免遮挡按钮触摸(组件缺失时兜底补挂) const tipNode = this.upgrade_btn.getChildByName("smalltip") if (tipNode) { - const tip = tipNode.getComponent(SmallTipComp) ?? tipNode.addComponent(SmallTipComp) + tipNode.getComponent(SmallTipComp) ?? tipNode.addComponent(SmallTipComp) tipNode.active = false } diff --git a/assets/script/game/map/SmallTipComp.ts.meta b/assets/script/game/map/SmallTipComp.ts.meta new file mode 100644 index 00000000..799a80d3 --- /dev/null +++ b/assets/script/game/map/SmallTipComp.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "366cac88-417b-40cc-92e2-9b39d03a9333", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/map/TalentsComp.ts b/assets/script/game/map/TalentsComp.ts index 28432121..4c7f9c34 100644 --- a/assets/script/game/map/TalentsComp.ts +++ b/assets/script/game/map/TalentsComp.ts @@ -23,6 +23,7 @@ import { } from "../common/config/TalentSet"; import { GameEvent } from "../common/config/GameEvent"; import { UIID } from "../common/config/GameUIConfig"; +import { SmallTipComp } from "./SmallTipComp"; import { TalentItemComp } from "./TalentItemComp"; import { smc } from "../common/SingletonModuleComp"; import { oops } from "db://oops-framework/core/Oops"; @@ -45,6 +46,9 @@ const TAB_LOCKED_CHILD = "locked"; /** 阶位页签未选中态子节点名(可选;非当前选中页签时显示) */ const TAB_INACTIVE_CHILD = "noactive"; +/** 页签/卡片上的 smalltip 气泡节点名 */ +const SMALL_TIP_CHILD = "smalltip"; + /** TalentsComp —— 天赋加点页组件(阶位 Tab 单屏聚焦) */ @ccclass('TalentsComp') @ecs.register('Talents', false) @@ -92,13 +96,13 @@ export class TalentsComp extends CCComp { /** 是否已完成首次默认阶位选择 */ private inited: boolean = false; - /** 阶位 → 页签节点/文案 映射(onLoad 时装配) */ - private tabNodes: Map = new Map(); + /** 阶位 → 页签节点/文案/气泡 映射(onLoad 时装配) */ + private tabNodes: Map = new Map(); protected onLoad(): void { - this.tabNodes.set(TalentTier.Basic, { node: this.tab_basic, label: this.lbl_tab_basic }); - this.tabNodes.set(TalentTier.Specialized, { node: this.tab_special, label: this.lbl_tab_special }); - this.tabNodes.set(TalentTier.Super, { node: this.tab_super, label: this.lbl_tab_super }); + this.tabNodes.set(TalentTier.Basic, { node: this.tab_basic, label: this.lbl_tab_basic, tip: this.getSmallTip(this.tab_basic) }); + this.tabNodes.set(TalentTier.Specialized, { node: this.tab_special, label: this.lbl_tab_special, tip: this.getSmallTip(this.tab_special) }); + this.tabNodes.set(TalentTier.Super, { node: this.tab_super, label: this.lbl_tab_super, tip: this.getSmallTip(this.tab_super) }); for (const [tier, tab] of this.tabNodes) { tab.node?.on(NodeEventType.TOUCH_END, () => this.selectTier(tier), this); @@ -216,26 +220,46 @@ export class TalentsComp extends CCComp { } } - /** 卡片点击统一入口:未解锁/已满级直接 toast;其余弹出 CommonPrompt 确认加点,成功后事件驱动刷新 */ + /** + * 获取挂载点下的 smalltip 气泡组件(节点缺失或组件未挂时返回 null 并静默跳过提示) + * @param parent 气泡挂载的父节点 + */ + private getSmallTip(parent: Node | null): SmallTipComp | null { + const tipNode = parent?.getChildByName(SMALL_TIP_CHILD); + return tipNode ? (tipNode.getComponent(SmallTipComp) ?? tipNode.addComponent(SmallTipComp)) : null; + } + + /** + * 在指定节点下弹出 smalltip 气泡提示 + * @param anchor 气泡挂载的父节点(优先页签,卡片点击时传卡片节点) + * @param text 提示文案 + */ + private showSmallTip(anchor: Node | null, text: string): void { + const tip = this.getSmallTip(anchor); + tip?.show(text); + } + + /** 卡片点击统一入口:未解锁/已满级/点数不足走 smalltip 气泡;其余弹出 CommonPrompt 确认加点,成功后事件驱动刷新 */ private onTalentTap(uuid: number): void { const cfg = TalentSet[uuid]; if (!cfg) return; const levels = smc.getTalentLevels(); + const tab = this.tabNodes.get(cfg.tier); if (!isTalentTierUnlocked(levels, cfg.tier)) { const invested = getTalentTierInvestedPoints(levels, (cfg.tier - 1) as TalentTier); - oops.gui.toast(`${TIER_TAB_TEXT[cfg.tier].lockName}投入 ${invested}/${TALENT_TIER_UNLOCK_THRESHOLD} 点解锁本阶`); + this.showSmallTip(tab?.node ?? null, `${TIER_TAB_TEXT[cfg.tier].lockName}投入 ${invested}/${TALENT_TIER_UNLOCK_THRESHOLD} 点解锁本阶`); return; } const lv = smc.getTalentLv(uuid); if (lv >= cfg.max_lv) { - oops.gui.toast("该天赋已满级"); + this.showSmallTip(tab?.node ?? null, "该天赋已满级"); return; } const cost = getTalentUpgradeCost(lv); if (cost <= 0) return; if (smc.getTalentPoints() < cost) { - oops.gui.toast("天赋点不足"); + this.showSmallTip(tab?.node ?? null, "天赋点不足"); return; } @@ -249,7 +273,7 @@ export class TalentsComp extends CCComp { maskClose: true, okFunc: () => { if (!smc.upgradeTalent(uuid)) { - oops.gui.toast("天赋点不足"); + this.showSmallTip(this.tabNodes.get(cfg.tier)?.node ?? null, "天赋点不足"); } }, });