3.0.12

app/ygopro.component.html

@@ -20,30 +20,37 @@
     <button i18n [disabled]="!appsService.allReady(app)" type="button" class="btn btn-secondary" data-toggle="modal" data-target="#game-create-windbot">单人模式</button>
 </div>
 
-<!--<div class="actions">-->
-<!--<h2 i18n>排位成绩 (测试中)</h2>-->
-<!--&lt;!&ndash;{"exp":1839,"exp_rank":"9","pt":2207.2901,"arena_rank":"30","win":"703","lose":"568","draw":5,"all":"1276","ratio":"55.09"}&ndash;&gt;-->
-<!--<dl *ngIf="points" class="row">-->
-<!--<dt i18n class="col-xs-2">D.P 排名</dt>-->
-<!--<dd class="col-xs-1">{{points.arena_rank}}</dd>-->
-<!--<dt i18n class="col-xs-2">D.P 胜率</dt>-->
-<!--<dd class="col-xs-1">{{points.ratio}}%</dd>-->
-<!--<dt i18n class="col-xs-2">胜场</dt>-->
-<!--<dd class="col-xs-1">{{points.win}}</dd>-->
-<!--<dt i18n class="col-xs-2">负场</dt>-->
-<!--<dd class="col-xs-1">{{points.lose}}</dd>-->
-<!--<dt i18n class="col-xs-2">平局</dt>-->
-<!--<dd class="col-xs-1">{{points.draw}}</dd>-->
-<!--<dt i18n class="col-xs-2">总场</dt>-->
-<!--<dd class="col-xs-1">{{points.all}}</dd>-->
-<!--<dt i18n class="col-xs-2">EXP 排名</dt>-->
-<!--<dd class="col-xs-1">{{points.exp_rank}}</dd>-->
-<!--<dt i18n class="col-xs-2">EXP</dt>-->
-<!--<dd class="col-xs-1">{{points.exp}}</dd>-->
-<!--</dl>-->
-<!--<a i18n href="https://mycard.moe/ygopro/arena/" target="_blank">更多资料</a>-->
-<!--</div>-->
-
+<div class="actions">
+    <h2 i18n>排位成绩</h2>
+    <!--{"exp":1839,"exp_rank":"9","pt":2207.2901,"arena_rank":"30","win":"703","lose":"568","draw":5,"all":"1276","ratio":"55.09"}-->
+    <dl *ngIf="points" class="row">
+        <dt i18n class="col-xs-2">D.P 排名</dt>
+        <dd class="col-xs-1">{{points.arena_rank}}</dd>
+        <dt i18n class="col-xs-2">D.P 胜率</dt>
+        <dd class="col-xs-1">{{points.athletic_wl_ratio}}%</dd>
+        <dt i18n class="col-xs-2">胜场</dt>
+        <dd class="col-xs-1">{{points.athletic_win}}</dd>
+        <dt i18n class="col-xs-2">负场</dt>
+        <dd class="col-xs-1">{{points.athletic_lose}}</dd>
+        <dt i18n class="col-xs-2">平局</dt>
+        <dd class="col-xs-1">{{points.athletic_draw}}</dd>
+        <dt i18n class="col-xs-2">总场</dt>
+        <dd class="col-xs-1">{{points.athletic_all}}</dd>
+        <dt i18n class="col-xs-2">EXP 排名</dt>
+        <dd class="col-xs-1">{{points.exp_rank}}</dd>
+        <dt i18n class="col-xs-2">EXP</dt>
+        <dd class="col-xs-1">{{points.exp}}</dd>
+        <dt i18n class="col-xs-2">胜场</dt>
+        <dd class="col-xs-1">{{points.entertain_win}}</dd>
+        <dt i18n class="col-xs-2">负场</dt>
+        <dd class="col-xs-1">{{points.entertain_lose}}</dd>
+        <dt i18n class="col-xs-2">平局</dt>
+        <dd class="col-xs-1">{{points.entertain_draw}}</dd>
+        <dt i18n class="col-xs-2">总场</dt>
+        <dd class="col-xs-1">{{points.entertain_all}}</dd>
+    </dl>
+    <a i18n href="https://mycard.moe/ygopro/arena/" target="_blank">更多资料</a>
+</div>
 
 <div class="modal fade" id="game-create-windbot" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog" role="document">

app/ygopro.component.ts

 /**
  * Created by zh99998 on 16/9/2.
  */
