pan/heros
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

英雄碎片修改

Browse Source
This commit is contained in:
panw
2025-01-09 10:49:11 +08:00
parent 4c68d9484b
commit 4d6d35725b
5 changed files with 1336 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
assets/resources/game/gui/hchip.prefab
View File

@@ -142,8 +142,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120, "width": 130,
"height": 120 "height": 145
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -353,8 +353,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120, "width": 130,
"height": 120 "height": 145
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -564,8 +564,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120, "width": 130,
"height": 120 "height": 145
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -789,7 +789,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -75.015, "y": -89.732,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -801,8 +801,8 @@
}, },
"_lscale": { "_lscale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.6, "x": 0.7,
"y": 0.6, "y": 0.7,
"z": 1 "z": 1
}, },
"_mobility": 0, "_mobility": 0,
@@ -915,8 +915,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 95, "width": 115,
"height": 95 "height": 130
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -1033,8 +1033,8 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 36.297, "x": 37.317,
"y": -33.879, "y": -46.597,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -1074,8 +1074,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 17.90380859375, "width": 20.6845703125,
"height": 39.28 "height": 41.8
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -1113,10 +1113,10 @@
"_string": "1", "_string": "1",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 25, "_actualFontSize": 30,
"_fontSize": 25, "_fontSize": 30,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 28, "_lineHeight": 30,
"_overflow": 0, "_overflow": 0,
"_enableWrapText": true, "_enableWrapText": true,
"_font": null, "_font": null,
@@ -1183,8 +1183,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 130,
"height": 100 "height": 150
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",

165
assets/resources/gui/element/item_info.prefab
View File

