diff --git a/android/app/src/main/java/com/dcmodmanager/DCTools.java b/android/app/src/main/java/com/dcmodmanager/DCTools.java index 3da236d..0cfb302 100644 --- 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; } } \ No newline at end of file diff --git a/src/Settings.js b/src/Settings.js index c944a42..8397ec4 100644 --- a/src/Settings.js +++ b/src/Settings.js @@ -56,6 +56,10 @@ const Settings = ({config, setConfig}) => { setConfig({region: value})} value={config.region}> + (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 index 149bcbe..9c3d796 100644 --- 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` -} \ No newline at end of file +} + +export { regions as pathRegions } \ No newline at end of file