diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 91407ccb..43aa51f5 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -6970,7 +6970,7 @@ } ], "_prefab": { - "__id__": 413 + "__id__": 468 }, "_lpos": { "__type__": "cc.Vec3", @@ -7985,7 +7985,9 @@ "btnClose": { "__id__": 392 }, - "Lock": null, + "Lock": { + "__id__": 413 + }, "_id": "" }, { @@ -8496,17 +8498,64 @@ "nestedPrefabInstanceRoots": null }, { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 + "__type__": "cc.Node", + "_name": "lock", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 414 }, - "asset": { - "__id__": 0 + "_children": [ + { + "__id__": 446 + } + ], + "_active": true, + "_components": [ + { + "__id__": 458 + }, + { + "__id__": 460 + }, + { + "__id__": 462 + }, + { + "__id__": 464 + } + ], + "_prefab": { + "__id__": 467 }, - "fileId": "b5rAY0KLtHqYGJo3KUTeD5", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + "_lpos": { + "__type__": "cc.Vec3", + "x": 255, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" }, { "__type__": "cc.Node", @@ -8527,23 +8576,23 @@ "__id__": 431 }, { - "__id__": 439 + "__id__": 413 } ], "_active": true, "_components": [ { - "__id__": 462 + "__id__": 439 }, { - "__id__": 464 + "__id__": 441 }, { - "__id__": 466 + "__id__": 443 } ], "_prefab": { - "__id__": 468 + "__id__": 445 }, "_lpos": { "__type__": "cc.Vec3", @@ -9019,89 +9068,144 @@ "nestedPrefabInstanceRoots": null }, { - "__type__": "cc.Node", - "_name": "lock", + "__type__": "cc.UITransform", + "_name": "", "_objFlags": 0, "__editorExtras__": {}, - "_parent": { + "node": { "__id__": 414 }, - "_children": [ - { - "__id__": 440 - } - ], - "_active": true, - "_components": [ - { - "__id__": 452 - }, - { - "__id__": 454 - }, - { - "__id__": 456 - }, - { - "__id__": 458 - } - ], - "_prefab": { - "__id__": 461 + "_enabled": true, + "__prefab": { + "__id__": 440 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 255, - "y": 0, - "z": 0 + "_contentSize": { + "__type__": "cc.Size", + "width": 680, + "height": 300 }, - "_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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 }, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0d3ZUv1W9OT572dSjSsBhv" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 414 + }, + "_enabled": true, + "__prefab": { + "__id__": 442 + }, + "_alignFlags": 44, + "_target": null, + "_left": 20, + "_right": 20, + "_top": 0, + "_bottom": 400, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1fnCJK+UBBdpVvkZRD6/Zp" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 414 + }, + "_enabled": true, + "__prefab": { + "__id__": 444 + }, + "_resizeMode": 0, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 5, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 10, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9dMh05UfNOOZ/OfBhTNU1N" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b36TS9OE5CBbKF+DuarDv5", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "unlock", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 439 + "__id__": 413 }, "_children": [ { - "__id__": 441 + "__id__": 447 } ], "_active": true, "_components": [ { - "__id__": 447 + "__id__": 453 }, { - "__id__": 449 + "__id__": 455 } ], "_prefab": { - "__id__": 451 + "__id__": 457 }, "_lpos": { "__type__": "cc.Vec3", @@ -9138,20 +9242,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 440 + "__id__": 446 }, "_children": [], "_active": true, "_components": [ { - "__id__": 442 + "__id__": 448 }, { - "__id__": 444 + "__id__": 450 } ], "_prefab": { - "__id__": 446 + "__id__": 452 }, "_lpos": { "__type__": "cc.Vec3", @@ -9188,11 +9292,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 447 }, "_enabled": true, "__prefab": { - "__id__": 443 + "__id__": 449 }, "_contentSize": { "__type__": "cc.Size", @@ -9216,11 +9320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 447 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 451 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9297,11 +9401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 440 + "__id__": 446 }, "_enabled": true, "__prefab": { - "__id__": 448 + "__id__": 454 }, "_contentSize": { "__type__": "cc.Size", @@ -9325,11 +9429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 440 + "__id__": 446 }, "_enabled": true, "__prefab": { - "__id__": 450 + "__id__": 456 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9386,11 +9490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 439 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 453 + "__id__": 459 }, "_contentSize": { "__type__": "cc.Size", @@ -9414,11 +9518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 439 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 455 + "__id__": 461 }, "_alignFlags": 36, "_target": null, @@ -9450,11 +9554,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 439 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 463 }, "_id": "" }, @@ -9468,15 +9572,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 439 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 459 + "__id__": 465 }, "clickEvents": [ { - "__id__": 460 + "__id__": 466 } ], "_interactable": true, @@ -9529,7 +9633,7 @@ }, "component": "", "_componentId": "b3d6eSQ8ulPP79kPpPIytqU", - "handler": "", + "handler": "watchAdCloseLock", "customEventData": "" }, { @@ -9545,108 +9649,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 414 - }, - "_enabled": true, - "__prefab": { - "__id__": 463 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 680, - "height": 300 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0d3ZUv1W9OT572dSjSsBhv" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 414 - }, - "_enabled": true, - "__prefab": { - "__id__": 465 - }, - "_alignFlags": 44, - "_target": null, - "_left": 20, - "_right": 20, - "_top": 0, - "_bottom": 400, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1fnCJK+UBBdpVvkZRD6/Zp" - }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 414 - }, - "_enabled": true, - "__prefab": { - "__id__": 467 - }, - "_resizeMode": 0, - "_layoutType": 1, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_startAxis": 0, - "_paddingLeft": 5, - "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 0, - "_spacingX": 10, - "_spacingY": 0, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9dMh05UfNOOZ/OfBhTNU1N" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -9655,7 +9657,7 @@ "asset": { "__id__": 0 }, - "fileId": "b36TS9OE5CBbKF+DuarDv5", + "fileId": "b5rAY0KLtHqYGJo3KUTeD5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/script/game/common/config/GameEvent.ts b/assets/script/game/common/config/GameEvent.ts index a6f3545b..c2570a68 100644 --- a/assets/script/game/common/config/GameEvent.ts +++ b/assets/script/game/common/config/GameEvent.ts @@ -29,6 +29,12 @@ export enum GameEvent { MissionWin = "MissionWin", MissionStart = "MissionStart", FightReady = "FightReady", + FightStart = "FightStart", + FightPause = "FightPause", + FightResume = "FightResume", + FightEnd = "FightEnd", + MissionEnd = "MissionEnd", + MissionComplete = "MissionComplete",//战斗结算完成 HeroSkillSelect = "HeroSkillSelect", HeroSkillSelectEnd = "HeroSkillSelectEnd", HeroSelect = "HeroSelect", @@ -36,12 +42,6 @@ export enum GameEvent { CanUpdateLv = "CanUpdateLv", UseEnhancement = "UseEnhancement", MasterCalled = "MasterCalled", - FightStart = "FightStart", - FightPause = "FightPause", - FightResume = "FightResume", - FightEnd = "FightEnd", - MissionEnd = "MissionEnd", - MissionComplete = "MissionComplete",//战斗结算完成 CastHeroSkill = "CastHeroSkill", EquipAdd = "EquipAdd", EquipSelect = "EquipSelect", diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index 3da0d68f..f524d134 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -49,6 +49,8 @@ export class MissionCardComp extends CCComp { onLoad() { oops.message.on(GameEvent.TalentSelect, this.onTalentSelect, this); oops.message.on(GameEvent.ShopOpen, this.onShopOpen, this); + oops.message.on(GameEvent.MissionStart, this.init, this); + } onDestroy() { @@ -56,11 +58,12 @@ export class MissionCardComp extends CCComp { oops.message.off(GameEvent.ShopOpen, this.onShopOpen, this); this.ent.destroy(); } - + init(){ + this.Lock.active=true + } start() { // 初始隐藏或显示逻辑 this.node.active = false; - this.Lock.active = true; this.resetCardStates(); } @@ -291,6 +294,18 @@ export class MissionCardComp extends CCComp { } } + /** 看广告关闭 Lock */ + watchAdCloseLock() { + // TODO: 此处接入 IAA 广告 SDK + console.log("播放激励视频广告..."); + + // 模拟广告播放成功回调 + if (this.Lock) { + this.Lock.active = false; + oops.gui.toast("解锁成功"); + } + } + /** * 关闭界面 */