diff --git a/Assets/StreamingAssets/maps.meta b/Assets/Addressable/maps.meta similarity index 100% rename from Assets/StreamingAssets/maps.meta rename to Assets/Addressable/maps.meta diff --git a/Assets/StreamingAssets/maps/a61.meta b/Assets/Addressable/maps/a61.meta similarity index 100% rename from Assets/StreamingAssets/maps/a61.meta rename to Assets/Addressable/maps/a61.meta diff --git a/Assets/StreamingAssets/maps/a61/movemap.meta b/Assets/Addressable/maps/a61/movemap.meta similarity index 100% rename from Assets/StreamingAssets/maps/a61/movemap.meta rename to Assets/Addressable/maps/a61/movemap.meta diff --git a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.cfg b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.cfg.txt similarity index 100% rename from Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.cfg rename to Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.cfg.txt diff --git a/Assets/Addressable/navigate.dat.meta b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.cfg.txt.meta similarity index 62% rename from Assets/Addressable/navigate.dat.meta rename to Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.cfg.txt.meta index a6653104a6..ad7ee891d1 100644 --- a/Assets/Addressable/navigate.dat.meta +++ b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.cfg.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 3217576b92552584cbfea13094acd727 -DefaultImporter: +guid: e85ef81a22625da46bb8d0ca9aa9dfbc +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.mlu b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.mlu.txt similarity index 100% rename from Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.mlu rename to Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.mlu.txt diff --git a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.cfg.meta b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.mlu.txt.meta similarity index 62% rename from Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.cfg.meta rename to Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.mlu.txt.meta index c2d910babf..f7606a20b4 100644 --- a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.cfg.meta +++ b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.mlu.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 5cff1d9ecf7a1ea4bb3e464fe1185966 -DefaultImporter: +guid: 6c6df3ad0377b3b44ac55a00a3d177ee +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.pdhmap b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.txt similarity index 100% rename from Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.pdhmap rename to Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.txt diff --git a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.mlu.meta b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.txt.meta similarity index 62% rename from Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.mlu.meta rename to Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.txt.meta index 3e57214ca5..c722cf60e2 100644 --- a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.mlu.meta +++ b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 168a671552319e14d87256a613d723f1 -DefaultImporter: +guid: 5e170d06c26f304459289684e88274b5 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.prmap b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.prmap.txt similarity index 100% rename from Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.prmap rename to Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.prmap.txt diff --git a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.meta b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.prmap.txt.meta similarity index 62% rename from Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.meta rename to Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.prmap.txt.meta index 171c63761e..ebee50c9da 100644 --- a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.meta +++ b/Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.prmap.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 340e1ffc756aaa34f92892c742006648 -DefaultImporter: +guid: 863a9da1fd09c934ea870dc4cfd4a906 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Addressable/navigate.dat b/Assets/Addressable/navigate.txt similarity index 100% rename from Assets/Addressable/navigate.dat rename to Assets/Addressable/navigate.txt diff --git a/Assets/Addressable/navigate.txt.meta b/Assets/Addressable/navigate.txt.meta new file mode 100644 index 0000000000..587f8b44f4 --- /dev/null +++ b/Assets/Addressable/navigate.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4b443ee34dd16554ba753729e8b55ef1 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/configuration.asset b/Assets/AddressableAssetsData/AssetGroups/configuration.asset index 877838f549..818c5cfa69 100644 --- a/Assets/AddressableAssetsData/AssetGroups/configuration.asset +++ b/Assets/AddressableAssetsData/AssetGroups/configuration.asset @@ -35,8 +35,8 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 3217576b92552584cbfea13094acd727 - m_Address: Assets/Addressable/navigate.dat + - m_GUID: 4b443ee34dd16554ba753729e8b55ef1 + m_Address: Assets/Addressable/navigate.txt m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 @@ -50,11 +50,21 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 5e170d06c26f304459289684e88274b5 + m_Address: Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.pdhmap.txt + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 68c2ec3141053fe4eb413d0698ae9a97 m_Address: Assets/PerfectWorld/Data/task_npc.txt m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 6c6df3ad0377b3b44ac55a00a3d177ee + m_Address: Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.mlu.txt + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 6e02334765e10654e874714298f4eef1 m_Address: Assets/Addressable/gshop.txt m_ReadOnly: 0 @@ -75,6 +85,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 863a9da1fd09c934ea870dc4cfd4a906 + m_Address: Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.prmap.txt + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 98b87a70ddccda2459742976c2b90262 m_Address: Assets/Addressable/gshop1.txt m_ReadOnly: 0 @@ -100,6 +115,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: e85ef81a22625da46bb8d0ca9aa9dfbc + m_Address: Assets/Addressable/maps/a61/movemap/r1_1-c1_2-l0.cfg.txt + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: ef28dc36280e16643b8d27fd5839ffa0 m_Address: Assets/Addressable/ingame.txt m_ReadOnly: 0 diff --git a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.prmap.meta b/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.prmap.meta deleted file mode 100644 index c89dc429f9..0000000000 --- a/Assets/StreamingAssets/maps/a61/movemap/r1_1-c1_2-l0.prmap.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 763555eef66aa09458f9c5eb68c76235 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: