Skip to content

M
MDPro3
Commit be998dfc authored by SherryChaos's avatar SherryChaos
Browse files
Options

Linux bug fix

parent b9118624
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 303 deletions
Assets/AddressableAssetsData/AddressableAssetSettings.asset
View file @ be998dfc
......@@ -100,7 +100,7 @@ MonoBehaviour:
- m_Id: 66fcd09449b383f4ebdcc90f17ba2b50
m_Value: '{System.Environment.CurrentDirectory}'
- m_Id: 95cf036a78257634db8a484f4a6a3cb0
m_Value: '[BuildTarget]/MDPro3'
m_Value: 'Platforms/[BuildTarget]/MDPro3'
- m_Id: 9cd517b75c1fb244b92417cb632a5ad7
m_Value: '[BuildTarget]/MDPro3'
- m_Id: ae9227da150616d40afc28f814f8df41
......
Assets/AddressableAssetsData/AssetGroups/Schemas/BGM_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Font_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Other_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Prefab_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/SE_CrossDuel_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/SE_DUEL_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/SE_FIELD_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/SE_MATE_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/SE_SYS_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Scene_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-AvatarBase_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-Chara001_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-Chara002_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-Chara003_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-DeckCase_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-Field_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-Grave_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-Mate_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-MenuIcon_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-ProfileFrame_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-ProfileIcon_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Sprite-Wallpaper_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Text_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Texture-PendulumNumbers_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/AddressableAssetsData/AssetGroups/Schemas/Texture_BundledAssetGroupSchema.asset
View file @ be998dfc
......@@ -19,7 +19,7 @@ MonoBehaviour:
m_IncludeGUIDInCatalog: 0
m_IncludeLabelsInCatalog: 0
m_InternalIdNamingMode: 1
m_CacheClearBehavior: 0
m_CacheClearBehavior: 1
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
......
Assets/Addressables/Text/UpdateContent.txt
View file @ be998dfc
MDPro3 v1.2.8更新：
1.修复登录MyCard账号时，账号或密码中包含特殊字符时无法登录的错误。
MDPro3 v1.2.7.1更新：
1.修复安卓端决斗中无法更换副卡组卡片的错误。
2.修复在线卡组无法预览的错误。
......
Assets/Plugins/Linux.meta 0 → 100644
View file @ be998dfc
fileFormatVersion: 2
guid: bbad9ca30984fc5478936b198416047b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Linux/libocgcore.so.meta 0 → 100644
View file @ be998dfc
fileFormatVersion: 2
guid: 9afba5e25881d1a40acb90f08512e488
\ No newline at end of file
Assets/Plugins/Linux/libsqlite3.so.meta 0 → 100644
View file @ be998dfc
fileFormatVersion: 2
guid: d68caeda3ef98914a9059a0dbfdd5a63
\ No newline at end of file
Assets/Plugins/Linux/libygoserver.so.meta 0 → 100644
View file @ be998dfc
fileFormatVersion: 2
guid: 5b4f1ac1131b83943b24c09f73e31ed1
\ No newline at end of file
Assets/Scenes/Main.unity
View file @ be998dfc
......@@ -12485,7 +12485,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 599.9998, y: 0}
m_AnchoredPosition: {x: 599.9999, y: 0}
m_SizeDelta: {x: 600, y: 0}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1850716665
......
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @ be998dfc
This diff is collapsed.
Assets/Scripts/MDPro3/Helper/ABLoader.cs
View file @ be998dfc
......@@ -16,12 +16,16 @@ namespace MDPro3
public static Dictionary<string, GameObject> cachedAB = new Dictionary<string, GameObject>();
public static Dictionary<string, List<GameObject>> cachedABFolder = new Dictionary<string, List<GameObject>>();
public static Dictionary<string, Material> cachedPMat = new Dictionary<string, Material>();
private static readonly object pMatLock = new();
private static bool loadingPMat;
public static IEnumerator CacheFromFileAsync(string path)
{
var abr = AssetBundle.LoadFromFileAsync(path);
while (!abr.isDone)
yield return null;
}
public static GameObject LoadFromFile(string path, bool cache = false)
{
GameObject returnValue;
......@@ -47,6 +51,7 @@ namespace MDPro3
}
return null;
}
public static IEnumerator<GameObject> LoadFromFileAsync(string path, bool cache = false, bool copy = true)
{
GameObject returnValue;
......@@ -79,6 +84,7 @@ namespace MDPro3
if (copy)
yield return Instantiate(returnValue);
}
public static GameObject LoadFromFolder(string path, string abName = "GameObject", bool cache = false)
{
GameObject returnValue = new GameObject(abName);
......@@ -95,7 +101,7 @@ namespace MDPro3
List<AssetBundle> bundles = new List<AssetBundle>();
DirectoryInfo dir = new DirectoryInfo(Program.root + path);
#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
#if !UNITY_EDITOR && UNITY_STANDALONE_OSX
dir = new DirectoryInfo(Path.Combine(Application.dataPath, Program.root + path));
#endif
......@@ -124,6 +130,7 @@ namespace MDPro3
return returnValue;
}
public static IEnumerator<GameObject> LoadFromFolderAsync(string path, string abName = "GameObject", bool cache = false, bool copy = true)
{
GameObject returnValue = new GameObject(abName);
......@@ -188,8 +195,6 @@ namespace MDPro3
}
}
static readonly object pMatLock = new object();
static bool loadingPMat;
public static IEnumerator<Material> LoadProtectorMaterial(string code)
{
if (code == Items.CODE_RANDOM.ToString())
......@@ -255,6 +260,7 @@ namespace MDPro3
}
yield return material;
}
public static IEnumerator<Material> LoadFrameMaterial(string code)
{
if (code == Items.CODE_RANDOM.ToString())
......@@ -269,6 +275,7 @@ namespace MDPro3
TextureManager.ChangeProfileFrameMaterialWrapMode(material);
yield return material;
}
public static IEnumerator<Material> LoadMaterialAsync(string path)
{
var abr = AssetBundle.LoadFromFileAsync(Program.root + path);
......@@ -376,7 +383,6 @@ namespace MDPro3
yield return returnValue;
}
}
}
Assets/Scripts/MDPro3/Managers/TimeLineManager.cs
View file @ be998dfc
......@@ -100,7 +100,7 @@ namespace MDPro3
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/SummonFusionShowUnitCard08",
"SummonFusionShowUnitCard08", true);
else
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/summonfusionshowunitcard0" + materials.Count,
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/SummonFusionShowUnitCard0" + materials.Count,
"SummonFusionShowUnitCard0" + materials.Count, true);
}
......@@ -199,10 +199,10 @@ namespace MDPro3
GameObject summon;
if (materials.Count > 5)
summon = ABLoader.LoadFromFolder("MasterDuel/Timeline/summon/summonfusion/fusionnum",
summon = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/FusionNum",
"FusionNum", true);
else
summon = ABLoader.LoadFromFolder("MasterDuel/Timeline/summon/summonfusion/summonfusion0" + materials.Count + "_01",
summon = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/SummonFusion0" + materials.Count + "_01",
"SummonFusion0" + materials.Count, true);
Program.instance.ocgcore.allGameObjects.Add(summon);
DoWhenStop(summon.transform.GetChild(0).gameObject);
......@@ -255,9 +255,9 @@ namespace MDPro3
summoned = 1;
GameObject summon;
if (materials.Count > 0)
summon = ABLoader.LoadFromFolder("MasterDuel/Timeline/summon/summonritual/summonritual01", "SummonRitual01", true);
summon = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonRitual/SummonRitual01", "SummonRitual01", true);
else
summon = ABLoader.LoadFromFolder("MasterDuel/Timeline/summon/summonritual/summonritual02", "SummonRitual02", true);
summon = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonRitual/SummonRitual02", "SummonRitual02", true);
ElementObjectManager manager = null;
for (int i = 0; i < summon.transform.childCount; i++)
......@@ -316,9 +316,9 @@ namespace MDPro3
summoned = 2;
GameObject summon;
if (materials.Count > 0)
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonsynchro/summonsynchro01", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonSynchro/SummonSynchro01", true);
else
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonsynchro/summonsynchro02", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonSynchro/SummonSynchro02", true);
Program.instance.ocgcore.allGameObjects.Add(summon);
DoWhenStop(summon);
......@@ -373,13 +373,13 @@ namespace MDPro3
GameObject summon;
if (materials.Count == 0)
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonxyz/summonxyz00_01", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonXyz/SummonXYZ00_01", true);
else if (materials.Count == 1)
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonxyz/summonxyz01_01", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonXyz/SummonXYZ01_01", true);
else if (materials.Count == 2)
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonxyz/summonxyz02_01", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonXyz/SummonXYZ02_01", true);
else
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonxyz/summonxyz03_01", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonXyz/SummonXYZ03_01", true);
Program.instance.ocgcore.allGameObjects.Add(summon);
DoWhenStop(summon);
......@@ -407,11 +407,11 @@ namespace MDPro3
GameObject summon;
int linkCount = CardDescription.GetCardLinkCount(CardsManager.Get(summonCard));
if (linkCount == 1)
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonlink/summonlink01_01", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonLink/SummonLink01_01", true);
else if (linkCount == 2)
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonlink/summonlink02_01", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonLink/SummonLink02_01", true);
else
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonlink/summonlink03_01", true);
summon = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonLink/SummonLink03_01", true);
Program.instance.ocgcore.allGameObjects.Add(summon);
DoWhenStop(summon);
......
Assets/Scripts/MDPro3/Net/MyCard.cs
View file @ be998dfc
......@@ -37,7 +37,9 @@ namespace MDPro3.Net
public static async Task<MyCardAccount> Login(string account, string password)
{
string json = "{\"account\":\"" + account + "\",\"password\":\"" + password + "\"}";
var data = new { account = account, password = password};
string json = JsonConvert.SerializeObject(data);
using var request = UnityWebRequest.Post(loginUrl, json, jsonHeader);
request.SetRequestHeader("Content-Type", jsonHeader);
......
Assets/Scripts/MDPro3/Servant/CutinViewer.cs
View file @ be998dfc
......@@ -256,19 +256,19 @@ namespace MDPro3.Servant
//BackEffects
GameObject back;
if ((card.Attribute & (uint)CardAttribute.Dark) > 0)//125
back = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/04backeff/summonmonster_bgdak_s2", true);
back = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/04BackEff/SummonMonster_Bgdak_S2", true);
else if ((card.Attribute & (uint)CardAttribute.Light) > 0)//100
back = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/04backeff/summonmonster_bglit_s2", true);
back = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/04BackEff/SummonMonster_Bglit_S2", true);
else if ((card.Attribute & (uint)CardAttribute.Earth) > 0)//56
back = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/04backeff/summonmonster_bgeah_s2", true);
back = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/04BackEff/SummonMonster_Bgeah_S2", true);
else if ((card.Attribute & (uint)CardAttribute.Water) > 0)//35
back = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/04backeff/summonmonster_bgwtr_s2", true);
back = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/04BackEff/SummonMonster_Bgwtr_S2", true);
else if ((card.Attribute & (uint)CardAttribute.Fire) > 0)//31
back = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/04backeff/summonmonster_bgfie_s2", true);
back = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/04BackEff/SummonMonster_Bgfie_S2", true);
else if ((card.Attribute & (uint)CardAttribute.Wind) > 0)//25
back = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/04backeff/summonmonster_bgwid_s2", true);
back = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/04BackEff/SummonMonster_Bgwid_S2", true);
else//4
back = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/04backeff/summonmonster_bgdve_s2", true);
back = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/04BackEff/SummonMonster_Bgdve_S2", true);
back.transform.SetParent(Program.instance.container_2D, false);
Transform eff_flame = back.transform.Find("Eff_Flame");
eff_flame.localScale = new Vector3(2.76f, 1.55f, 1f);
......@@ -286,9 +286,9 @@ namespace MDPro3.Servant
//Name Bar
GameObject nameBar;
if (controller == 0)
nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/01text/summonmonster_name_near", true);
nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/01Text/SummonMonster_Name_near", true);
else
nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/01text/summonmonster_name_far", true);
nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/01Text/SummonMonster_Name_far", true);
nameBar.transform.SetParent(Program.instance.container_2D, false);
var manager = nameBar.GetComponent<ElementObjectManager>();
......@@ -370,7 +370,7 @@ namespace MDPro3.Servant
Destroy(nameBar, CUTIN_PLAY_TIME);
//front Effect
var frontEffect = ABLoader.LoadFromFile("MasterDuel/Timeline/summon/summonmonster/02fronteff/summonmonster_thunder_power", true);
var frontEffect = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/02FrontEff/SummonMonster_Thunder_power", true);
frontEffect.transform.SetParent(Program.instance.container_2D, false);
Destroy(frontEffect, CUTIN_PLAY_TIME);
}
......
Assets/Scripts/MDPro3/Servant/OcgCore.cs
View file @ be998dfc
This diff is collapsed.
Assets/Scripts/MDPro3/System/UserInput.cs
View file @ be998dfc
......@@ -7,7 +7,7 @@ using UnityEngine.InputSystem;
using UnityEngine.InputSystem.DualShock;
using UnityEngine.UI;
#if (!UNITY_ANDROID && !UNITY_IOS) || UNITY_EDITOR
#if (!UNITY_ANDROID && !UNITY_IOS && !UNITY_STANDALONE_LINUX) || UNITY_EDITOR
using UnityEngine.InputSystem.Switch;
using UnityEngine.InputSystem.UI;
#endif
......@@ -353,7 +353,7 @@ namespace MDPro3
if (Gamepad.current is DualShockGamepad)
gamepadType = GamepadType.PlayStation;
#if (!UNITY_ANDROID && !UNITY_IOS) || UNITY_EDITOR
#if (!UNITY_ANDROID && !UNITY_IOS && !UNITY_STANDALONE_LINUX) || UNITY_EDITOR
else if (Gamepad.current is SwitchProControllerHID)
gamepadType = GamepadType.Nintendo;
#endif
......@@ -373,7 +373,7 @@ namespace MDPro3
public static void SetMoveRepeatRate(float rate)
{
#if (!UNITY_ANDROID && !UNITY_IOS) || UNITY_EDITOR
#if (!UNITY_ANDROID && !UNITY_IOS && !UNITY_STANDALONE_LINUX) || UNITY_EDITOR
var module = instance.GetComponent<InputSystemUIInputModule>();
module.moveRepeatRate = rate;
#endif
......
Assets/Scripts/MDPro3/UI/Popup/PopupDuelSelectCardItem.cs
View file @ be998dfc
......@@ -166,7 +166,7 @@ namespace MDPro3.UI
{
if (manager.arrow == null)
{
manager.arrow = ABLoader.LoadFromFile("MasterDuel/Effects/other/fxp_arrow_aim_001", true);
manager.arrow = ABLoader.LoadFromFile("MasterDuel/Effects/Other/fxp_arrow_aim_001", true);
Program.instance.ocgcore.allGameObjects.Add(manager.arrow);
}
manager.arrow.transform.position = card.model.transform.position;
......
Assets/Scripts/MDPro3/UI/UIComponents/PlaceSelector.cs
View file @ be998dfc
......@@ -52,10 +52,10 @@ namespace MDPro3.UI
{
highlight = ABLoader.LoadFromFile("MasterDuel/Effects/eff_highlight/eff_duel_highlight11", true);
collider.size = new Vector3(8f, 1f, 8f);
select = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_mst_001", true);
selectPush = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_mst_push_001", true);
selectCard = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_card_001", true);
selectCardPush = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_card_push_001", true);
select = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_mst_001", true);
selectPush = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_mst_Push_001", true);
selectCard = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_card_001", true);
selectCardPush = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_card_Push_001", true);
disable = new GameObject("Disable");
CreateSelectButton();
}
......@@ -65,10 +65,10 @@ namespace MDPro3.UI
{
highlight = ABLoader.LoadFromFile("MasterDuel/Effects/eff_highlight/eff_duel_highlight13", true);
collider.size = new Vector3(6f, 1f, 7f);
select = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_card_001", true);
selectPush = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_card_push_001", true);
selectCard = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_card_001", true);
selectCardPush = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_card_push_001", true);
select = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_card_001", true);
selectPush = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_card_Push_001", true);
selectCard = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_card_001", true);
selectCardPush = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_card_Push_001", true);
select.transform.localScale = Vector3.one * 0.8f;
selectPush.transform.localScale = Vector3.one * 0.8f;
}
......@@ -76,10 +76,10 @@ namespace MDPro3.UI
{
highlight = ABLoader.LoadFromFile("MasterDuel/Effects/eff_highlight/eff_duel_highlight12", true);
collider.size = new Vector3(8f, 1f, 7f);
select = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_trpmgc_001", true);
selectPush = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_trpmgc_push_001", true);
selectCard = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_card_001", true);
selectCardPush = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_select/fxp_hl_select_card_push_001", true);
select = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_trpmgc_001", true);
selectPush = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_trpmgc_Push_001", true);
selectCard = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_card_001", true);
selectCardPush = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_Select/fxp_HL_Select_card_Push_001", true);
}
selectCard.transform.localScale = Vector3.one * 0.8f;
selectCardPush.transform.localScale = Vector3.one * 0.8f;
......@@ -545,7 +545,7 @@ namespace MDPro3.UI
{
if ((location & p.location) > 0 && controller == p.controller)
{
hintObj = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_exdeck_001", true);
hintObj = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_EXdeck_001", true);
hintObj.transform.SetParent(transform, false);
int cardCount = Program.instance.ocgcore.GetLocationCardCount((CardLocation)location, controller);
hintObj.transform.localScale = new Vector3(1.1f, cardCount * 0.1f, 1.1f);
......
Assets/Tools/AssetStudio/AssetStudio.csproj.meta 0 → 100644
View file @ be998dfc
fileFormatVersion: 2
guid: 138cc67ebafd7a74face7773ba172dbc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Tools/Android2Linux.py deleted 100644 → 0
View file @ b9118624
import os
def process_files(input_folder, output_folder):
# 定义目标字节序列 A 和替换规则
target_sequence = bytes([0x32, 0x30, 0x32, 0x32, 0x2E, 0x33, 0x2E, 0x31, 0x35, 0x66, 0x31])
replacement_byte = 0x18
# 创建 log 文件
log_file_path = os.path.join(output_folder, "log.txt")
with open(log_file_path, "w") as log_file:
log_file.write("Files without target sequence or insufficient length:\n")
# 遍历输入文件夹中的所有文件
for root, _, files in os.walk(input_folder):
for file in files:
input_file_path = os.path.join(root, file)
relative_path = os.path.relpath(input_file_path, input_folder)
output_file_path = os.path.join(output_folder, relative_path)
# 确保输出文件夹存在
os.makedirs(os.path.dirname(output_file_path), exist_ok=True)
try:
# 读取文件内容
with open(input_file_path, "rb") as f:
content = f.read()
# 查找第一次和第二次出现的序列 A 的位置
first_index = content.find(target_sequence)
if first_index != -1:
second_index = content.find(target_sequence, first_index + len(target_sequence))
else:
second_index = -1
if second_index != -1:
# 计算需要修改的位置（第二次序列 A 后两个字节的第二个字节）
modify_position = second_index + len(target_sequence) + 1 # 跳过第一个字节
# 检查是否有足够的长度进行修改
if modify_position < len(content):
modified_content = bytearray(content)
modified_content[modify_position] = replacement_byte # 替换第二个字节
# 写入修改后的内容到输出文件
with open(output_file_path, "wb") as f:
f.write(modified_content)
else:
# 如果文件长度不足，记录到日志中
with open(log_file_path, "a") as log_file:
log_file.write(f"{input_file_path} (insufficient length after second sequence)\n")
else:
# 如果未找到两次序列 A，记录到日志中
with open(log_file_path, "a") as log_file:
log_file.write(f"{input_file_path}\n")
except Exception as e:
print(f"Error processing file: {input_file_path} ({e})")
print("Processing complete. Log of files without the target sequence written to:", log_file_path)
if __name__ == "__main__":
# 设置输入和输出文件夹路径
input_folder = input("请输入输入文件夹路径: ").strip()
output_folder = input("请输入输出文件夹路径: ").strip()
# 检查输入文件夹是否存在
if not os.path.isdir(input_folder):
print(f"输入文件夹不存在: {input_folder}")
else:
# 创建输出文件夹（如果不存在）
os.makedirs(output_folder, exist_ok=True)
# 开始处理文件
process_files(input_folder, output_folder)
Tools/iOS2OSX.py deleted 100644 → 0
View file @ b9118624
import os
def process_files(input_folder, output_folder):
# 定义目标字节序列 A 和替换规则
target_sequence = bytes([0x32, 0x30, 0x32, 0x32, 0x2E, 0x33, 0x2E, 0x31, 0x35, 0x66, 0x31])
replacement_byte = 0x02
# 创建 log 文件
log_file_path = os.path.join(output_folder, "log.txt")
with open(log_file_path, "w") as log_file:
log_file.write("Files without target sequence or insufficient length:\n")
# 遍历输入文件夹中的所有文件
for root, _, files in os.walk(input_folder):
for file in files:
input_file_path = os.path.join(root, file)
relative_path = os.path.relpath(input_file_path, input_folder)
output_file_path = os.path.join(output_folder, relative_path)
# 确保输出文件夹存在
os.makedirs(os.path.dirname(output_file_path), exist_ok=True)
try:
# 读取文件内容
with open(input_file_path, "rb") as f:
content = f.read()
# 查找第一次和第二次出现的序列 A 的位置
first_index = content.find(target_sequence)
if first_index != -1:
second_index = content.find(target_sequence, first_index + len(target_sequence))
else:
second_index = -1
if second_index != -1:
# 计算需要修改的位置（第二次序列 A 后两个字节的第二个字节）
modify_position = second_index + len(target_sequence) + 1 # 跳过第一个字节
# 检查是否有足够的长度进行修改
if modify_position < len(content):
modified_content = bytearray(content)
modified_content[modify_position] = replacement_byte # 替换第二个字节
# 写入修改后的内容到输出文件
with open(output_file_path, "wb") as f:
f.write(modified_content)
else:
# 如果文件长度不足，记录到日志中
with open(log_file_path, "a") as log_file:
log_file.write(f"{input_file_path} (insufficient length after second sequence)\n")
else:
# 如果未找到两次序列 A，记录到日志中
with open(log_file_path, "a") as log_file:
log_file.write(f"{input_file_path}\n")
except Exception as e:
print(f"Error processing file: {input_file_path} ({e})")
print("Processing complete. Log of files without the target sequence written to:", log_file_path)
if __name__ == "__main__":
# 设置输入和输出文件夹路径
input_folder = input("请输入输入文件夹路径: ").strip()
output_folder = input("请输入输出文件夹路径: ").strip()
# 检查输入文件夹是否存在
if not os.path.isdir(input_folder):
print(f"输入文件夹不存在: {input_folder}")
else:
# 创建输出文件夹（如果不存在）
os.makedirs(output_folder, exist_ok=True)
# 开始处理文件
process_files(input_folder, output_folder)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment