feat(chusan): change sub trophies

Author: Sanheiii

package-lock.json

@@ -35,6 +35,7 @@
     "@types/bootstrap": "^5.2.10",
     "aegis-web-sdk": "^1.37.1",
     "bootstrap": "^5.2.3",
+    "compare-versions": "^6.1.1",
     "cropperjs": "^1.5.13",
     "crypto-js": "^4.2.0",
     "dompurify": "^3.1.6",

package.json

@@ -17,6 +17,8 @@ export interface V2Profile {
   frameId: number;
   characterId: number;
   trophyId: number;
+  trophyIdSub1: number;
+  trophyIdSub2: number;
   playedTutorialBit: number;
   firstTutorialCancelNum: number;
   masterTutorialCancelNum: number;

src/app/sega/chunithm/v2/model/V2Profile.ts

@@ -89,8 +89,7 @@ <h2 class="mb-0">{{ "ChuniV2.RatingPage.Best" | translate }}</h2>
   </div>
 </ng-container>
 
-
-<ng-template *ngIf="!loadingRecent && recentRating">
+<ng-container *ngIf="!loadingRecent && recentRating">
   <div class="mb-3 d-flex align-items-center">
     <h2 class="mb-0">{{ "ChuniV2.RatingPage.Recent" | translate }}</h2>
     <span class="badge bg-primary rounded-pill ms-2">{{ recentTotal / 10 | toRating }}</span>
@@ -102,7 +101,7 @@ <h2 class="mb-0">{{ "ChuniV2.RatingPage.Recent" | translate }}</h2>
     </ng-container>
   </div>
 
-</ng-template>
+</ng-container>
 
 <ng-template #record let-index="index" let-item="item">
   <div class="col-12 col-md-6 col-xxl-4">

src/app/sega/chunithm/v2/v2-rating/v2-rating.component.html

@@ -10,6 +10,7 @@ import {ChusanMusic} from '../model/ChusanMusic';
 import {V2SongScoreRankingComponent} from '../v2-song-score-ranking/v2-song-score-ranking.component';
 import {NgbOffcanvas} from '@ng-bootstrap/ng-bootstrap';
 import {NgxIndexedDBService} from 'ngx-indexed-db';
+import {compareVersions} from 'compare-versions';
 
 @Component({
   selector: 'app-v2-rating',
@@ -21,16 +22,15 @@ export class V2RatingComponent implements OnInit {
   host = environment.assetsHost;
   enableImages = environment.enableImages;
 
-  romVersion: Version;
+  romVersion: string;
   playerRating: number;
   highestRating: number;
   calcRating: number;
-  verseVersion = new Version('2.30.00');
   loadingRating = true;
   loadingRecent = true;
-  topRating: RatingItem[] = [];
-  newRating: RatingItem[] = [];
-  recentRating: RatingItem[] = [];
+  topRating: RatingItem[] = undefined;
+  newRating: RatingItem[] = undefined;
+  recentRating: RatingItem[] = undefined;
   topTotal = 0;
   newTotal = 0;
   recentTotal = 0;
@@ -49,10 +49,10 @@ export class V2RatingComponent implements OnInit {
     const param = new HttpParams().set('aimeId', aimeId);
     const profile = await lastValueFrom(this.api.get('api/game/chuni/v2/profile', param));
     if (!profile) { return; }
-    this.romVersion = new Version(profile.lastRomVersion);
+    this.romVersion = profile.lastRomVersion;
     this.playerRating = profile.playerRating;
     this.highestRating = profile.highestRating;
-    if (this.romVersion >= new Version('2.30.00')){
+    if (compareVersions(this.romVersion, '2.30.00') >= 0){
       // b50
       const data = await lastValueFrom(this.api.get('api/game/chuni/v2/verse-rating', param));
       if (data) {

src/app/sega/chunithm/v2/v2-rating/v2-rating.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit, Version} from '@angular/core';
 import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap';
 import {ApiService} from '../../../../api.service';
 import {MessageService} from '../../../../message.service';
@@ -17,6 +17,7 @@ import {UserService} from 'src/app/user.service';
 import {V2SymbolChat} from '../model/V2SymbolChat';
 import {ChusanSymbolChat} from '../model/ChusanSymbolChat';
 import {V2SymbolChatSettingComponent} from './v2-symbol-chat-setting/v2-symbol-chat-setting.component';
+import {compareVersions} from 'compare-versions';
 
 @Component({
   selector: 'app-v2-userbox',
@@ -41,6 +42,7 @@ export class V2UserBoxComponent implements OnInit {
 
   systemVoiceIDs = [34, 0, 1, 8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 49, 50, 51];
   currentAvatarAcc: { category: number, accId: number } = {category: 0, accId: 0};
+  currentSubTrophyIndex: number;
 
   dialogOptions: NgbModalOptions = {
     centered: true,
@@ -71,6 +73,15 @@ export class V2UserBoxComponent implements OnInit {
     this.customable = [
       {name: 'Nameplate', value: this.getNamePlateName(this.profile.nameplateId), click: () => this.namePlate()},
       {name: 'Trophy', value: this.getTrophyName(this.profile.trophyId), click: () => this.trophy()},
+    ];
+    if (compareVersions(this.profile.lastRomVersion, '2.30.00') >= 0){
+      this.customable = this.customable.concat([
+
+        {name: 'TrophySub1', value: this.getTrophyName(this.profile.trophyIdSub1), click: () => this.trophySub1()},
+        {name: 'TrophySub2', value: this.getTrophyName(this.profile.trophyIdSub2), click: () => this.trophySub2()},
+      ]);
+    }
+    this.customable = this.customable.concat([
       {name: 'MapIcon', value: this.getMapIconName(this.profile.mapIconId), click: () => this.mapIcon()},
       {name: 'SystemVoice', value: this.getSystemVoiceName(this.profile.voiceId), click: () => this.systemVoice()},
       {
@@ -98,7 +109,7 @@ export class V2UserBoxComponent implements OnInit {
         click: () => this.avatarAcc(7, this.profile.avatarBack)
       },
       // { name: 'Frame', value: this.getFrameName(this.profile.frameId), click: () => this.frame() },
-    ];
+    ]);
   }
 
   playAudio(id: number) {
@@ -152,7 +163,7 @@ export class V2UserBoxComponent implements OnInit {
           ];
           for (const item of data) {
             const symbolChat = value.find(v => v.sceneId === item.sceneId && v.orderId === item.orderId);
-            if (symbolChat){
+            if (symbolChat) {
               symbolChat.symbolChatId = item.symbolChatId;
             }
           }
@@ -259,7 +270,15 @@ export class V2UserBoxComponent implements OnInit {
           break;
         case 3: // Trophy
           apiURL = 'api/game/chuni/v2/profile/trophy';
-          requestBody = {aimeId: this.aimeId, trophyId: itemId};
+          if (this.currentSubTrophyIndex === 0){
+            requestBody = {aimeId: this.aimeId, trophyId: itemId};
+          }
+          else if (this.currentSubTrophyIndex === 1){
+            requestBody = {aimeId: this.aimeId, trophyIdSub1: itemId};
+          }
+          else if (this.currentSubTrophyIndex === 2){
+            requestBody = {aimeId: this.aimeId, trophyIdSub2: itemId};
+          }
           break;
         case 8: // MapIcon
           apiURL = 'api/game/chuni/v2/profile/mapicon';
@@ -289,6 +308,17 @@ export class V2UserBoxComponent implements OnInit {
 
   trophy() {
     this.openItemDialog({itemKind: 3, itemId: this.profile.trophyId, showAllItems: this.showAllItems});
+    this.currentSubTrophyIndex = 0;
+  }
+
+  trophySub1() {
+    this.openItemDialog({itemKind: 3, itemId: this.profile.trophyIdSub1, showAllItems: this.showAllItems});
+    this.currentSubTrophyIndex = 1;
+  }
+
+  trophySub2() {
+    this.openItemDialog({itemKind: 3, itemId: this.profile.trophyIdSub2, showAllItems: this.showAllItems});
+    this.currentSubTrophyIndex = 2;
   }
 
   mapIcon() {

src/app/sega/chunithm/v2/v2-userbox/v2-userbox.component.ts

@@ -431,6 +431,8 @@
       "AvatarFront": "Avatar Front",
       "AvatarBack": "Avatar Back",
       "Trophy": "Trophy",
+      "TrophySub1": "Sub Trophy 1",
+      "TrophySub2": "Sub Trophy 2",
       "Frame": "Frame",
       "Change": "Change",
       "Preview": "Preview",

src/assets/i18n/en.json

@@ -431,6 +431,8 @@
       "AvatarFront": "前面",
       "AvatarBack": "背部",
       "Trophy": "称号",
+      "TrophySub1": "副称号1",
+      "TrophySub2": "副称号2",
       "Frame": "框体",
       "Change": "更改",
       "Preview": "预览",