Merge pull request #96 from antest1/feature/kantai3d_4.0

Feature/kantai3d 4.0
antest1 · Nov 28, 2024 · 8620253 · 8620253
2 parents 0d19586 + a433475
commit 8620253
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 534 deletions.
diff --git a/app/src/main/java/com/antest1/gotobrowser/Browser/ResourceProcess.java b/app/src/main/java/com/antest1/gotobrowser/Browser/ResourceProcess.java
@@ -739,7 +739,7 @@ private String escapeMatchedGroup(String group) {
 
     private String patchMainScript(String main_js, boolean silent_mode) {
 
-        main_js = K3dPatcher.patchKantai3d(main_js);
+        main_js = K3dPatcher.patchKantai3d(context, main_js);
         main_js = KenPatcher.patchKantaiEn(main_js, activity);
         main_js = FpsPatcher.patchFps(main_js);
         main_js = CritPatcher.patchCrit(main_js);

diff --git a/app/src/main/java/com/antest1/gotobrowser/Helpers/K3dMetadataApi.java b/app/src/main/java/com/antest1/gotobrowser/Helpers/K3dMetadataApi.java
@@ -0,0 +1,11 @@
+package com.antest1.gotobrowser.Helpers;
+
+import com.google.gson.JsonObject;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+
+public interface K3dMetadataApi {
+    @GET("gh/laplamgor/kantai3d-depth-maps@latest/metadata.json")
+    Call<JsonObject> getMetadata();
+}
diff --git a/app/src/main/java/com/antest1/gotobrowser/Helpers/K3dPatcher.java b/app/src/main/java/com/antest1/gotobrowser/Helpers/K3dPatcher.java
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -73,7 +73,7 @@
     <string name="settings_legacy_renderer_enable">レガシーレンダラを使用する</string>
 
     <string name="settings_mod_label">非公式のMOD（自己責任で使ってください）</string>
-    <string name="settings_mod_kantai3d_enable">Kantai3D v3.7</string>
+    <string name="settings_mod_kantai3d_enable">Kantai3D v4.0</string>
     <string name="settings_mod_kantai3d_summary">一部の秘書艦に3Dのような視覚効果とおける乳揺れを追加します。作者：@laplamgor</string>
     <string name="settings_mod_kantai3d_about">About Kantai3D</string>
     <string name="settings_mod_kantaien_enable">[Beta] KanColle English Patch</string>

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
@@ -74,7 +74,7 @@
     <string name="settings_legacy_renderer_enable">레거시 렌더러 사용</string>
 
     <string name="settings_mod_label">서드파티 모드 (자기 책임하에 사용하세요)</string>
-    <string name="settings_mod_kantai3d_enable">Kantai3D v3.7</string>
+    <string name="settings_mod_kantai3d_enable">Kantai3D v4.0</string>
     <string name="settings_mod_kantai3d_summary">일부 비서함에 3D 효과 적용. 저자: @laplamgor</string>
     <string name="settings_mod_kantai3d_about">About Kantai3D</string>
     <string name="settings_mod_kantaien_enable">[Beta] KanColle English Patch</string>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -72,7 +72,7 @@
     <string name="settings_legacy_renderer_summary">强制PixiJS引擎使用Canvas渲染器而非WebGL渲染器。可解决大部份奇怪图形错误但会降低效能。</string>
 
     <string name="settings_mod_label">第三方MOD（风险自负）</string>
-    <string name="settings_mod_kantai3d_enable">Kantai3D v3.7</string>
+    <string name="settings_mod_kantai3d_enable">Kantai3D v4.0</string>
     <string name="settings_mod_kantai3d_summary">为部份秘书舰添加仿立体以及乳摇视觉效果。作者：@laplamgor</string>
     <string name="settings_mod_kantai3d_about">关于Kantai3D</string>
     <string name="settings_mod_kantaien_enable">[Beta] KanColle English Patch</string>

diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
@@ -72,7 +72,7 @@
     <string name="settings_legacy_renderer_summary">強制PixiJS引擎使用Canvas渲染器而非WebGL渲染器。可解決大部份奇怪圖形錯誤但會降低效能。</string>
 
     <string name="settings_mod_label">第三方MOD（風險自負）</string>
-    <string name="settings_mod_kantai3d_enable">Kantai3D v3.7</string>
+    <string name="settings_mod_kantai3d_enable">Kantai3D v4.0</string>
     <string name="settings_mod_kantai3d_summary">為部份秘書艦添加仿立體以及乳搖視覺效果。作者：@laplamgor</string>
     <string name="settings_mod_kantai3d_about">關於Kantai3D</string>
     <string name="settings_mod_kantaien_enable">[Beta] KanColle English Patch</string>

diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
@@ -72,7 +72,7 @@
     <string name="settings_legacy_renderer_summary">強制PixiJS引擎使用Canvas渲染器而非WebGL渲染器。可解決大部份奇怪圖形錯誤但會降低效能。</string>
 
     <string name="settings_mod_label">第三方MOD（風險自負）</string>
-    <string name="settings_mod_kantai3d_enable">Kantai3D v3.7</string>
+    <string name="settings_mod_kantai3d_enable">Kantai3D v4.0</string>
     <string name="settings_mod_kantai3d_summary">為部份秘書艦添加仿立體以及乳搖視覺效果。作者：@laplamgor</string>
     <string name="settings_mod_kantai3d_about">關於Kantai3D</string>
     <string name="settings_mod_kantaien_enable">[Beta] KanColle English Patch</string>

diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
@@ -72,7 +72,7 @@
     <string name="settings_legacy_renderer_summary">强制PixiJS引擎使用Canvas渲染器而非WebGL渲染器。可解决大部份奇怪图形错误但会降低效能。</string>
 
     <string name="settings_mod_label">第三方MOD（风险自负）</string>
-    <string name="settings_mod_kantai3d_enable">Kantai3D v3.7</string>
+    <string name="settings_mod_kantai3d_enable">Kantai3D v4.0</string>
     <string name="settings_mod_kantai3d_summary">为部份秘书舰添加仿立体以及乳摇视觉效果。作者：@laplamgor</string>
     <string name="settings_mod_kantai3d_about">关于Kantai3D</string>
     <string name="settings_mod_kantaien_enable">[Beta] KanColle English Patch</string>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -72,7 +72,7 @@
     <string name="settings_legacy_renderer_summary">強制PixiJS引擎使用Canvas渲染器而非WebGL渲染器。可解決大部份奇怪圖形錯誤但會降低效能。</string>
 
     <string name="settings_mod_label">第三方MOD（風險自負）</string>
-    <string name="settings_mod_kantai3d_enable">Kantai3D v3.7</string>
+    <string name="settings_mod_kantai3d_enable">Kantai3D v4.0</string>
     <string name="settings_mod_kantai3d_summary">為部份秘書艦添加仿立體以及乳搖視覺效果。作者：@laplamgor</string>
     <string name="settings_mod_kantai3d_about">關於Kantai3D</string>
     <string name="settings_mod_kantaien_enable">[Beta] KanColle English Patch</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -82,7 +82,7 @@
     <string name="settings_legacy_renderer_summary">Force PixiJS game engine to use Canvas renderer instead of WebGL renderer. It may solve most display glitches but reduce performance.</string>
 
     <string name="settings_mod_label">Third Party Mods (use at your own risk)</string>
-    <string name="settings_mod_kantai3d_enable">Kantai3D v3.7</string>
+    <string name="settings_mod_kantai3d_enable">Kantai3D v4.0</string>
     <string name="settings_mod_kantai3d_summary">Add 3D-like visual effects and jiggle physics to some of your secretaries. Author: @laplamgor</string>
     <string name="settings_mod_kantai3d_about">About Kantai3D</string>
     <string name="settings_mod_kantaien_enable">[Beta] KanColle English Patch</string>

diff --git a/docs/md/en/settings.md b/docs/md/en/settings.md
@@ -36,11 +36,11 @@ For information about the function, refer to the <span class="link" data-move="v
 
 ##### Third Party Mods
 
-| Name | Description | Author |
-| --- | --- | --- |
-| Remove 60 FPS limit | Enables smooth animations on devices supporting high screen refresh rates (120hz). | [@laplamgor](https://x.com/laplamgor) |
-| Kantai3D v3.7 | Add 3D-like visual effects and jiggle physics to some of your secretaries. | [@laplamgor](https://x.com/laplamgor) | 
-| True Critical Hits | Removes some hard-coded obfuscation for hits. Only a critical hit (CL2) will be displayed as such, etc. | [@Oradimi](https://x.com/oradimi) |
+| Name                   | Description | Author |
+|------------------------| --- | --- |
+| Remove 60 FPS limit    | Enables smooth animations on devices supporting high screen refresh rates (120hz). | [@laplamgor](https://x.com/laplamgor) |
+| Kantai3D v4.0          | Add 3D-like visual effects and jiggle physics to some of your secretaries. | [@laplamgor](https://x.com/laplamgor) | 
+| True Critical Hits     | Removes some hard-coded obfuscation for hits. Only a critical hit (CL2) will be displayed as such, etc. | [@Oradimi](https://x.com/oradimi) |
 | KanColle English Patch | Apply [English patch](https://github.com/Oradimi/KanColle-English-Patch-KCCP) to in-game resources (beta) | [@Oradimi](https://x.com/oradimi) |
 
 ##### App Information

diff --git a/docs/md/ja/settings.md b/docs/md/ja/settings.md
@@ -36,11 +36,11 @@
 
 ##### 非公式MOD
 
-| 設定 | 説明 | 作成者 |
-| --- | --- | --- |
-| 60FPS制限を削除します | 高い画面再生率（120hz）に対応するデバイスでスムーズなアニメーション再生を支援 | [@laplamgor](https://x.com/laplamgor) |
-| Kantai3D v3.7 | 一部の秘書艦に3Dのような視覚効果とおける乳揺れを追加 | [@laplamgor](https://x.com/laplamgor) |
-| 真のクリティカルヒット | ハードコードされたヒットの難読化を削除する（CL2のみ表示） | [@Oradimi](https://x.com/oradimi) |
+| 設定                     | 説明 | 作成者 |
+|------------------------| --- | --- |
+| 60FPS制限を削除します          | 高い画面再生率（120hz）に対応するデバイスでスムーズなアニメーション再生を支援 | [@laplamgor](https://x.com/laplamgor) |
+| Kantai3D v4.0          | 一部の秘書艦に3Dのような視覚効果とおける乳揺れを追加 | [@laplamgor](https://x.com/laplamgor) |
+| 真のクリティカルヒット            | ハードコードされたヒットの難読化を削除する（CL2のみ表示） | [@Oradimi](https://x.com/oradimi) |
 | KanColle English Patch | ゲーム内リソースに[英語パッチ](https://github.com/Oradimi/KanColle-English-Patch-KCCP)を適用（ベータ版） | [@Oradimi](https://x.com/oradimi) |
 
 ##### アプリケーション情報

diff --git a/docs/md/ko/settings.md b/docs/md/ko/settings.md
@@ -36,11 +36,11 @@
 
 ##### 서드파티 모드
 
-| 이름 | 설명 | 저자 |
-| --- | --- | --- |
-| 60FPS 제한 제거 | 높은 화면 재생률(120hz)을 지원하는 장비에서 부드러운 애니메이션 재생 가능 | [@laplamgor](https://x.com/laplamgor) |
-| Kantai3D v3.7 | 일부 비서함에 3D 효과 적용 | [@laplamgor](https://x.com/laplamgor) |
-| 진정한 크리티컬 히트 | CL2가 발생한 경우에만 크리티컬 히트 표시 | [@Oradimi](https://x.com/oradimi) |
+| 이름                     | 설명 | 저자 |
+|------------------------| --- | --- |
+| 60FPS 제한 제거            | 높은 화면 재생률(120hz)을 지원하는 장비에서 부드러운 애니메이션 재생 가능 | [@laplamgor](https://x.com/laplamgor) |
+| Kantai3D v4.0          | 일부 비서함에 3D 효과 적용 | [@laplamgor](https://x.com/laplamgor) |
+| 진정한 크리티컬 히트            | CL2가 발생한 경우에만 크리티컬 히트 표시 | [@Oradimi](https://x.com/oradimi) |
 | KanColle English Patch | 게임 내 리소스에 [영문 패치](https://github.com/Oradimi/KanColle-English-Patch-KCCP) 적용 (베타) | [@Oradimi](https://x.com/oradimi) |
 
 ##### 어플리케이션 정보