From d5da978821b2afab69ece88b106a3bc9d0e82db5 Mon Sep 17 00:00:00 2001 From: iCAROS7 Date: Tue, 6 Nov 2018 23:03:45 +0900 Subject: [PATCH] Change default skin Truck wearPercent output method --- Readme.md | 5 ++++- server/Ets2Telemetry.exe | Bin 456704 -> 456704 bytes server/Html/skins/default-mph/dashboard.js | 7 ++----- server/Html/skins/default/dashboard.js | 7 ++----- .../Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Readme.md b/Readme.md index 793fd90d..ce4775dc 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,4 @@ -## ETS2 Telemetry 웹 서버 3.2.5.1 + 모바일 대시보드 한글 버전 +## ETS2 Telemetry 웹 서버 3.2.5.2 + 모바일 대시보드 한글 버전 웹소켓과 REST API에 기반한 C#으로 작성된 [Euro Truck Simulator 2](http://www.eurotrucksimulator2.com/) 와 [American Truck Simulator](http://www.americantrucksimulator.com/)를 위한 무료 Telemetry 웹 서버 입니다. 클라이언트쪽에선 최신 데스크탑과 모바일 브라우저에서 스킨을 씌울 수 있는 HTML5 모바일 대시보드 앱으로 구성됩니다. 또한 안드로이드 사용자의 경우 제공된 안드로이드 앱을 사용 할 수 있습니다만 한글화는 되지 않았습니다. @@ -160,6 +160,9 @@ iOS 8.0 이상 기기(아이폰6이나 아이패드 에어 이후 기기)에서 ## 버전 체인지로그 +### 3.2.5.2 +- 기본 스킨 트럭 손상도 표기 방식 변경 (변경 전 : 모든 부품 손상도 합계, 변경 후 : ETS2 표기와 동일하게 최대 값) + ### 3.2.5.1 - 데스크탑 어플리케이션 레이아웃 개선 - 한글 작업 (추후 다른 언어를 위해 지역화 예정) diff --git a/server/Ets2Telemetry.exe b/server/Ets2Telemetry.exe index f7f08a3e1a57cf6a6e3725f008c8d53120e609fa..f78445553a596a0a307cf7435347e44dd45003fc 100644 GIT binary patch delta 145 zcmZqpAl>jmdO`>DgSihkc5h$H$h6sc-NZ_Pw0dvwnFG1HpV=<6004zoJP-f? delta 145 zcmZqpAl>jmdO`>Dd$ao+ySJ}pWZdk$ZepcCxz)WXhW$@mx2>IAa%^J8^6gL58Se@+ z8nz#@W&~m;AZ7+)mhFeES-Ap0x~HG-W|b6h)?TGO{hqA*!j+nOwO364wEyU4-TtGS tttXk2k%5(giGi7caeME3w$qG^hT9`Qvdsq4)4zUVGY4{YKeJtC0RUXxJLv!b diff --git a/server/Html/skins/default-mph/dashboard.js b/server/Html/skins/default-mph/dashboard.js index 213ec0eb..4b5af028 100644 --- a/server/Html/skins/default-mph/dashboard.js +++ b/server/Html/skins/default-mph/dashboard.js @@ -55,11 +55,8 @@ Funbit.Ets.Telemetry.Dashboard.prototype.filter = function (data, utils) { // convert rpm to rpm * 100 data.truck.engineRpm = data.truck.engineRpm / 100; // calculate wear - var wearSumPercent = data.truck.wearEngine * 100 + - data.truck.wearTransmission * 100 + - data.truck.wearCabin * 100 + - data.truck.wearChassis * 100 + - data.truck.wearWheels * 100; + var wearSumList = [data.truck.wearEngine * 100, data.truck.wearTransmission * 100, data.truck.wearCabin * 100, data.truck.wearChassis * 100, data.truck.wearWheels * 100]; + var wearSumPercent = Math.max.apply(null, wearSumList); wearSumPercent = Math.min(wearSumPercent, 100); data.truck.wearSum = Math.round(wearSumPercent) + '%'; data.trailer.wear = Math.round(data.trailer.wear * 100) + '%'; diff --git a/server/Html/skins/default/dashboard.js b/server/Html/skins/default/dashboard.js index 545baade..3f1a80e4 100644 --- a/server/Html/skins/default/dashboard.js +++ b/server/Html/skins/default/dashboard.js @@ -54,11 +54,8 @@ Funbit.Ets.Telemetry.Dashboard.prototype.filter = function (data, utils) { // convert rpm to rpm * 100 data.truck.engineRpm = data.truck.engineRpm / 100; // calculate wear - var wearSumPercent = data.truck.wearEngine * 100 + - data.truck.wearTransmission * 100 + - data.truck.wearCabin * 100 + - data.truck.wearChassis * 100 + - data.truck.wearWheels * 100; + var wearSumList = [data.truck.wearEngine * 100, data.truck.wearTransmission * 100, data.truck.wearCabin * 100, data.truck.wearChassis * 100, data.truck.wearWheels * 100]; + var wearSumPercent = Math.max.apply(null, wearSumList); wearSumPercent = Math.min(wearSumPercent, 100); data.truck.wearSum = Math.round(wearSumPercent) + '%'; data.trailer.wear = Math.round(data.trailer.wear * 100) + '%'; diff --git a/source/Funbit.Ets.Telemetry.Server/Properties/AssemblyInfo.cs b/source/Funbit.Ets.Telemetry.Server/Properties/AssemblyInfo.cs index 523183a1..f12a6323 100644 --- a/source/Funbit.Ets.Telemetry.Server/Properties/AssemblyInfo.cs +++ b/source/Funbit.Ets.Telemetry.Server/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.5.1")] -[assembly: AssemblyFileVersion("3.2.5.1")] +[assembly: AssemblyVersion("3.2.5.2")] +[assembly: AssemblyFileVersion("3.2.5.2")]