Add support for Taptap Global version

soyasoya5 · Nov 24, 2020 · b296c4f · b296c4f
1 parent bf9947a
commit b296c4f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/android/app/src/main/java/com/dcmodmanager/DCTools.java b/android/app/src/main/java/com/dcmodmanager/DCTools.java
@@ -356,6 +356,11 @@ public static DCModel pckToModel(Pck pck) throws Exception {
   }
 
   public static File getDCModelInfoPath() {
-    return new File(APPS_PATH + "/com.linegames.dcglobal/files/asset/character/model_info.json");
+    File modelInfo = new File(APPS_PATH + "/com.linegames.dcglobal/files/asset/character/model_info.json");
+    if (!modelInfo.exists()) {
+      modelInfo = new File(APPS_PATH + "/com.linegames.dcglobal.xsolla/files/asset/character/model_info.json");
+    }
+
+    return modelInfo;
   }
 }
diff --git a/src/Settings.js b/src/Settings.js
@@ -56,6 +56,10 @@ const Settings = ({config, setConfig}) => {
         <Card.Title title="Game Region" />
         <Card.Content>
           <RadioButton.Group onValueChange={value => setConfig({region: value})} value={config.region}>
+            <RadioButton.Item
+              label={'Global  (Taptap) - com.linegames.dcglobal.xsolla' + (config.installedRegions.indexOf('global_tap') < 0 ? ' (not installed)' : '')}
+              value="global_tap"
+              disabled={config.installedRegions.indexOf('global_tap') < 0} />
             <RadioButton.Item
               label={'Global - com.linegames.dcglobal' + (config.installedRegions.indexOf('global') < 0 ? ' (not installed)' : '')}
               value="global"

diff --git a/src/actions/config.js b/src/actions/config.js
@@ -3,13 +3,13 @@ import {setLoading} from './loading'
 import {loadInstalled} from './installed'
 import {setView} from './view'
 import RNFS from 'react-native-fs'
-import {getSettingsPath, getDestinyChildPath} from '../lib/paths'
+import {getSettingsPath, getDestinyChildPath, pathRegions} from '../lib/paths'
 
 export const loadConfig = () =>
   (dispatch) => {
     const installedRegions = [],
           regionPromises = [];
-    ['global', 'kr', 'jp'].forEach(region => {
+    Object.keys(pathRegions).forEach(region => {
       regionPromises.push(RNFS.exists(getDestinyChildPath(region)).then(exists => {
         if(exists) installedRegions.push(region)
       }))

diff --git a/src/lib/paths.js b/src/lib/paths.js
@@ -2,6 +2,7 @@ import RNFS from 'react-native-fs'
 import store from './store'
 
 const regions = {
+  global_tap: 'com.linegames.dcglobal.xsolla',
   global: 'com.linegames.dcglobal',
   kr: 'com.NextFloor.DestinyChild',
   jp: 'com.stairs.destinychild'
@@ -35,4 +36,6 @@ export const getSettingsPath = () => {
 export const getInstalledPath = () => {
   const region = store.getState().config.region
   return getDcModManagerFolderPath() + `/installed${region}.json`
-}
+}
+
+export  { regions as pathRegions }