From caf1b9a079e5c134fc699f939911bf27e69681cb Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Thu, 14 Nov 2024 16:55:30 +0800 Subject: [PATCH] dd --- assets/resources/gui/role_controller.prefab | 6857 +++++++++++++---- .../script/game/common/SingletonModuleComp.ts | 10 +- assets/script/game/common/config/heroSet.ts | 3 +- 3 files changed, 5425 insertions(+), 1445 deletions(-) diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 08718571..786611c9 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -42,45 +42,45 @@ { "__id__": 542 }, - { - "__id__": 1036 - }, - { - "__id__": 1087 - }, - { - "__id__": 1096 - }, - { - "__id__": 1105 - }, - { - "__id__": 1109 - }, - { - "__id__": 1117 - }, { "__id__": 1206 }, { - "__id__": 1215 + "__id__": 1257 + }, + { + "__id__": 1266 + }, + { + "__id__": 1275 + }, + { + "__id__": 1279 + }, + { + "__id__": 1287 + }, + { + "__id__": 1376 + }, + { + "__id__": 1385 } ], "_active": true, "_components": [ { - "__id__": 1221 + "__id__": 1391 }, { - "__id__": 1223 + "__id__": 1393 }, { - "__id__": 1225 + "__id__": 1395 } ], "_prefab": { - "__id__": 1227 + "__id__": 1397 }, "_lpos": { "__type__": "cc.Vec3", @@ -12270,20 +12270,26 @@ "__id__": 788 }, { - "__id__": 1012 - } - ], - "_active": false, - "_components": [ - { - "__id__": 1031 + "__id__": 974 }, { - "__id__": 1033 + "__id__": 993 + }, + { + "__id__": 1097 + } + ], + "_active": true, + "_components": [ + { + "__id__": 1201 + }, + { + "__id__": 1203 } ], "_prefab": { - "__id__": 1035 + "__id__": 1205 }, "_lpos": { "__type__": "cc.Vec3", @@ -18063,35 +18069,32 @@ "__id__": 789 }, { - "__id__": 827 + "__id__": 819 }, { - "__id__": 857 + "__id__": 849 }, { - "__id__": 887 + "__id__": 879 }, { - "__id__": 917 + "__id__": 909 }, { - "__id__": 947 - }, - { - "__id__": 977 + "__id__": 939 } ], "_active": false, "_components": [ { - "__id__": 1007 + "__id__": 969 }, { - "__id__": 1009 + "__id__": 971 } ], "_prefab": { - "__id__": 1011 + "__id__": 973 }, "_lpos": { "__type__": "cc.Vec3", @@ -18124,7 +18127,7 @@ }, { "__type__": "cc.Node", - "_name": "coin", + "_name": "t_damge", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -18138,41 +18141,38 @@ "__id__": 796 }, { - "__id__": 806 + "__id__": 802 }, + { + "__id__": 808 + } + ], + "_active": false, + "_components": [ { "__id__": 816 } ], - "_active": true, - "_components": [ - { - "__id__": 822 - }, - { - "__id__": 824 - } - ], "_prefab": { - "__id__": 826 + "__id__": 818 }, "_lpos": { "__type__": "cc.Vec3", - "x": -50, - "y": 0, + "x": -339.678, + "y": 838.894, "z": 0 }, "_lrot": { "__type__": "cc.Quat", "x": 0, - "y": 1.2246467991473532e-16, + "y": 0, "z": 0, "w": 1 }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -18180,14 +18180,14 @@ "_euler": { "__type__": "cc.Vec3", "x": 0, - "y": 1.4033418597069752e-14, + "y": 0, "z": 0 }, "_id": "" }, { "__type__": "cc.Node", - "_name": "line_bg", + "_name": "data_bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -18247,829 +18247,6 @@ "__prefab": { "__id__": 792 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 120, - "height": 50 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2bqelMv1EEqy5sJ3drtRa" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 790 - }, - "_enabled": true, - "__prefab": { - "__id__": 794 - }, - "_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@58cb7", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_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": "2dVta7D7VOBZBj58PJWtvT" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "1cwLYNFM5BbZY9U4pXcA+q", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "coin", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 789 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 797 - }, - { - "__id__": 799 - }, - { - "__id__": 801 - }, - { - "__id__": 803 - } - ], - "_prefab": { - "__id__": 805 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 74.51, - "y": 25, - "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": "lab_progress", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 796 - }, - "_enabled": true, - "__prefab": { - "__id__": 798 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 52.0537109375, - "height": 39.8 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "86zRK4Q91JN5z8Hx5Dg1Um" - }, - { - "__type__": "cc.Label", - "_name": "lab_progress