This commit is contained in:
2025-08-04 00:37:57 +08:00
parent f579ed49e7
commit 7b424d1649
6 changed files with 13972 additions and 13880 deletions

View File

@@ -405,8 +405,8 @@
}, },
"_lscale": { "_lscale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.3, "x": 0.45,
"y": 0.3, "y": 0.45,
"z": 1 "z": 1
}, },
"_mobility": 0, "_mobility": 0,
@@ -772,7 +772,7 @@
"value": { "value": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 107.768, "y": 133.985,
"z": 0 "z": 0
} }
}, },
@@ -1344,8 +1344,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 80, "width": 120,
"height": 80 "height": 120
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",

View File

@@ -381,6 +381,9 @@
}, },
{ {
"__id__": 50 "__id__": 50
},
{
"__id__": 56
} }
], ],
"_active": true, "_active": true,
@@ -1282,6 +1285,142 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{
"__type__": "cc.Node",
"_name": "house",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 9
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
},
{
"__id__": 53
}
],
"_prefab": {
"__id__": 55
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -147.87,
"y": 110.478,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": -1.3,
"y": 1.3,
"z": 1
},
"_mobility": 0,
"_layer": 1,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 50
},
"_enabled": true,
"__prefab": {
"__id__": 52
},
"_contentSize": {
"__type__": "cc.Size",
"width": 183,
"height": 159
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "91lwysQR1La6wiHpGF7GVt"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 50
},
"_enabled": true,
"__prefab": {
"__id__": 54
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "f9082121-7cee-4e52-83df-b8013a345aa3@2de81",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2f24LC6xBEsb6xfbXMc/fS"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "a6vkYCe/ZP9rXIpj0wCoSm",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "TX Tileset Ground-0", "_name": "TX Tileset Ground-0",
@@ -1291,9 +1430,6 @@
"__id__": 9 "__id__": 9
}, },
"_children": [ "_children": [
{
"__id__": 51
},
{ {
"__id__": 57 "__id__": 57
}, },
@@ -1367,8 +1503,8 @@
}, },
"_lscale": { "_lscale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 1, "x": 1.3,
"y": 1, "y": 1.3,
"z": 1 "z": 1
}, },
"_mobility": 0, "_mobility": 0,
@@ -1381,149 +1517,13 @@
}, },
"_id": "" "_id": ""
}, },
{
"__type__": "cc.Node",
"_name": "house",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
},
{
"__id__": 54
}
],
"_prefab": {
"__id__": 56
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -123.385,
"y": 78.519,
"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": 1,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 51
},
"_enabled": true,
"__prefab": {
"__id__": 53
},
"_contentSize": {
"__type__": "cc.Size",
"width": 183,
"height": 159
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "91lwysQR1La6wiHpGF7GVt"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 51
},
"_enabled": true,
"__prefab": {
"__id__": 55
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "f9082121-7cee-4e52-83df-b8013a345aa3@2de81",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2f24LC6xBEsb6xfbXMc/fS"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "a6vkYCe/ZP9rXIpj0wCoSm",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "TX Village Props-155", "_name": "TX Village Props-155",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -1659,7 +1659,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -1795,7 +1795,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -1812,7 +1812,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 156.326, "x": 108.397,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
@@ -1931,7 +1931,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -1948,7 +1948,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 163.787, "x": 115.858,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
@@ -2067,7 +2067,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -2084,7 +2084,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 155.996, "x": 108.067,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
@@ -2203,7 +2203,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -2339,7 +2339,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -2475,7 +2475,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -2611,7 +2611,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -2747,7 +2747,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -2883,7 +2883,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -3019,7 +3019,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -3155,7 +3155,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -3291,7 +3291,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -3427,7 +3427,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
@@ -3563,7 +3563,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
@@ -3591,7 +3591,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
@@ -3770,7 +3770,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "6e0k+U+3NCPZW3DtrZqraj" "_id": "f63rCuLghK6oyBx0QqngLp"
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",

File diff suppressed because it is too large Load Diff

View File

@@ -10697,8 +10697,8 @@
"height": 28, "height": 28,
"rawWidth": 150, "rawWidth": 150,
"rawHeight": 28, "rawHeight": 28,
"borderTop": 0, "borderTop": 14,
"borderBottom": 0, "borderBottom": 14,
"borderLeft": 0, "borderLeft": 0,
"borderRight": 0, "borderRight": 0,
"packable": true, "packable": true,
@@ -12077,8 +12077,8 @@
"height": 52, "height": 52,
"rawWidth": 87, "rawWidth": 87,
"rawHeight": 52, "rawHeight": 52,
"borderTop": 0, "borderTop": 26,
"borderBottom": 0, "borderBottom": 26,
"borderLeft": 43, "borderLeft": 43,
"borderRight": 43, "borderRight": 43,
"packable": true, "packable": true,

View File

@@ -40,7 +40,7 @@ export const MonList = [5201,5202,5203,5204,5205,5206,5219,5220,5221,5222,5223,5
export const Masters = [5001,5002,5003,5004,5005,5006,5007,5008,5009,5010,5011,5012] export const Masters = [5001,5002,5003,5004,5005,5006,5007,5008,5009,5010,5011,5012]
export const HeroPos={ export const HeroPos={
0:{pos:v3(-290,0,0)}, 0:{pos:v3(-160,0,0)},
1:{pos:v3(0,0,0)}, 1:{pos:v3(0,0,0)},
2:{pos:v3(-100,0,0)}, 2:{pos:v3(-100,0,0)},
} }

View File

@@ -24,7 +24,6 @@ export class BarCompComp extends CCComp {
protected onLoad(): void { protected onLoad(): void {
this.on(GameEvent.FightReady,this.readay,this) this.on(GameEvent.FightReady,this.readay,this)
this.on(GameEvent.MasterCalled,this.master_called,this) this.on(GameEvent.MasterCalled,this.master_called,this)
this.on(GameEvent.APChange,this.ap_change,this)
} }
@@ -46,18 +45,6 @@ export class BarCompComp extends CCComp {
}); });
} }
private ap_change(e:any,data:any){
console.log("[barcomp]:ap_change",data)
if(data.is_master==true){
let barNode = this.node.getChildByName("bar").getChildByName("ap").getChildByName("val")
tween(barNode).to(0.2, {scale:v3(1.5,1.5,1)},{
onComplete:()=>{
tween(barNode).to(0.1, {scale:v3(1,1,1)}).start()
}
}).start()
}
}
show_master_more(){ show_master_more(){