Commit 32516fb5 authored by SherryChaos's avatar SherryChaos

version update

parent 26df2174
...@@ -17,6 +17,7 @@ ExportedObj/ ...@@ -17,6 +17,7 @@ ExportedObj/
*.booproj *.booproj
*.svd *.svd
*.pdb *.pdb
/.utmp/
# Unity3D generated files # Unity3D generated files
[Ll]ibrary/ [Ll]ibrary/
......
This diff is collapsed.
fileFormatVersion: 2
guid: 46926d080847e63419c875a38c3714bd
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
MDPro3 v1.1.0更新: MDPro3 v1.1.0更新:
0.本次更新安卓端需要卸载老版本才能进行安装。 0.本次更新安卓端需要卸载老版本才能进行安装。安卓端的首选图形API改为Vulkan。
1.新卡片效果动画:闪刀启动-交闪、大风暴。 1.新卡片效果动画:闪刀启动-交闪、大风暴。
2.在残局模式中添加了所有有效果动画的卡的残局。 2.在残局模式中添加了所有有效果动画的卡的残局。
3.新登场动画:自然兽、转生炎兽 烈火凤凰、荷鲁斯之黑炎神、S:P小夜、魔轰神 利威坦、冥骸合龙 莫忘冥地王龙。 3.新登场动画:自然兽、转生炎兽 烈火凤凰、荷鲁斯之黑炎神、S:P小夜、魔轰神 利威坦、冥骸合龙 莫忘冥地王龙。
4.新道具: 4.新道具:
伙伴:大植然菜菊;
卡盒:王之棺;
决斗场地及其配件:辉石洞窟; 决斗场地及其配件:辉石洞窟;
场地配件:魔力之棘;
伙伴:大植然菜菊;
头像框:狮面草的鬃毛、洗脑; 头像框:狮面草的鬃毛、洗脑;
头像:冥铭途·楼中怪、大植然狮面草、电子龙、邪恶★双子 姬丝吉尔・璃拉、白色宿命的埃尔德里希尔。 头像:冥铭途·楼中怪、大植然狮面草、电子龙、邪恶★双子 姬丝吉尔・璃拉、白色宿命的埃尔德里希尔;
卡套:荷鲁斯的荣光-伊姆赛特、暴走召唤师 阿莱斯特、大植然狮面草。
卡盒:王之棺;
5.现在决斗日志在未被拖动的情况下会自动向下翻滚。 5.现在决斗日志在未被拖动的情况下会自动向下翻滚。
6.修复部分情况下错误触发灵摆召唤特效的错误。 6.修复部分情况下错误触发灵摆召唤特效的错误。
7.修复英语和西班牙语在卡片详情框中的效果文本单词被分割换行的错误。 7.修复英语和西班牙语在卡片详情框中的效果文本单词被分割换行的错误。
MDPro3 v1.0.9.1更新: MDPro3 v1.0.9.1更新:
1.添加决斗日志功能。 1.添加决斗日志功能。
2.添加背景切换功能。 2.添加背景切换功能。
......
...@@ -36,21 +36,21 @@ MonoBehaviour: ...@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510 - rid: 5650211206403981510
- rid: 5650211206403981511 - rid: 5650211206403981511
- rid: 5650211206403981512 - rid: 5650211206403981512
- rid: 5650211361392427113 - rid: 5650211397738430529
- rid: 5650211206403981514 - rid: 5650211206403981514
- rid: 5650211206403981515 - rid: 5650211206403981515
- rid: 5650211361392427114 - rid: 5650211397738430530
- rid: 5650211361392427115 - rid: 5650211397738430531
- rid: 5650211206403981518 - rid: 5650211206403981518
- rid: 5650211361392427116 - rid: 5650211397738430532
- rid: 5650211206403981520 - rid: 5650211206403981520
- rid: 5650211361392427117 - rid: 5650211397738430533
- rid: 5650211206403981522 - rid: 5650211206403981522
- rid: 5650211361392427118 - rid: 5650211397738430534
- rid: 5650211361392427119 - rid: 5650211397738430535
- rid: 5650211361392427120 - rid: 5650211397738430536
- rid: 5650211361392427121 - rid: 5650211397738430537
- rid: 5650211361392427122 - rid: 5650211397738430538
- rid: 5650211206403981528 - rid: 5650211206403981528
- rid: 5650211206403981529 - rid: 5650211206403981529
- rid: 5650211206403981530 - rid: 5650211206403981530
...@@ -159,7 +159,7 @@ MonoBehaviour: ...@@ -159,7 +159,7 @@ MonoBehaviour:
m_version: 0 m_version: 0
m_EnableCompilationCaching: 1 m_EnableCompilationCaching: 1
m_EnableValidityChecks: 1 m_EnableValidityChecks: 1
- rid: 5650211361392427113 - rid: 5650211397738430529
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
...@@ -174,14 +174,14 @@ MonoBehaviour: ...@@ -174,14 +174,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 5650211361392427114 - rid: 5650211397738430530
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
m_StripUnusedPostProcessingVariants: 0 m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1 m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1 m_StripScreenCoordOverrideVariants: 1
- rid: 5650211361392427115 - rid: 5650211397738430531
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
...@@ -189,7 +189,7 @@ MonoBehaviour: ...@@ -189,7 +189,7 @@ MonoBehaviour:
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 5650211361392427116 - rid: 5650211397738430532
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
...@@ -201,7 +201,7 @@ MonoBehaviour: ...@@ -201,7 +201,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 5650211361392427117 - rid: 5650211397738430533
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data: data:
m_Version: 0 m_Version: 0
...@@ -214,7 +214,7 @@ MonoBehaviour: ...@@ -214,7 +214,7 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 5650211361392427118 - rid: 5650211397738430534
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
...@@ -225,12 +225,12 @@ MonoBehaviour: ...@@ -225,12 +225,12 @@ MonoBehaviour:
traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3} traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3}
skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3} skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3}
skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3} skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
- rid: 5650211361392427119 - rid: 5650211397738430535
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0 m_ProbeVolumeDisableStreamingAssets: 0
- rid: 5650211361392427120 - rid: 5650211397738430536
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
...@@ -240,14 +240,14 @@ MonoBehaviour: ...@@ -240,14 +240,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 5650211361392427121 - rid: 5650211397738430537
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_version: 0 m_version: 0
m_IncludeReferencedInScenes: 0 m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0 m_IncludeAssetsByLabel: 0
m_LabelToInclude: m_LabelToInclude:
- rid: 5650211361392427122 - rid: 5650211397738430538
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
......
...@@ -2172,6 +2172,13 @@ MonoBehaviour: ...@@ -2172,6 +2172,13 @@ MonoBehaviour:
functional: 0 functional: 0
secondFace: 0 secondFace: 0
diy: 0 diy: 0
- id: 1070080
m_name:
m_description:
path:
functional: 0
secondFace: 0
diy: 0
- id: 1070085 - id: 1070085
m_name: m_name:
m_description: m_description:
...@@ -2200,6 +2207,13 @@ MonoBehaviour: ...@@ -2200,6 +2207,13 @@ MonoBehaviour:
functional: 0 functional: 0
secondFace: 0 secondFace: 0
diy: 0 diy: 0
- id: 1070090
m_name:
m_description:
path:
functional: 0
secondFace: 0
diy: 0
- id: 1071001 - id: 1071001
m_name: m_name:
m_description: m_description:
...@@ -2389,6 +2403,13 @@ MonoBehaviour: ...@@ -2389,6 +2403,13 @@ MonoBehaviour:
functional: 0 functional: 0
secondFace: 0 secondFace: 0
diy: 0 diy: 0
- id: 1071028
m_name:
m_description:
path:
functional: 0
secondFace: 0
diy: 0
- id: 1072001 - id: 1072001
m_name: m_name:
m_description: m_description:
......
...@@ -3356,7 +3356,11 @@ namespace MDPro3 ...@@ -3356,7 +3356,11 @@ namespace MDPro3
code = card.GetData().Alias > 0 ? card.GetData().Alias : card.GetData().Id; code = card.GetData().Alias > 0 ? card.GetData().Alias : card.GetData().Id;
if (card.GetData().Id == 83764719)//死者苏生 异画 if (card.GetData().Id == 83764719)//死者苏生 异画
code = 83764719; code = 83764719;
if (Directory.Exists(Program.root + "MasterDuel/Card/" + code.ToString())) var targetFolder = Program.root + "MasterDuel/Card/" + code.ToString();
#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
targetFolder = Path.Combine(Application.dataPath, targetFolder);
#endif
if (Directory.Exists(targetFolder))
{ {
effect = ABLoader.LoadFromFolder("MasterDuel/Card/" + code.ToString(), "CardEffect" + code.ToString(), true); effect = ABLoader.LoadFromFolder("MasterDuel/Card/" + code.ToString(), "CardEffect" + code.ToString(), true);
allGameObjects.Add(effect); allGameObjects.Add(effect);
...@@ -5883,8 +5887,7 @@ namespace MDPro3 ...@@ -5883,8 +5887,7 @@ namespace MDPro3
//newWhite.transform.SetParent(child.transform, false); //newWhite.transform.SetParent(child.transform, false);
//newWhite.transform.localScale = Vector3.one; //newWhite.transform.localScale = Vector3.one;
//newWhite.GetComponent<SpriteRenderer>().color = Color.clear; //newWhite.GetComponent<SpriteRenderer>().color = Color.clear;
child.gameObject.SetActive(false);
//child.gameObject.SetActive(false);
} }
StartCoroutine(Program.I().texture_.LoadDummyCard(mner.GetElement<ElementObjectManager>("DummyCard01"), code[0], true)); StartCoroutine(Program.I().texture_.LoadDummyCard(mner.GetElement<ElementObjectManager>("DummyCard01"), code[0], true));
mner.GetElement<ElementObjectManager>("DummyCard01").GetElement<Renderer>("DummyCardModel_front").material.renderQueue = 4000; mner.GetElement<ElementObjectManager>("DummyCard01").GetElement<Renderer>("DummyCardModel_front").material.renderQueue = 4000;
......
...@@ -548,3 +548,4 @@ Off->Off ...@@ -548,3 +548,4 @@ Off->Off
当方英雄->통빵의 영웅 当方英雄->통빵의 영웅
Shop->Shop Shop->Shop
ClassicRed->ClassicRed
...@@ -553,3 +553,4 @@ Off->Off ...@@ -553,3 +553,4 @@ Off->Off
Shop->Shop Shop->Shop
正在初始化->正在初始化 正在初始化->正在初始化
正在读取数据->正在读取数据 正在读取数据->正在读取数据
ClassicRed->ClassicRed
...@@ -551,7 +551,7 @@ PlayerSettings: ...@@ -551,7 +551,7 @@ PlayerSettings:
m_APIs: 0b000000 m_APIs: 0b000000
m_Automatic: 1 m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport - m_BuildTarget: WindowsStandaloneSupport
m_APIs: 1500000002000000 m_APIs: 0200000015000000
m_Automatic: 0 m_Automatic: 0
m_BuildTargetVRSettings: m_BuildTargetVRSettings:
- m_BuildTarget: Standalone - m_BuildTarget: Standalone
......
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