From b44834343ad57fee0b2fc1da4f6d1e4234544e57 Mon Sep 17 00:00:00 2001 From: Chris Chen Date: Thu, 6 Nov 2025 07:10:28 -0800 Subject: [PATCH] WIP --- .../hero-dashboard/hero-dashboard.component.scss | 3 +++ .../hero-dashboard/hero-dashboard.component.ts | 2 +- .../mob-combat-info/mob-combat-info.component.html | 2 +- .../mob-combat-info/mob-combat-info.component.ts | 3 ++- .../mobs/mob-detail-info/mob-detail-info.component.html | 4 ++-- .../mobs/mob-detail-info/mob-detail-info.component.ts | 6 +++++- .../mobs/mob-stand-info/mob-stand-info.component.scss | 5 ++++- src/app/games/massive-darkness2/mobs/mobs.component.html | 6 ++++++ 8 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.scss b/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.scss index b7ab7b8..00e74d6 100644 --- a/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.scss +++ b/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.scss @@ -810,3 +810,6 @@ -ms-transform: rotateY(-180deg); transform: rotateY(-180deg); } +::ng-deep .skill-content .MD2Icon { + font-size: 30px; +} diff --git a/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.ts b/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.ts index 3ada323..4221ded 100644 --- a/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.ts +++ b/src/app/games/massive-darkness2/hero-dashboard/hero-dashboard.component.ts @@ -139,7 +139,7 @@ export class HeroDashboardComponent extends MD2Base implements OnInit { hp: heroProfile.hp, mp: heroProfile.mana, skillHtml: heroProfile.skillHtml, - shadowSkillHtml: heroProfile.shadowSkillHtml, + shadowSkillHtml: heroProfile.shadowSkillHtml.replace("

", '

' + this.iconHtml(MD2Icon.Shadow) + ' : '), class: heroClass }); heroInfo.imgUrl = this.imgUrl('Heros/' + HeroClass[heroClass] + '.jpg'); diff --git a/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-combat-info/mob-combat-info.component.html b/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-combat-info/mob-combat-info.component.html index 64da57e..0b4a71b 100644 --- a/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-combat-info/mob-combat-info.component.html +++ b/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-combat-info/mob-combat-info.component.html @@ -21,7 +21,7 @@ -->

-
+
diff --git a/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-combat-info/mob-combat-info.component.ts b/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-combat-info/mob-combat-info.component.ts index cf57192..4fbc7b4 100644 --- a/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-combat-info/mob-combat-info.component.ts +++ b/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-combat-info/mob-combat-info.component.ts @@ -22,12 +22,13 @@ export class MobCombatInfoComponent implements OnInit { } } @Input() mode: MobDlgType = MobDlgType.PreView; - showSkill: boolean = false; + showAllSkill: boolean = false; showBlackDice: boolean skillTriggerHtml: string = ''; constructor() { } ngOnInit(): void { + this.showAllSkill = [MobDlgType.PreView, MobDlgType.Dashboard].includes(this.mode); if (this.mob.skills && this.mob.skills.length > 0) { this.mob.skills.forEach(element => { switch (this.mode) { diff --git a/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-detail-info.component.html b/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-detail-info.component.html index 8c38f50..0026856 100644 --- a/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-detail-info.component.html +++ b/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-detail-info.component.html @@ -50,8 +50,8 @@ - -
+ +
\ No newline at end of file diff --git a/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-detail-info.component.ts b/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-detail-info.component.ts index c4fdcc4..2592aa5 100644 --- a/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-detail-info.component.ts +++ b/src/app/games/massive-darkness2/mobs/mob-detail-info/mob-detail-info.component.ts @@ -12,7 +12,7 @@ import { MD2ComponentBase } from '../../MD2Base'; styleUrls: ['./mob-detail-info.component.scss'] }) export class MobDetailInfoComponent extends MD2ComponentBase implements OnInit { - + MobDlgType = MobDlgType; MD2Icon = MD2Icon; private _mob: MobInfo; public get mob(): MobInfo { @@ -33,6 +33,10 @@ export class MobDetailInfoComponent extends MD2ComponentBase implements OnInit { return this.mode == MobDlgType.Spawn; } + public get hideCombatInfo(): boolean { + return this.mode == MobDlgType.Dashboard; + } + showAttackingInfo: boolean = false; @Input("showAttackingInfo") diff --git a/src/app/games/massive-darkness2/mobs/mob-stand-info/mob-stand-info.component.scss b/src/app/games/massive-darkness2/mobs/mob-stand-info/mob-stand-info.component.scss index 6cb626a..4133a57 100644 --- a/src/app/games/massive-darkness2/mobs/mob-stand-info/mob-stand-info.component.scss +++ b/src/app/games/massive-darkness2/mobs/mob-stand-info/mob-stand-info.component.scss @@ -4,20 +4,23 @@ &.roamingMonster { width: 95%; max-height: 80%; + left: 0; } &.mobLeader { z-index: 3; width: 70%; max-height: 80%; top: 40px; + left: 0; } &.mobMinion { width: 60%; max-height: 80%; right: 0; + top: 0; } } .mobBg { - position: absolute; + position: relative; z-index: 1; } diff --git a/src/app/games/massive-darkness2/mobs/mobs.component.html b/src/app/games/massive-darkness2/mobs/mobs.component.html index 9b38ef7..ff9275b 100644 --- a/src/app/games/massive-darkness2/mobs/mobs.component.html +++ b/src/app/games/massive-darkness2/mobs/mobs.component.html @@ -29,6 +29,12 @@
+ + +
+ +