Skip to content

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

Linux bug fix

parent b9118624
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
......@@ -185,14 +185,14 @@ namespace MDPro3
var cardParmUp = ABLoader.LoadFromFile("MasterDuel/Effects/eff_prm/fxp_cardparm_up_001", true);
var cardParmDown = ABLoader.LoadFromFile("MasterDuel/Effects/eff_prm/fxp_cardparm_down_001", true);
var cardParmChange = ABLoader.LoadFromFile("MasterDuel/Effects/eff_prm/fxp_cardparm_change_001", true);
var cardBuffActive = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_active_001", true);
var cardNegate = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_disable_001", true);
var cardDisquiet = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_disquiet_001", true);
var cardBuffActive = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_active_001", true);
var cardNegate = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_disable_001", true);
var cardDisquiet = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_disquiet_001", true);
var cardBlueHighlight = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_set_001", true);
var cardBlueHighlightSelect = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_set_sct_001", true);
var cardYellowHighlight = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_spsom_001", true);
var cardYellowHighlightSelect = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_spsom_sct_001", true);
var cardBlueHighlight = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_set_001", true);
var cardBlueHighlightSelect = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_set_sct_001", true);
var cardYellowHighlight = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_SPsom_001", true);
var cardYellowHighlightSelect = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_SPsom_sct_001", true);
cardParmUp.transform.SetParent(manager.GetElement<Transform>("Turn").GetChild(1), false);
cardParmDown.transform.SetParent(manager.GetElement<Transform>("Turn").GetChild(1), false);
......@@ -1077,7 +1077,7 @@ namespace MDPro3
se = "SE_CARDBREAK_01";
if (!data.HasType(CardType.Token))
{
var breakEffectPath = "MasterDuel/Effects/break/fxp_cardbrk_bff_001";
var breakEffectPath = "MasterDuel/Effects/Break/fxp_cardbrk_bff_001";
var trail1Path = "MasterDuel/Effects/Grave/fxp_grave_brksol_trail_001";
var trail2Path = "MasterDuel/Effects/Grave/fxp_grave_ReCard_move_001";
if ((p.location & (uint)CardLocation.Removed) > 0)
......@@ -1108,7 +1108,7 @@ namespace MDPro3
{
AudioManager.PlaySE(se);
AudioManager.PlaySE("SE_SUMMON_EYZ_MATERIAL");
var fx = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/fusiontrailfieldcard01", "FieldCard", true);
var fx = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/FusionTrailFieldCard01", "FieldCard", true);
fx.transform.localPosition = model.transform.position;
fx.transform.localEulerAngles = GetEffectRotaion(cacheP);
var manager = fx.transform.GetChild(0).GetComponent<ElementObjectManager>();
......@@ -1137,7 +1137,7 @@ namespace MDPro3
{
AudioManager.PlaySE(se);
AudioManager.PlaySE("SE_SUMMON_EYZ_MATERIAL");
var fx = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/fusiontrailfieldcard01", "FieldCard", true);
var fx = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/FusionTrailFieldCard01", "FieldCard", true);
fx.transform.localPosition = model.transform.position;
fx.transform.localEulerAngles = GetEffectRotaion(cacheP);
var manager = fx.transform.GetChild(0).GetComponent<ElementObjectManager>();
......@@ -1191,7 +1191,7 @@ namespace MDPro3
if (p.location == 0)
{
AudioManager.PlaySE("SE_CARD_TOKEN_BREAK");
var fx = ABLoader.LoadFromFolder("MasterDuel/Effects/buff/fxp_bff_tokese", "fxp_bff_tokese", true);
var fx = ABLoader.LoadFromFolder("MasterDuel/Effects/Buff/fxp_bff_tokese", "fxp_bff_tokese", true);
fx.transform.position = model.transform.position;
fx.transform.localEulerAngles = GetEffectRotaion(p);
Destroy(model);
......@@ -1203,7 +1203,7 @@ namespace MDPro3
if ((p.reason & (uint)CardReason.RELEASE) > 0 && model != null)
{
se = "SE_SUMMON_ADVANCE";
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/sacrifice/fxp_sacrifice_rls_001", true);
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/Sacrifice/fxp_sacrifice_rls_001", true);
fx.transform.position = model.transform.position;
Destroy(fx, 5f);
}
......@@ -1374,11 +1374,11 @@ namespace MDPro3
&& (p.reason & (uint)CardReason.RULE) == 0)
{
se = "SE_CARD_XYZ_OUT";
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_overlay/fxp_bff_overlay_out_001", true);
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_overlay/fxp_bff_overlay_out_001", true);
fx.transform.position = GetCardPosition(cacheP);
Destroy(fx, 3f);
var trail = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_overlay/fxp_bff_overlay_trail_001");
var trail = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_overlay/fxp_bff_overlay_trail_001");
trail.transform.SetParent(model.transform, false);
if (Program.instance.ocgcore.NextMessageIsMovingFrom(CardLocation.Overlay))
......@@ -1395,12 +1395,12 @@ namespace MDPro3
DOTween.To(v => { }, 0, 0, moveTime + timePassed).OnComplete(() =>
{
AudioManager.PlaySE("SE_CARD_XYZ_IN");
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_overlay/fxp_bff_overlay_in_001", true);
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_overlay/fxp_bff_overlay_in_001", true);
fx.transform.position = GetCardPosition(p);
Destroy(fx, 3f);
});
var trail = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_overlay/fxp_bff_overlay_trail_001");
var trail = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_overlay/fxp_bff_overlay_trail_001");
trail.transform.SetParent(model.transform, false);
}
......@@ -1569,7 +1569,7 @@ namespace MDPro3
se = "SE_CARDBREAK_01";
if (!data.HasType(CardType.Token))
{
var breakEffectPath = "MasterDuel/Effects/break/fxp_cardbrk_bff_001";
var breakEffectPath = "MasterDuel/Effects/Break/fxp_cardbrk_bff_001";
var trail1Path = "MasterDuel/Effects/Grave/fxp_grave_brksol_trail_001";
var trail2Path = "MasterDuel/Effects/Grave/fxp_grave_ReCard_move_001";
if ((p.location & (uint)CardLocation.Removed) > 0)
......@@ -1600,7 +1600,7 @@ namespace MDPro3
{
AudioManager.PlaySE(se);
AudioManager.PlaySE("SE_SUMMON_EYZ_MATERIAL");
var fx = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/fusiontrailfieldcard01", "FieldCard", true);
var fx = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/FusionTrailFieldCard01", "FieldCard", true);
fx.transform.localPosition = model.transform.position;
fx.transform.localEulerAngles = GetEffectRotaion(cacheP);
var manager = fx.transform.GetChild(0).GetComponent<ElementObjectManager>();
......@@ -1629,7 +1629,7 @@ namespace MDPro3
{
AudioManager.PlaySE(se);
AudioManager.PlaySE("SE_SUMMON_EYZ_MATERIAL");
var fx = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/fusiontrailfieldcard01", "FieldCard", true);
var fx = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/FusionTrailFieldCard01", "FieldCard", true);
fx.transform.localPosition = model.transform.position;
fx.transform.localEulerAngles = GetEffectRotaion(cacheP);
var manager = fx.transform.GetChild(0).GetComponent<ElementObjectManager>();
......@@ -1683,7 +1683,7 @@ namespace MDPro3
if (p.location == 0)
{
AudioManager.PlaySE("SE_CARD_TOKEN_BREAK");
var fx = ABLoader.LoadFromFolder("MasterDuel/Effects/buff/fxp_bff_tokese", "fxp_bff_tokese", true);
var fx = ABLoader.LoadFromFolder("MasterDuel/Effects/Buff/fxp_bff_tokese", "fxp_bff_tokese", true);
fx.transform.position = model.transform.position;
fx.transform.localEulerAngles = GetEffectRotaion(p);
Destroy(model);
......@@ -1695,7 +1695,7 @@ namespace MDPro3
if ((p.reason & (uint)CardReason.RELEASE) > 0 && model != null)
{
se = "SE_SUMMON_ADVANCE";
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/sacrifice/fxp_sacrifice_rls_001", true);
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/Sacrifice/fxp_sacrifice_rls_001", true);
fx.transform.position = model.transform.position;
Destroy(fx, 5f);
}
......@@ -1902,11 +1902,11 @@ namespace MDPro3
&& (p.reason & (uint)CardReason.RULE) == 0)
{
se = "SE_CARD_XYZ_OUT";
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_overlay/fxp_bff_overlay_out_001", true);
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_overlay/fxp_bff_overlay_out_001", true);
fx.transform.position = GetCardPosition(cacheP);
Destroy(fx, 3f);
var trail = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_overlay/fxp_bff_overlay_trail_001");
var trail = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_overlay/fxp_bff_overlay_trail_001");
trail.transform.SetParent(model.transform, false);
}
......@@ -1920,12 +1920,12 @@ namespace MDPro3
DOTween.To(v => { }, 0, 0, moveTime + timePassed).OnComplete(() =>
{
AudioManager.PlaySE("SE_CARD_XYZ_IN");
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_overlay/fxp_bff_overlay_in_001", true);
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_overlay/fxp_bff_overlay_in_001", true);
fx.transform.position = GetCardPosition(p);
Destroy(fx, 3f);
});
var trail = ABLoader.LoadFromFile("MasterDuel/Effects/buff/fxp_bff_overlay/fxp_bff_overlay_trail_001");
var trail = ABLoader.LoadFromFile("MasterDuel/Effects/Buff/fxp_bff_overlay/fxp_bff_overlay_trail_001");
trail.transform.SetParent(model.transform, false);
}
......@@ -2569,7 +2569,7 @@ namespace MDPro3
}));
sequence.Join(turn.DOLocalRotate(Vector3.zero, 0.1f).OnComplete(() =>
{
var highlight = ABLoader.LoadFromFile("MasterDuel/Effects/other/fxp_card_decide_001", true);
var highlight = ABLoader.LoadFromFile("MasterDuel/Effects/Other/fxp_card_decide_001", true);
highlight.transform.position = offset.position;
highlight.transform.rotation = offset.rotation;
highlight.transform.localScale = GetCardScale(p);
......@@ -2641,7 +2641,7 @@ namespace MDPro3
Destroy(model, 0.49f);
}
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/other/fxp_card_decide_001", true);
var fx = ABLoader.LoadFromFile("MasterDuel/Effects/Other/fxp_card_decide_001", true);
fx.transform.position = model.transform.position;
if ((p.location & (uint)CardLocation.MonsterZone) > 0 && (p.position & (uint)CardPosition.Defence) > 0)
fx.transform.localEulerAngles = new Vector3(0, 90, 0);
......@@ -2722,7 +2722,7 @@ namespace MDPro3
sequence.Append(turn.DOLocalMoveY(0.1f * (id + 1), 0.1f).OnComplete(() =>
{
AudioManager.PlaySE("SE_CARDVIEW_02");
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/other/fxp_card_decide_deck_001", true);
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/Other/fxp_card_decide_deck_001", true);
effect.transform.position = turn.position;
effect.transform.rotation = turn.rotation;
Destroy(effect, 1f);
......
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
......@@ -680,7 +680,7 @@ namespace MDPro3.Servant
#region Dice
if (myDice == null)
{
var ie = ABLoader.LoadFromFolderAsync("MasterDuel/TimeLine/DuelDice");
var ie = ABLoader.LoadFromFolderAsync("MasterDuel/Timeline/DuelDice");
StartCoroutine(ie);
while (ie.MoveNext())
yield return null;
......@@ -695,7 +695,7 @@ namespace MDPro3.Servant
}
if (opDice == null)
{
var ie = ABLoader.LoadFromFolderAsync("MasterDuel/TimeLine/DuelDiceEn");
var ie = ABLoader.LoadFromFolderAsync("MasterDuel/Timeline/DuelDiceEn");
StartCoroutine(ie);
while (ie.MoveNext())
yield return null;
......@@ -862,7 +862,7 @@ namespace MDPro3.Servant
#endregion
#region 场地背景
enumerator = ABLoader.LoadFromFileAsync("MasterDuel/BG/celestialsphere_c001");
enumerator = ABLoader.LoadFromFileAsync("MasterDuel/BG/CelestialSphere_c001");
while (enumerator.MoveNext())
yield return null;
var matBack = enumerator.Current;
......@@ -2871,7 +2871,7 @@ namespace MDPro3.Servant
break;
case GameMessage.Set:
ES_hint = StringHelper.GetUnsafe(1601);//盖放了卡片
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/summon/fxp_som_mgctrpfld_001", true);
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/Summon/fxp_som_mgctrpfld_001", true);
effect.transform.position = lastMoveCard.model.transform.position;
Destroy(effect, 3f);
AudioManager.PlaySE("SE_LAND_MT_SET");
......@@ -2912,7 +2912,7 @@ namespace MDPro3.Servant
mySummonCount++;
else
opSummonCount++;
effect = ABLoader.LoadFromFile("MasterDuel/Effects/summon/fxp_somldg/hand/fxp_somldg_hand_001", true);
effect = ABLoader.LoadFromFile("MasterDuel/Effects/Summon/fxp_somldg/Hand/fxp_somldg_hand_001", true);
effect.transform.localPosition = GameCard.GetCardPosition(gps);
if ((gps.position & (uint)CardPosition.Attack) > 0)
Destroy(effect.transform.GetChild(1).gameObject);
......@@ -2931,7 +2931,7 @@ namespace MDPro3.Servant
ES_hint = InterString.Get("「[?]」通常召唤宣言时", card.GetData().Name);
if (card.GetData().Level > 6)
{
effect = ABLoader.LoadFromFolder("MasterDuel/Effects/summon/fxp_somldg/Advance_s2", "Advance_s2", true);
effect = ABLoader.LoadFromFolder("MasterDuel/Effects/Summon/fxp_somldg/Advance_s2", "Advance_s2", true);
effect.transform.localPosition = GameCard.GetCardPosition(gps);
Destroy(effect, 10);
se = "SE_LAND_ADVANCE_HIGH";
......@@ -2939,7 +2939,7 @@ namespace MDPro3.Servant
}
else if (card.GetData().Level > 4)
{
effect = ABLoader.LoadFromFolder("MasterDuel/Effects/summon/fxp_somldg/Advance_s1", "Advance_s1", true);
effect = ABLoader.LoadFromFolder("MasterDuel/Effects/Summon/fxp_somldg/Advance_s1", "Advance_s1", true);
effect.transform.localPosition = GameCard.GetCardPosition(gps);
Destroy(effect, 10);
se = "SE_LAND_ADVANCE_MIDDLE";
......@@ -2969,7 +2969,7 @@ namespace MDPro3.Servant
if (card.GetData().HasType(CardType.Token))
goto TokenPasss;
effect = ABLoader.LoadFromFile("MasterDuel/Effects/summon/fxp_somldg/hand/fxp_somldg_hand_001", true);
effect = ABLoader.LoadFromFile("MasterDuel/Effects/Summon/fxp_somldg/Hand/fxp_somldg_hand_001", true);
effect.transform.localPosition = GameCard.GetCardPosition(gps);
if ((gps.position & (uint)CardPosition.Attack) > 0)
Destroy(effect.transform.GetChild(1).gameObject);
......@@ -2988,7 +2988,7 @@ namespace MDPro3.Servant
//&& (card.GetData().Reason & (uint)CardReason.Link) > 0)
&& card.GetData().HasType(CardType.Link))
{
tail = "MasterDuel/Effects/summon/fxp_somldg/Link_s1";
tail = "MasterDuel/Effects/Summon/fxp_somldg/Link_s1";
se = "SE_LAND_LINK_MIDDLE";
GetUI<OcgCoreUI>().DuelLog.lastSpSummonReason = (uint)CardReason.Link;
}
......@@ -2996,7 +2996,7 @@ namespace MDPro3.Servant
//&& (card.GetData().Reason & (uint)CardReason.Fusion) > 0)
&& card.GetData().HasType(CardType.Fusion))
{
tail = "MasterDuel/Effects/summon/fxp_somldg/Fusion_s1";
tail = "MasterDuel/Effects/Summon/fxp_somldg/Fusion_s1";
se = "SE_LAND_FUSION_MIDDLE";
GetUI<OcgCoreUI>().DuelLog.lastSpSummonReason = (uint)CardReason.Fusion;
}
......@@ -3004,7 +3004,7 @@ namespace MDPro3.Servant
//&& (card.GetData().Reason & (uint)CardReason.Synchro) > 0)
&& card.GetData().HasType(CardType.Synchro))
{
tail = "MasterDuel/Effects/summon/fxp_somldg/Synchro_s1";
tail = "MasterDuel/Effects/Summon/fxp_somldg/Synchro_s1";
se = "SE_LAND_SYNCHRO_MIDDLE";
GetUI<OcgCoreUI>().DuelLog.lastSpSummonReason = (uint)CardReason.Synchro;
}
......@@ -3012,7 +3012,7 @@ namespace MDPro3.Servant
//&& (card.GetData().Reason & (uint)CardReason.Xyz) > 0)
&& card.GetData().HasType(CardType.Xyz))
{
tail = "MasterDuel/Effects/summon/fxp_somldg/Xyz_s1";
tail = "MasterDuel/Effects/Summon/fxp_somldg/Xyz_s1";
se = "SE_LAND_XYZ_MIDDLE";
GetUI<OcgCoreUI>().DuelLog.lastSpSummonReason = (uint)CardReason.Xyz;
}
......@@ -3020,19 +3020,19 @@ namespace MDPro3.Servant
//&& (card.GetData().Reason & (uint)CardReason.Ritual) > 0)
&& card.GetData().HasType(CardType.Ritual))
{
tail = "MasterDuel/Effects/summon/fxp_somldg/Ritual_s1";
tail = "MasterDuel/Effects/Summon/fxp_somldg/Ritual_s1";
se = "SE_LAND_RITUAL_MIDDLE";
GetUI<OcgCoreUI>().DuelLog.lastSpSummonReason = (uint)CardReason.Ritual;
}
else if (GetUI<OcgCoreUI>().DuelLog.psum)
{
tail = "MasterDuel/Effects/summon/fxp_somldg/Pendulum_s1";
tail = "MasterDuel/Effects/Summon/fxp_somldg/Pendulum_s1";
se = "SE_LAND_PENDULUM_MIDDLE";
GetUI<OcgCoreUI>().DuelLog.lastSpSummonReason = (uint)CardReason.Pendulum;
}
else
{
tail = "MasterDuel/Effects/summon/fxp_somldg/Special_s1";
tail = "MasterDuel/Effects/Summon/fxp_somldg/Special_s1";
se = "SE_LAND_ADVANCE_MIDDLE";
GetUI<OcgCoreUI>().DuelLog.lastSpSummonReason = 0;
}
......@@ -3892,63 +3892,63 @@ namespace MDPro3.Servant
GameObject tailObj = null;
GameObject hitObj = null;
string hit = "";
tail = "";
string sound1 = "";
string sound2 = "";
string hit = string.Empty;
tail = string.Empty;
string sound1 = string.Empty;
string sound2 = string.Empty;
if ((attackCard.GetData().Attribute & (uint)CardAttribute.Dark) > 0)
{
tail = "MasterDuel/Effects/attack/fxp_atkdak_s2_001";
hit = "MasterDuel/Effects/hit/fxp_hitdak_s2_001";
tail = "MasterDuel/Effects/Attack/fxp_atkdak_S2_001";
hit = "MasterDuel/Effects/Hit/fxp_hitdak_S2_001";
sound1 = "SE_ATTACK_A_DARK_SPECIAL_01";
sound2 = "SE_ATTACK_A_DARK_SPECIAL_02";
}
else if ((attackCard.GetData().Attribute & (uint)CardAttribute.Earth) > 0)
{
tail = "MasterDuel/Effects/attack/fxp_atkeah_s2_001";
hit = "MasterDuel/Effects/hit/fxp_hiteah_s2_001";
tail = "MasterDuel/Effects/Attack/fxp_atkeah_S2_001";
hit = "MasterDuel/Effects/Hit/fxp_hiteah_S2_001";
sound1 = "SE_ATTACK_A_EARTH_SPECIAL_01";
sound2 = "SE_ATTACK_A_EARTH_SPECIAL_02";
}
else if ((attackCard.GetData().Attribute & (uint)CardAttribute.Fire) > 0)
{
tail = "MasterDuel/Effects/attack/fxp_atkfie_s2_001";
hit = "MasterDuel/Effects/hit/fxp_hitfie_s2_001";
tail = "MasterDuel/Effects/Attack/fxp_atkfie_S2_001";
hit = "MasterDuel/Effects/Hit/fxp_hitfie_S2_001";
sound1 = "SE_ATTACK_A_FIRE_SPECIAL_01";
sound2 = "SE_ATTACK_A_FIRE_SPECIAL_02";
}
else if ((attackCard.GetData().Attribute & (uint)CardAttribute.Light) > 0)
{
tail = "MasterDuel/Effects/attack/fxp_atklit_s2_001";
hit = "MasterDuel/Effects/hit/fxp_hitlit_s2_001";
tail = "MasterDuel/Effects/Attack/fxp_atklit_S2_001";
hit = "MasterDuel/Effects/Hit/fxp_hitlit_S2_001";
sound1 = "SE_ATTACK_A_LIGHT_SPECIAL_01";
sound2 = "SE_ATTACK_A_LIGHT_SPECIAL_02";
}
else if ((attackCard.GetData().Attribute & (uint)CardAttribute.Water) > 0)
{
tail = "MasterDuel/Effects/attack/fxp_atkwtr_s2_001";
hit = "MasterDuel/Effects/hit/fxp_hitwtr_s2_001";
tail = "MasterDuel/Effects/Attack/fxp_atkwtr_S2_001";
hit = "MasterDuel/Effects/Hit/fxp_hitwtr_S2_001";
sound1 = "SE_ATTACK_A_WIND_SPECIAL_01";
sound2 = "SE_ATTACK_A_WIND_SPECIAL_02";
}
else if ((attackCard.GetData().Attribute & (uint)CardAttribute.Wind) > 0)
{
tail = "MasterDuel/Effects/attack/fxp_atkwid_s2_001";
hit = "MasterDuel/Effects/hit/fxp_hitwid_s2_001";
tail = "MasterDuel/Effects/Attack/fxp_atkwid_S2_001";
hit = "MasterDuel/Effects/Hit/fxp_hitwid_S2_001";
sound1 = "SE_ATTACK_A_DARK_SPECIAL_01";
sound2 = "SE_ATTACK_A_DARK_SPECIAL_02";
}
else// if ((attackCard.GetData().Attribute & (uint)CardAttribute.Divine) > 0)
{
tail = "MasterDuel/Effects/attack/fxp_atkdve_s2_001";
hit = "MasterDuel/Effects/hit/fxp_hitdve_s2_001";
tail = "MasterDuel/Effects/Attack/fxp_atkdve_S2_001";
hit = "MasterDuel/Effects/Hit/fxp_hitdve_S2_001";
sound1 = "SE_ATTACK_A_DIVINE_SPECIAL_01";
sound2 = "SE_ATTACK_A_DIVINE_SPECIAL_02";
if (attackCard.GetData().Attack < 2000)
{
tail = tail.Replace("_s2_", "_s1_");
hit = hit.Replace("_s2_", "_s1_");
tail = tail.Replace("_S2_", "_S1_");
hit = hit.Replace("_S2_", "_S1_");
}
tailObj = ABLoader.LoadFromFolder(tail, Path.GetFileName(tail), true);
hitObj = ABLoader.LoadFromFolder(hit, Path.GetFileName(hit), true);
......@@ -3957,8 +3957,8 @@ namespace MDPro3.Servant
if (attackCard.GetData().Attack < 2000)
{
tail = tail.Replace("_s2_", "_s1_");
hit = hit.Replace("_s2_", "_s1_");
tail = tail.Replace("_S2_", "_S1_");
hit = hit.Replace("_S2_", "_S1_");
}
if (directAttack == 0)
......@@ -3967,13 +3967,13 @@ namespace MDPro3.Servant
if ((attackedCard.p.position & (uint)CardPosition.Defence) > 0)
if (attackedCard.GetData().Defense >= attackCard.GetData().Attack)
{
hit = "MasterDuel/Effects/hit/fxp_hit_guard_001";
hit = "MasterDuel/Effects/Hit/fxp_hit_guard_001";
sound2 = "SE_ATTACK_GUARD";
}
if ((attackedCard.p.position & (uint)CardPosition.Attack) > 0)
if (attackedCard.GetData().Attack > attackCard.GetData().Attack)
{
hit = "MasterDuel/Effects/hit/fxp_hit_guard_001";
hit = "MasterDuel/Effects/Hit/fxp_hit_guard_001";
sound2 = "SE_ATTACK_GUARD";
}
}
......@@ -3984,12 +3984,12 @@ namespace MDPro3.Servant
attackTransform.LookAt(dummy.transform);
if (directAttack == 1)
{
hit = "MasterDuel/Effects/hit/fxp_dithit_far_001";
hit = "MasterDuel/Effects/Hit/fxp_dithit_far_001";
sound2 = "SE_DIRECT_ATTACK_RIVAL";
}
else
{
hit = "MasterDuel/Effects/hit/fxp_dithit_near_001";
hit = "MasterDuel/Effects/Hit/fxp_dithit_near_001";
sound2 = "SE_DIRECT_ATTACK_PLAYER";
}
Destroy(dummy);
......@@ -4111,13 +4111,13 @@ namespace MDPro3.Servant
if (life0 <= 0)
{
hitObj = ABLoader.LoadFromFile("MasterDuel/Effects/hit/fxp_dithit_fin_near_001");
hitObj = ABLoader.LoadFromFile("MasterDuel/Effects/Hit/fxp_dithit_fin_near_001");
hitObj.transform.position = new Vector3(0, 15, -25);
Destroy(hitObj, 10);
}
if (life1 <= 0)
{
hitObj = ABLoader.LoadFromFile("MasterDuel/Effects/hit/fxp_dithit_fin_far_001");
hitObj = ABLoader.LoadFromFile("MasterDuel/Effects/Hit/fxp_dithit_fin_far_001");
hitObj.transform.position = new Vector3(0, 15, 25);
Destroy(hitObj, 10);
}
......@@ -4176,13 +4176,13 @@ namespace MDPro3.Servant
#endif
if (life0 <= 0)
{
hitObj = ABLoader.LoadFromFile("MasterDuel/Effects/hit/fxp_dithit_fin_near_001");
hitObj = ABLoader.LoadFromFile("MasterDuel/Effects/Hit/fxp_dithit_fin_near_001");
hitObj.transform.position = new Vector3(0, 15, -25);
Destroy(hitObj, 10);
}
if (life1 <= 0)
{
hitObj = ABLoader.LoadFromFile("MasterDuel/Effects/hit/fxp_dithit_fin_far_001");
hitObj = ABLoader.LoadFromFile("MasterDuel/Effects/Hit/fxp_dithit_fin_far_001");
hitObj.transform.position = new Vector3(0, 15, 25);
Destroy(hitObj, 10);
}
......@@ -4210,7 +4210,7 @@ namespace MDPro3.Servant
AudioManager.PlaySE("SE_COIN_THROW");
for (var i = 0; i < count; i++)
{
var coin = ABLoader.LoadFromFolder("MasterDuel/TimeLine/DuelCoinToss01", "DuelCoinToss", true);
var coin = ABLoader.LoadFromFolder("MasterDuel/Timeline/DuelCoinToss01", "DuelCoinToss", true);
var manager = coin.transform.GetChild(0).GetComponent<ElementObjectManager>();
manager.GetComponent<PlayableDirector>().Play();
Destroy(coin, 3f);
......@@ -4878,7 +4878,7 @@ namespace MDPro3.Servant
{
GetUI<OcgCoreUI>().CardDescription.Hide();
targetTime = 366;
GameObject pendulum = ABLoader.LoadFromFolder("MasterDuel/Timeline/summon/summonpendulum/summonpendulum01", "SummonPendulum", true);
GameObject pendulum = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonPendulum/SummonPendulum01", "SummonPendulum", true);
ElementObjectManager manager = null;
for (int j = 0; j < pendulum.transform.childCount; j++)
{
......@@ -4963,7 +4963,7 @@ namespace MDPro3.Servant
if (MasterRule >= 4)
{
var pendulumSet = ABLoader.LoadFromFolder("MasterDuel/Timeline/summon/summonpendulum/summonpendulumscaleset", "PendulumSet", true);
var pendulumSet = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonPendulum/SummonPendulumScaleSet", "PendulumSet", true);
pendulumSet.transform.SetParent(Program.instance.container_3D);
ElementObjectManager setManager = null;
for (int j = 0; j < pendulumSet.transform.childCount; j++)
......@@ -7290,7 +7290,7 @@ namespace MDPro3.Servant
if (card.p.controller == 0)
if (card.buttons.Count > 0)
{
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_active/fxp_hl_active_grave_001", true);
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_active/fxp_HL_active_grave_001", true);
effect.transform.SetParent(grave0Manager.GetElement<Transform>("GraveHighlightNear"), false);
Destroy(effect, 3f);
grave0Manager.GetElement<Animator>("GraveHighlightNear").SetBool("On", true);
......@@ -7302,7 +7302,7 @@ namespace MDPro3.Servant
if (card.p.controller == 0)
if (card.buttons.Count > 0)
{
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_active/fxp_hl_active_exclude_001", true);
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_active/fxp_HL_active_exclude_001", true);
effect.transform.SetParent(grave0Manager.GetElement<Transform>("ExcludeHighlightNear"), false);
Destroy(effect, 3f);
grave0Manager.GetElement<Animator>("ExcludeHighlightNear").SetBool("On", true);
......@@ -7314,7 +7314,7 @@ namespace MDPro3.Servant
if (card.p.controller == 0)
if (card.buttons.Count > 0)
{
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_active/fxp_hl_active_exdeck_001", true);
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_active/fxp_HL_active_Exdeck_001", true);
effect.transform.SetParent(myExtra.transform, false);
effect.transform.position = Tools.GetDeckModelTopPosition(myExtra);
foreach (var place in places)
......@@ -7328,7 +7328,7 @@ namespace MDPro3.Servant
if (card.p.controller == 0)
if (card.buttons.Count > 0)
{
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/hitghlight/fxp_hl_active/fxp_hl_active_exdeck_001", true);
var effect = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_active/fxp_HL_active_Exdeck_001", true);
effect.transform.SetParent(myDeck.transform, false);
effect.transform.position = Tools.GetDeckModelTopPosition(myDeck);
foreach (var place in places)
......
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