This commit is contained in:
2024-09-26 10:59:19 +08:00
parent 5831697fb8
commit bede70f49f
6 changed files with 12023 additions and 10823 deletions

View File

@@ -28,17 +28,17 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 514 "__id__": 502
}, },
{ {
"__id__": 516 "__id__": 504
}, },
{ {
"__id__": 518 "__id__": 506
} }
], ],
"_prefab": { "_prefab": {
"__id__": 520 "__id__": 508
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -197,17 +197,17 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 507 "__id__": 495
}, },
{ {
"__id__": 509 "__id__": 497
}, },
{ {
"__id__": 511 "__id__": 499
} }
], ],
"_prefab": { "_prefab": {
"__id__": 513 "__id__": 501
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -258,22 +258,16 @@
}, },
{ {
"__id__": 486 "__id__": 486
},
{
"__id__": 492
},
{
"__id__": 498
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 504 "__id__": 492
} }
], ],
"_prefab": { "_prefab": {
"__id__": 506 "__id__": 494
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -10896,8 +10890,6 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "6dFdGsgPxD8oVoba7hVEO3", "fileId": "6dFdGsgPxD8oVoba7hVEO3",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
@@ -11095,7 +11087,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "EntityLayer1", "_name": "EntityLayer",
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
@@ -11169,7 +11161,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f4UHtJSdBGoJN5JNrTo0Cc" "fileId": "f91Y4OCX1NFKfSWOAvmdSa"
}, },
{ {
"__type__": "6639ayo4DFKZYCU2OBZzyb+", "__type__": "6639ayo4DFKZYCU2OBZzyb+",
@@ -11187,7 +11179,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "9cpgNjFL5L1Ig8YQrAcaO8" "fileId": "6fzmfjcbNPK6tOzQOKJfRV"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@@ -11197,14 +11189,14 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "99wEvV2I5Pv6rwpPNwdrxE", "fileId": "77ZGG4JjxGiol1pDVFrjGQ",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "EntityLayer", "_name": "SkillLayer",
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
@@ -11269,224 +11261,6 @@
"width": 100, "width": 100,
"height": 100 "height": 100
}, },
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "f91Y4OCX1NFKfSWOAvmdSa"
},
{
"__type__": "6639ayo4DFKZYCU2OBZzyb+",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 486
},
"_enabled": true,
"__prefab": {
"__id__": 490
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "6fzmfjcbNPK6tOzQOKJfRV"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "77ZGG4JjxGiol1pDVFrjGQ",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "EntityLayer2",
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 493
},
{
"__id__": 495
}
],
"_prefab": {
"__id__": 497
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"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__": 492
},
"_enabled": true,
"__prefab": {
"__id__": 494
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "fcl9eWhS9K6ZtX9Z626PPp"
},
{
"__type__": "6639ayo4DFKZYCU2OBZzyb+",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 492
},
"_enabled": true,
"__prefab": {
"__id__": 496
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "a2VlMB5DNOr4wbzGgH2lXk"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "4fP7G4KUBB+56gZWSQoIpq",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "SkillLayer",
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 499
},
{
"__id__": 501
}
],
"_prefab": {
"__id__": 503
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"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__": 498
},
"_enabled": true,
"__prefab": {
"__id__": 500
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0.5,
@@ -11504,11 +11278,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 498 "__id__": 486
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 502 "__id__": 490
}, },
"light": { "light": {
"__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8", "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8",
@@ -11543,7 +11317,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 505 "__id__": 493
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -11570,8 +11344,6 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "68Q5vEQWBINrggngtTZ7wh", "fileId": "68Q5vEQWBINrggngtTZ7wh",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
@@ -11584,7 +11356,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 508 "__id__": 496
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -11612,7 +11384,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 510 "__id__": 498
}, },
"camera": { "camera": {
"__id__": 3 "__id__": 3
@@ -11627,16 +11399,10 @@
"__id__": 476 "__id__": 476
}, },
"entityLayer": { "entityLayer": {
"__id__": 489
},
"entityLayer1": {
"__id__": 483 "__id__": 483
}, },
"entityLayer2": {
"__id__": 495
},
"SkillLayer": { "SkillLayer": {
"__id__": 501 "__id__": 489
}, },
"isFollowPlayer": true, "isFollowPlayer": true,
"_id": "" "_id": ""
@@ -11655,7 +11421,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 512 "__id__": 500
}, },
"_id": "" "_id": ""
}, },
@@ -11686,7 +11452,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 515 "__id__": 503
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -11714,7 +11480,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 517 "__id__": 505
}, },
"_cameraComponent": { "_cameraComponent": {
"__id__": 3 "__id__": 3
@@ -11736,7 +11502,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 519 "__id__": 507
}, },
"_alignFlags": 45, "_alignFlags": 45,
"_target": null, "_target": null,

View File

@@ -1819,10 +1819,10 @@
"height": 114, "height": 114,
"rawWidth": 70, "rawWidth": 70,
"rawHeight": 114, "rawHeight": 114,
"borderTop": 0, "borderTop": 63,
"borderBottom": 0, "borderBottom": 45,
"borderLeft": 0, "borderLeft": 30,
"borderRight": 0, "borderRight": 27,
"packable": true, "packable": true,
"pixelsToUnit": 100, "pixelsToUnit": 100,
"pivotX": 0.5, "pivotX": 0.5,
@@ -1911,8 +1911,8 @@
"height": 114, "height": 114,
"rawWidth": 70, "rawWidth": 70,
"rawHeight": 114, "rawHeight": 114,
"borderTop": 0, "borderTop": 63,
"borderBottom": 0, "borderBottom": 45,
"borderLeft": 31, "borderLeft": 31,
"borderRight": 32, "borderRight": 32,
"packable": true, "packable": true,

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -8,6 +8,8 @@ import { SkillSet } from "../common/config/SkillSet";
import { HeroModelComp } from "../hero/HeroModelComp"; import { HeroModelComp } from "../hero/HeroModelComp";
import { RewardSet } from "../common/config/RewardSet"; import { RewardSet } from "../common/config/RewardSet";
import { GameSet } from "../common/config/BoxSet"; import { GameSet } from "../common/config/BoxSet";
import { GameMap } from "./GameMap";
import { MapModelComp } from "./model/MapModelComp";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
/** 视图层对象 */ /** 视图层对象 */
@@ -198,6 +200,9 @@ export class CardControllerComp extends CCComp {
smc.vm_data.gold.time = 0; smc.vm_data.gold.time = 0;
} }
} }
mission_change(){
this.node.getChildByName("mission").active=!this.node.getChildByName("mission").active
}
/** 视图对象通过 ecs.Entity.remove(ControllerComp) 删除组件是触发组件处理自定义释放逻辑 */ /** 视图对象通过 ecs.Entity.remove(ControllerComp) 删除组件是触发组件处理自定义释放逻辑 */
reset() { reset() {
this.node.destroy(); this.node.destroy();

View File

@@ -26,10 +26,7 @@ export class MapViewScene extends Component {
@property(EntityLayer) @property(EntityLayer)
public entityLayer: EntityLayer | null = null; public entityLayer: EntityLayer | null = null;
@property(EntityLayer)
public entityLayer1: EntityLayer | null = null;
@property(EntityLayer)
public entityLayer2: EntityLayer | null = null;
@property(SkillLayer) @property(SkillLayer)
public SkillLayer: SkillLayer | null = null; public SkillLayer: SkillLayer | null = null;