@@ -34,26 +34,26 @@
"__id__": 78 "__id__": 78
}, },
{ {
"__id__": 87 "__id__": 90
}, },
{ {
"__id__": 112 "__id__": 115
}, },
{ {
"__id__": 118 "__id__": 121
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 127
}, },
{ {
"__id__": 126 "__id__": 129
} }
], ],
"_prefab": { "_prefab": {
"__id__": 128 "__id__": 131
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -1880,6 +1880,12 @@
}, },
{ {
"__id__": 86 "__id__": 86
},
{
"__id__": 87
},
{
"__id__": 88
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -1911,7 +1917,7 @@
"value": { "value": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -277.953, "x": -277.953,
"y": 139, "y": 134.528,
"z": 0 "z": 0
} }
}, },
@@ -1954,7 +1960,42 @@
"propertyPath": [ "propertyPath": [
"_active" "_active"
], ],
"value": false "value": true
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 82
},
"propertyPath": [
"_lscale"
],
"value": {
"__type__": "cc.Vec3",
"x": 0.7,
"y": 0.7,
"z": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 89
},
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
"width": 130,
"height": 155
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"bafb2QLFdOPYA6doPdH0gj"
]
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
@@ -1966,23 +2007,23 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 88 "__id__": 91
}, },
{ {
"__id__": 100 "__id__": 103
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 109
}, },
{ {
"__id__": 108 "__id__": 111
} }
], ],
"_prefab": { "_prefab": {
"__id__": 111 "__id__": 114
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2017,17 +2058,17 @@
"__type__": "cc.Node", "__type__": "cc.Node",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 87 "__id__": 90
}, },
"_prefab": { "_prefab": {
"__id__": 89 "__id__": 92
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 88 "__id__": 91
}, },
"asset": { "asset": {
"__uuid__": "915a4408-90ea-4c30-9974-05d96c0c27f1", "__uuid__": "915a4408-90ea-4c30-9974-05d96c0c27f1",
@@ -2035,7 +2076,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 90 "__id__": 93
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -2048,23 +2089,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 91
},
{
"__id__": 93
},
{ {
"__id__": 94 "__id__": 94
}, },
{
"__id__": 95
},
{ {
"__id__": 96 "__id__": 96
}, },
{
"__id__": 97
},
{ {
"__id__": 98 "__id__": 98
},
{
"__id__": 99
},
{
"__id__": 101
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -2072,7 +2113,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 92 "__id__": 95
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -2088,7 +2129,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 92 "__id__": 95
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -2103,7 +2144,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 92 "__id__": 95
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -2119,7 +2160,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 92 "__id__": 95
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -2134,7 +2175,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 97 "__id__": 100
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -2155,7 +2196,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 99 "__id__": 102
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -2178,20 +2219,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 87 "__id__": 90
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 104
}, },
{ {
"__id__": 103 "__id__": 106
} }
], ],
"_prefab": { "_prefab": {
"__id__": 105 "__id__": 108
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2228,11 +2269,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 100 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 102 "__id__": 105
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2256,11 +2297,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 100 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 104 "__id__": 107
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -2337,11 +2378,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 87 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 107 "__id__": 110
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2365,15 +2406,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 87 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 109 "__id__": 112
}, },
"clickEvents": [ "clickEvents": [
{ {
"__id__": 110 "__id__": 113
} }
], ],
"_interactable": true, "_interactable": true,
@@ -2454,14 +2495,14 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 116
}, },
{ {
"__id__": 115 "__id__": 118
} }
], ],
"_prefab": { "_prefab": {
"__id__": 117 "__id__": 120
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2498,11 +2539,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 112 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 114 "__id__": 117
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2526,11 +2567,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 112 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 116 "__id__": 119
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -2590,14 +2631,14 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 122
}, },
{ {
"__id__": 121 "__id__": 124
} }
], ],
"_prefab": { "_prefab": {
"__id__": 123 "__id__": 126
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -2634,11 +2675,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 118 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 120 "__id__": 123
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2662,11 +2703,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 118 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 122 "__id__": 125
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -2747,7 +2788,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 125 "__id__": 128
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -2775,7 +2816,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 127 "__id__": 130
}, },
"_id": "" "_id": ""
}, },
@@ -2796,7 +2837,7 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 88 "__id__": 91
}, },
{ {
"__id__": 78 "__id__": 78

2389
assets/resources/gui/role_controller.prefab
View File

File diff suppressed because it is too large Load Diff

6
assets/script/game/common/SingletonModuleComp.ts
View File

@@ -65,7 +65,11 @@ export class SingletonModuleComp extends ecs.Comp {
{uuid:9001,num:100000,type:0,cost:0,inventory:5}, {uuid:9001,num:100000,type:0,cost:0,inventory:5},
{uuid:9003,num:1000,type:1,cost:0,inventory:5}, {uuid:9003,num:1000,type:1,cost:0,inventory:5},
{uuid:1001,num:10,type:2,cost:10000,inventory:99}, {uuid:1001,num:10,type:2,cost:10000,inventory:99},
{uuid:5001,num:10,type:3,cost:10000,inventory:99}, {uuid:1001,num:10,type:2,cost:10000,inventory:99},
{uuid:1001,num:10,type:2,cost:10000,inventory:99},
{uuid:1001,num:10,type:2,cost:10000,inventory:99},
{uuid:1001,num:10,type:2,cost:10000,inventory:99},
{uuid:1001,num:10,type:2,cost:10000,inventory:99},
]; ];
items:any={ items:any={
1001:{uuid:1001,num:10,x1:1}, 1001:{uuid:1001,num:10,x1:1},

5
assets/script/game/hero/HeroViewComp.ts
View File

@@ -726,9 +726,8 @@ export class HeroViewComp extends CCComp {
this.pw+= p this.pw+= p
} }
/** /**
* 增加英雄的行动点数（AP）。 * 增加英雄的攻击（AP）。
* @param ap 要增加的行动点数。 * @param ap 要增加的攻击。
* @param time 可选参数，表示增加行动点数的时间，默认为0。
*/ */
add_ap(ap: number){ add_ap(ap: number){
this.ap += Math.floor(ap); this.ap += Math.floor(ap);