Merge branch 'jynew:main' into main

onduty1981 · Apr 15, 2023 · 44ad822 · 44ad822
2 parents a9ebde5 + b6c4290
commit 44ad822
Show file tree

Hide file tree

Showing 37 changed files with 333 additions and 41,341 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
 
-custom: ['http://www.jy-new.com/redmine/projects/public/wiki/%E6%8D%90%E5%8A%A9%E9%A1%B9%E7%9B%AE']
+custom: ['https://github.com/jynew/jynew/wiki/%E6%8D%90%E5%8A%A9%E9%A1%B9%E7%9B%AE']
diff --git a/jyx2/Assets/Editor/PrivacyPolicyDialog.cs b/jyx2/Assets/Editor/PrivacyPolicyDialog.cs
diff --git a/jyx2/Assets/Editor/PrivacyPolicyDialog.cs.meta b/jyx2/Assets/Editor/PrivacyPolicyDialog.cs.meta
diff --git a/jyx2/Assets/Mods/JYX2/ModSetting.asset b/jyx2/Assets/Mods/JYX2/ModSetting.asset
@@ -14,9 +14,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ModId: JYX2
   IsNativeMod: 0
-  Desc: 
+  Desc: "\u4EE5\u300A\u7FA4\u4FA0\u4F20\uFF0C\u542F\u52A8\uFF01\u300B\u6846\u67B6\u4E3A\u57FA\u7840\uFF0C\u5C3D\u53EF\u80FD\u7684\u8FD8\u539F\u300A\u91D1\u5EB8\u7FA4\u4FA0\u4F20\u300B\u76843D\u91CD\u5236\u7248\u3002"
   Version: 
-  ModName: "\u91D1\u5EB8\u7FA4\u4FA0\u4F203D"
+  ModName: "\u91D1\u5EB8\u7FA4\u4FA0\u4F203D\u91CD\u5236\u7248"
   ModRootDir: Assets/Mods/JYX2
   Author: "\u91D1\u5EB8\u7FA4\u4FA0\u4F203D\u91CD\u5236\u7248\u793E\u533A"
   LuaFilePatten: ka{0}
@@ -111,3 +111,5 @@ MonoBehaviour:
     Name: "\u970D\u9752\u6850\u968F\u4ECE"
   - Id: 114
     Name: "\u8F6F\u4F53\u5A03\u5A03"
+  CameraOffsetNear: {x: 0, y: 0, z: 0}
+  CameraOffsetFar: {x: 0, y: 0, z: 0}
diff --git a/jyx2/Assets/Mods/SAMPLE/ModSetting.asset b/jyx2/Assets/Mods/SAMPLE/ModSetting.asset
@@ -106,3 +106,5 @@ MonoBehaviour:
     Name: "\u6768\u6CD5"
   - Id: 1195
     Name: "\u65E0\u9645\u574A\u4F8D\u536B"
+  CameraOffsetNear: {x: 0, y: 0, z: 0}
+  CameraOffsetFar: {x: 0, y: 0, z: 0}
diff --git a/jyx2/Assets/Mods/xiastart_roguelike/ModSetting.asset b/jyx2/Assets/Mods/xiastart_roguelike/ModSetting.asset
@@ -36,8 +36,8 @@ MonoBehaviour:
   BattleTimeScale: 2
   ShowSkillNameInBattle: 1
   IsConsoleEnable: 0
+  ConsoleDisableDifficulty: 
   IsPlayUseItemAnimation: 0
-  IsUsingLuaConfig: 1
   StoryIdNameFixes:
   - Id: 76
     Name: "\u6B66\u5F53\u5F1F\u5B50"
@@ -117,3 +117,5 @@ MonoBehaviour:
     Name: "\u970D\u9752\u6850\u968F\u4ECE"
   - Id: 114
     Name: "\u8F6F\u4F53\u5A03\u5A03"
+  CameraOffsetNear: {x: 0, y: 0, z: 0}
+  CameraOffsetFar: {x: 0, y: 0, z: 0}
diff --git a/jyx2/Assets/Plugins/Android/AndroidManifest.xml b/jyx2/Assets/Plugins/Android/AndroidManifest.xml
@@ -4,16 +4,19 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.unity3d.player"
     xmlns:tools="http://schemas.android.com/tools">
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <application>
-        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+        <activity android:name="com.unity3d.player.PrivacyActivity"
                   android:theme="@style/UnityThemeSelector">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+        </activity>
+        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+                  android:theme="@style/UnityThemeSelector">
             <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
         </activity>
     </application>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 </manifest>
diff --git a/jyx2/Assets/Plugins/Android/com.meta b/jyx2/Assets/Plugins/Android/com.meta
diff --git a/jyx2/Assets/Plugins/Android/com/unity3d.meta b/jyx2/Assets/Plugins/Android/com/unity3d.meta
diff --git a/jyx2/Assets/Plugins/Android/com/unity3d/player.meta b/jyx2/Assets/Plugins/Android/com/unity3d/player.meta