-import {Component, OnInit, ChangeDetectorRef, Input} from "@angular/core";
-import * as fs from "fs";
-import * as path from "path";
-import * as crypto from "crypto";
-import * as child_process from "child_process";
-import {remote} from "electron";
-import * as ini from "ini";
-import {EncodeOptions} from "ini";
-import {LoginService} from "./login.service";
-import {App} from "./app";
-import {Http, Headers, URLSearchParams} from "@angular/http";
-import "rxjs/Rx";
-import {ISubscription} from "rxjs/Subscription";
-import {AppsService} from "./apps.service";
-import {SettingsService} from "./settings.sevices";
+import {Component, OnInit, ChangeDetectorRef, Input} from '@angular/core';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as crypto from 'crypto';
+import * as child_process from 'child_process';
+import {remote} from 'electron';
+import * as ini from 'ini';
+import {EncodeOptions} from 'ini';
+import {LoginService} from './login.service';
+import {App} from './app';
+import {Http, Headers, URLSearchParams} from '@angular/http';
+import 'rxjs/Rx';
+import {ISubscription} from 'rxjs/Subscription';
+import {AppsService} from './apps.service';
+import {SettingsService} from './settings.sevices';
 
 declare const $: any;
 
@@ -111,12 +111,7 @@ export class YGOProComponent implements OnInit {
 
     windbot: string[]; //["琪露诺", "谜之剑士LV4", "复制植物", "尼亚"];
 
-    servers: Server[] = [{
-        id: 'tiramisu',
-        url: 'wss://tiramisu.mycard.moe:7923',
-        address: "112.124.105.11",
-        port: 7911
-    }];
+    servers: Server[] = [];
 
 
     default_options: Options = {
@@ -155,6 +150,23 @@ export class YGOProComponent implements OnInit {
 
         this.matching = matching;
         this.matching_arena = matching_arena;
+
+        if (this.settingsService.getLocale().startsWith('zh')) {
+            this.servers.push({
+                id: 'tiramisu',
+                url: 'wss://tiramisu.mycard.moe:7923',
+                address: "112.124.105.11",
+                port: 7911
+            })
+        } else {
+            this.servers.push({
+                id: 'mercury-us-1',
+                url: 'wss://mercury-us-1.mycard.moe:7923',
+                address: "104.237.154.173",
+                port: 7911
+            })
+        }
+
     }
 
     async ngOnInit() {

locale/messages.en-US.xlf

@@ -14,12 +14,7 @@
       <trans-unit datatype="html" id="c4fc2b3584e7581cddb08bb1ebfa41e601195d5b">
         <source>社区</source>
         <target>Community</target>
-
-      </trans-unit>
-      <trans-unit datatype="html" id="6ef7c5489cf0504f9a170d1344abb0420312ceeb">
-        <source>关于</source>
-        <target>About</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="8422ff34db177236e8f54d415b07c972284c36bf">
         <source>切换账号</source>
@@ -294,57 +289,57 @@
       <trans-unit datatype="html" id="3768b60a7e2625bb1fc2db37eb8c6b8e4bd99101">
         <source>单人模式</source>
         <target>Single Mode</target>
-
+        
       </trans-unit>
-      <trans-unit datatype="html" id="6f0b5aa5478c05ac01323a83854985ac4ee6ecdb">
-        <source>排位成绩 (测试中)</source>
+      <trans-unit datatype="html" id="409ab83692bb4c157cddafe70de9e95531be796e">
+        <source>排位成绩</source>
         <target>Rank Result</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="c46097c9d5e0501f2dc3a79eaafa0ca8330b0a25">
         <source>D.P 排名</source>
         <target>D.P Rank</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="e7dd051e36eb95e7d6ce704dff0068e1bf5bd81a">
         <source>D.P 胜率</source>
         <target>Win Rate</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="0ce6333a9b6c85ccd57ecdbee84ef7f6f3f51ef4">
         <source>胜场</source>
         <target>Win</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="a89a5c5567bbe1de398b978749b9a1bf6f1281bf">
         <source>负场</source>
         <target>Lose</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="41a0424d676209939f79f70c8ef8aa8a143d3451">
         <source>平局</source>
         <target>Draw</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="3f4d682cd4fc7579e9ea6bd1bddec84dbc35fd50">
         <source>总场</source>
         <target>Total</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="4a893998eefe3a0d103863aac391b5789870c089">
         <source>EXP 排名</source>
         <target>EXP Rank</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="6ec23deac8d2367c3a7a4f27946d0835634514fb">
         <source>EXP</source>
         <target>EXP</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="f5f5d4874301c4b42cdbfab010c953631abbcec9">
         <source>更多资料</source>
         <target>More Info</target>
-
+        
       </trans-unit>
       <trans-unit datatype="html" id="1e64bb9c96dfc2b9cb03179dd0c9f992e0645e5f">
         <source>选择对手</source>

package.json

 {
   "name": "mycard",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "mycard",
   "keywords": [],
   "author": "zh99998 <zh99998@gmail.com>",