Skip to content

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

bug fix

parent 6e6331ec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 552 additions and 26837 deletions
Assets/AddressableAssetsData/link.xml 0 → 100644
View file @ e4ea0a0c
This diff is collapsed.
Assets/AddressableAssetsData/link.xml.meta 0 → 100644
View file @ e4ea0a0c
fileFormatVersion: 2
guid: 445505187cb1fbe4d8b44f03a02cce9f
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Fonts/Brock.asset
View file @ e4ea0a0c
This diff is collapsed.
Assets/Fonts/FZZYJW.asset
View file @ e4ea0a0c
This diff is collapsed.
Assets/Fonts/Ro_GSan_Serif_Std.asset
View file @ e4ea0a0c
This diff is collapsed.
Assets/Fonts/SourceHanSansSC-Bold.asset
View file @ e4ea0a0c
This diff is collapsed.
Assets/Fonts/SourceHanSansSC-Medium.asset
View file @ e4ea0a0c
This diff is collapsed.
Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset
View file @ e4ea0a0c
......@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510
- rid: 5650211206403981511
- rid: 5650211206403981512
- rid: 911170910220714125
- rid: 911170927773352057
- rid: 5650211206403981514
- rid: 5650211206403981515
- rid: 911170910220714126
- rid: 911170910220714127
- rid: 911170927773352058
- rid: 911170927773352059
- rid: 5650211206403981518
- rid: 911170910220714128
- rid: 911170927773352060
- rid: 5650211206403981520
- rid: 911170910220714129
- rid: 911170910220714130
- rid: 911170910220714131
- rid: 911170910220714132
- rid: 911170910220714133
- rid: 911170910220714134
- rid: 911170910220714135
- rid: 911170927773352061
- rid: 911170927773352062
- rid: 911170927773352063
- rid: 911170927773352064
- rid: 911170927773352065
- rid: 911170927773352066
- rid: 911170927773352067
- rid: 5650211206403981528
- rid: 5650211206403981529
- rid: 5650211206403981530
......@@ -96,7 +96,7 @@ MonoBehaviour:
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 911170910220714125
- rid: 911170927773352057
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
......@@ -111,14 +111,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 911170910220714126
- rid: 911170927773352058
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 911170910220714127
- rid: 911170927773352059
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
......@@ -126,7 +126,7 @@ MonoBehaviour:
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 911170910220714128
- rid: 911170927773352060
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
......@@ -138,7 +138,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 911170910220714129
- rid: 911170927773352061
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
......@@ -151,13 +151,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 911170910220714130
- rid: 911170927773352062
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 911170910220714131
- rid: 911170927773352063
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -170,12 +170,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 911170910220714132
- rid: 911170927773352064
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 911170910220714133
- rid: 911170927773352065
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -185,14 +185,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 911170910220714134
- rid: 911170927773352066
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 911170910220714135
- rid: 911170927773352067
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......
Assets/Scenes/ABRobber.unity
View file @ e4ea0a0c
......@@ -536,8 +536,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
text: {fileID: 1398959084}
input: {fileID: 1775272994}
mode_Window: 1
mode_Android: 0
mode_Window: 0
mode_Android: 1
mode_IOS: 0
fullCopy: 0
--- !u!114 &916768208
......
Assets/Scripts/MDPro3/Servant/CutinViewer.cs
View file @ e4ea0a0c
using Cysharp.Threading.Tasks;
using DG.Tweening;
using MDPro3.Duel.YGOSharp;
using MDPro3.UI;
using MDPro3.UI.ServantUI;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using TMPro;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.Playables;
using UnityEngine.UI;
using YgomSystem.ElementSystem;
using YgomSystem.YGomTMPro;
using MDPro3.Duel.YGOSharp;
using MDPro3.UI;
using UnityEngine.EventSystems;
using MDPro3.UI.ServantUI;
using Cysharp.Threading.Tasks;
using System.Threading;
namespace MDPro3.Servant
{
......@@ -227,61 +228,47 @@ namespace MDPro3.Servant
GameObject cutin = null;
bool diy = false;
if (codes.Contains(code))
cutin = await ABLoader.LoadFromFolderAsync<PlayableDirector>("MonsterCutin/" + code, false, false);
cutin = await ABLoader.LoadFromFolderAsync<PlayableDirector>("MonsterCutin/" + code, false, true);
else
{
cutin = await ABLoader.LoadFromFileAsync("MonsterCutin2/" + code, false, false);
cutin = await ABLoader.LoadFromFileAsync("MonsterCutin2/" + code, false, true);
diy = true;
}
cutin.transform.SetParent(Program.instance.container_2D, false);
if (!diy)
{
cutin.transform.localPosition = Vector3.zero;
cutin.transform.GetComponent<PlayableDirector>().time = 0;
}
//BackEffects
string backPath = "MasterDuel/Timeline/Summon/SummonMonster/04BackEff/";
string backPath;
if ((card.Attribute & (uint)CardAttribute.Dark) > 0) // 125
backPath += "SummonMonster_Bgdak_S2";
backPath = "SummonMonster_Bgdak_S2";
else if ((card.Attribute & (uint)CardAttribute.Light) > 0) // 100
backPath += "SummonMonster_Bglit_S2";
backPath = "SummonMonster_Bglit_S2";
else if ((card.Attribute & (uint)CardAttribute.Earth) > 0) // 56
backPath += "SummonMonster_Bgeah_S2";
backPath = "SummonMonster_Bgeah_S2";
else if ((card.Attribute & (uint)CardAttribute.Water) > 0) // 35
backPath += "SummonMonster_Bgwtr_S2";
backPath = "SummonMonster_Bgwtr_S2";
else if ((card.Attribute & (uint)CardAttribute.Fire) > 0) // 31
backPath += "SummonMonster_Bgfie_S2";
backPath = "SummonMonster_Bgfie_S2";
else if ((card.Attribute & (uint)CardAttribute.Wind) > 0) // 25
backPath += "SummonMonster_Bgwid_S2";
backPath = "SummonMonster_Bgwid_S2";
else // 4
backPath += "SummonMonster_Bgdve_S2";
GameObject back = await ABLoader.LoadFromFileAsync(backPath, true, false);
backPath = "SummonMonster_Bgdve_S2";
GameObject back = ABLoader.LoadMasterDuelGameObject(backPath);
back.transform.SetParent(Program.instance.container_2D, false);
//Name Bar
GameObject nameBar;
if (controller == 0)
nameBar = await ABLoader.LoadFromFileAsync("MasterDuel/Timeline/Summon/SummonMonster/01Text/SummonMonster_Name_near", true, false);
nameBar = ABLoader.LoadMasterDuelGameObject("SummonMonster_Name_near");
else
nameBar = await ABLoader.LoadFromFileAsync("MasterDuel/Timeline/Summon/SummonMonster/01Text/SummonMonster_Name_far", true, false);
//front Effect
var frontEffect = await ABLoader.LoadFromFileAsync("MasterDuel/Timeline/Summon/SummonMonster/02FrontEff/SummonMonster_Thunder_power", true, false);
//Instantiate
if (Program.instance.ocgcore.showing)
AudioManager.PlayBgmKeyCard();
cutin = Instantiate(cutin);
cutin.transform.SetParent(Program.instance.container_2D, false);
if (!diy)
{
cutin.transform.localPosition = Vector3.zero;
cutin.transform.GetComponent<PlayableDirector>().time = 0;
}
back = Instantiate(back);
back.transform.SetParent(Program.instance.container_2D, false);
nameBar = Instantiate(nameBar);
nameBar = ABLoader.LoadMasterDuelGameObject("SummonMonster_Name_far");
nameBar.transform.SetParent(Program.instance.container_2D, false);
var manager = nameBar.GetComponent<ElementObjectManager>();
var tmp = manager.GetElement<ExtendedTextMeshPro>("Monster_Name_TMP");
tmp.font = Program.instance.ui_.tmpFont;
var tmp = manager.GetElement<TextMeshPro>("Monster_Name_TMP");
tmp.text = card.Name;
var para = "ATK " + card.GetAttackString();
if (!card.HasType(CardType.Link))
......@@ -355,9 +342,13 @@ namespace MDPro3.Servant
Destroy(subManager.GetElement("Icon" + i));
manager.GetElement<TextMesh>("Monster_Para").text = para;
frontEffect = Instantiate(frontEffect);
//front Effect
//var frontEffect = ABLoader.LoadMasterDuelGameObject(card.IsHighLevel() ? "SummonMonster_Thunder_power" : "SummonMonster_Thunder_normal");
var frontEffect = ABLoader.LoadMasterDuelGameObject("SummonMonster_Thunder_power");
frontEffect.transform.SetParent(Program.instance.container_2D, false);
if (Program.instance.ocgcore.showing)
AudioManager.PlayBgmKeyCard();
await UniTask.WaitForSeconds(CUTIN_PLAY_TIME).ContinueWith(() =>
{
......
ProjectSettings/ProjectSettings.asset
View file @ e4ea0a0c
......@@ -551,7 +551,7 @@ PlayerSettings:
m_APIs: 0b000000
m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport
m_APIs: 020000000b000000
m_APIs: 02000000
m_Automatic: 0
- m_BuildTarget: LinuxStandaloneSupport
m_APIs: 1500000011000000
......
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