Skip to content

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

version update

parent 0137e83e
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 11332 deletions
Assets/Addressables/Text/UpdateContent.txt
View file @ 10c2077b
......@@ -10,7 +10,6 @@ MDPro3 v1.2.4更新：
⑥场地配件：吸食精气的骨塔、七精解门；
⑦伙伴台：最喜欢的树桩、军贯处“海栈”、
⑧伙伴：雪人吞噬者。
。
2.新MonsterCutin动画：
极炎之剑士、
破坏龙 甘多拉·禁忌、
......
Assets/Fonts/Brock.asset
View file @ 10c2077b
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Fonts/RenderFontChineseSimplified.asset
View file @ 10c2077b
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Fonts/Ro_GSan_Serif_Std.asset
View file @ 10c2077b
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset
View file @ 10c2077b
......@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510
- rid: 5650211206403981511
- rid: 5650211206403981512
- rid: 6674441460029063292
- rid: 6674441471399559242
- rid: 5650211206403981514
- rid: 5650211206403981515
- rid: 6674441460029063293
- rid: 6674441460029063294
- rid: 6674441471399559243
- rid: 6674441471399559244
- rid: 5650211206403981518
- rid: 6674441460029063295
- rid: 6674441471399559245
- rid: 5650211206403981520
- rid: 6674441460029063296
- rid: 6674441471399559246
- rid: 5650211206403981522
- rid: 6674441460029063297
- rid: 6674441460029063298
- rid: 6674441460029063299
- rid: 6674441460029063300
- rid: 6674441460029063301
- rid: 6674441471399559247
- rid: 6674441471399559248
- rid: 6674441471399559249
- rid: 6674441471399559250
- rid: 6674441471399559251
- rid: 5650211206403981528
- rid: 5650211206403981529
- rid: 5650211206403981530
......@@ -160,7 +160,7 @@ MonoBehaviour:
m_version: 0
m_EnableCompilationCaching: 1
m_EnableValidityChecks: 1
- rid: 6674441460029063292
- rid: 6674441471399559242
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
......@@ -176,14 +176,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: 6674441460029063293
- rid: 6674441471399559243
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: 6674441460029063294
- rid: 6674441471399559244
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
......@@ -191,7 +191,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: 6674441460029063295
- rid: 6674441471399559245
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
......@@ -203,7 +203,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: 6674441460029063296
- rid: 6674441471399559246
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
......@@ -216,7 +216,7 @@ 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: 6674441460029063297
- rid: 6674441471399559247
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -229,12 +229,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3}
renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3}
- rid: 6674441460029063298
- rid: 6674441471399559248
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 6674441460029063299
- rid: 6674441471399559249
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -244,14 +244,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 6674441460029063300
- rid: 6674441471399559250
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 6674441460029063301
- rid: 6674441471399559251
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......
Assets/Scripts/MDPro3/Duel/TcpHelper.cs
View file @ 10c2077b
......@@ -49,18 +49,25 @@ namespace MDPro3
linkThread = new Thread(() =>
{
bool joined = false;
while (YgoServer.ServerRunning() && !joined)
if (local)
{
try
{
joined = Join(ipString, name, portString, pswString, doWhenSuccess);
}
catch (Exception ex)
while (YgoServer.ServerRunning() && !joined)
{
Debug.LogException(ex);
joined = false;
try
{
joined = Join(ipString, name, portString, pswString, doWhenSuccess);
}
catch (Exception ex)
{
Debug.LogException(ex);
joined = false;
}
Thread.Sleep(100);
}
Thread.Sleep(100);
}
else
{
Join(ipString, name, portString, pswString, doWhenSuccess);
}
canJoin = true;
});
......
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