Commit d7bfddb0 authored by SherryChaos's avatar SherryChaos

0 cannot be used as a divisor

parent e7dcd448
MDPro3 v1.2.3.1更新:
1.修复[v1.2.3]版本在帧数设置为0后,游戏崩溃的错误。
2.修复BO3观战第二场时,场地背景不刷新的错误。
MDPro3 v1.2.3更新: MDPro3 v1.2.3更新:
1.新道具: 1.新道具:
①壁纸:灿幻开花; ①壁纸:灿幻开花;
......
This diff is collapsed.
...@@ -36,21 +36,21 @@ MonoBehaviour: ...@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510 - rid: 5650211206403981510
- rid: 5650211206403981511 - rid: 5650211206403981511
- rid: 5650211206403981512 - rid: 5650211206403981512
- rid: 5212140543189975128 - rid: 5212140609184464998
- rid: 5650211206403981514 - rid: 5650211206403981514
- rid: 5650211206403981515 - rid: 5650211206403981515
- rid: 5212140543189975129 - rid: 5212140609184464999
- rid: 5212140543189975130 - rid: 5212140609184465000
- rid: 5650211206403981518 - rid: 5650211206403981518
- rid: 5212140543189975131 - rid: 5212140609184465001
- rid: 5650211206403981520 - rid: 5650211206403981520
- rid: 5212140543189975132 - rid: 5212140609184465002
- rid: 5650211206403981522 - rid: 5650211206403981522
- rid: 5212140543189975133 - rid: 5212140609184465003
- rid: 5212140543189975134 - rid: 5212140609184465004
- rid: 5212140543189975135 - rid: 5212140609184465005
- rid: 5212140543189975136 - rid: 5212140609184465006
- rid: 5212140543189975137 - rid: 5212140609184465007
- rid: 5650211206403981528 - rid: 5650211206403981528
- rid: 5650211206403981529 - rid: 5650211206403981529
- rid: 5650211206403981530 - rid: 5650211206403981530
...@@ -90,7 +90,7 @@ MonoBehaviour: ...@@ -90,7 +90,7 @@ MonoBehaviour:
references: references:
version: 2 version: 2
RefIds: RefIds:
- rid: 5212140543189975128 - rid: 5212140609184464998
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
...@@ -106,14 +106,14 @@ MonoBehaviour: ...@@ -106,14 +106,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: 5212140543189975129 - rid: 5212140609184464999
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: 5212140543189975130 - rid: 5212140609184465000
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}
...@@ -121,7 +121,7 @@ MonoBehaviour: ...@@ -121,7 +121,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: 5212140543189975131 - rid: 5212140609184465001
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}
...@@ -133,7 +133,7 @@ MonoBehaviour: ...@@ -133,7 +133,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: 5212140543189975132 - rid: 5212140609184465002
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
...@@ -146,7 +146,7 @@ MonoBehaviour: ...@@ -146,7 +146,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: 5212140543189975133 - rid: 5212140609184465003
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
...@@ -159,12 +159,12 @@ MonoBehaviour: ...@@ -159,12 +159,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3} skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3} renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3}
renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3} renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3}
- rid: 5212140543189975134 - rid: 5212140609184465004
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: 5212140543189975135 - rid: 5212140609184465005
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
...@@ -174,14 +174,14 @@ MonoBehaviour: ...@@ -174,14 +174,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: 5212140543189975136 - rid: 5212140609184465006
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: 5212140543189975137 - rid: 5212140609184465007
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
......
...@@ -1094,6 +1094,19 @@ namespace MDPro3 ...@@ -1094,6 +1094,19 @@ namespace MDPro3
messagePass = true; messagePass = true;
if (condition == Condition.Duel && Config.GetBool("DuelAutoAcc", false)
|| condition == Condition.Watch && Config.GetBool("WatchAutoAcc", false)
|| condition == Condition.Replay && Config.GetBool("ReplayAutoAcc", false))
OnAcc();
}
private void BackgroundFieldInitialize()
{
field0.SetActive(false);
field1.SetActive(false);
field0.SetActive(true);
field1.SetActive(true);
field0Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1); field0Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1);
grave0Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1); grave0Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1);
//field0Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1Extra); //field0Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1Extra);
...@@ -1104,24 +1117,18 @@ namespace MDPro3 ...@@ -1104,24 +1117,18 @@ namespace MDPro3
//field1Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1Extra); //field1Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1Extra);
//grave1Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1Extra); //grave1Manager.PlayAnimatorTrigger(TriggerLabelDefine.StartToPhase1Extra);
bgPhase1 = 1; bgPhase1 = 1;
if(mate0 != null) if (mate0 != null)
{ {
mate0.gameObject.SetActive(true); mate0.gameObject.SetActive(true);
mate0.Play(Mate.MateAction.Entry); mate0.Play(Mate.MateAction.Entry);
} }
if(mate1 != null) if (mate1 != null)
{ {
mate1.gameObject.SetActive(true); mate1.gameObject.SetActive(true);
mate1.Play(Mate.MateAction.Entry); mate1.Play(Mate.MateAction.Entry);
} }
if (timerHandler != null) if (timerHandler != null)
timerHandler.DuelStart(); timerHandler.DuelStart();
if (condition == Condition.Duel && Config.GetBool("DuelAutoAcc", false)
|| condition == Condition.Watch && Config.GetBool("WatchAutoAcc", false)
|| condition == Condition.Replay && Config.GetBool("ReplayAutoAcc", false))
OnAcc();
DOTween.To(v => { }, 0, 0, UnityEngine.Random.Range(8, 16)).OnComplete(() => DOTween.To(v => { }, 0, 0, UnityEngine.Random.Range(8, 16)).OnComplete(() =>
{ {
mate0Random = true; mate0Random = true;
...@@ -1130,7 +1137,6 @@ namespace MDPro3 ...@@ -1130,7 +1137,6 @@ namespace MDPro3
{ {
mate1Random = true; mate1Random = true;
}); });
if (playableGuide0 != null & playableGuide1 != null) if (playableGuide0 != null & playableGuide1 != null)
{ {
playableGuide0.SetActive(true); playableGuide0.SetActive(true);
...@@ -3508,6 +3514,7 @@ namespace MDPro3 ...@@ -3508,6 +3514,7 @@ namespace MDPro3
break; break;
case GameMessage.Start: case GameMessage.Start:
CoreReset(); CoreReset();
BackgroundFieldInitialize();
md5Maker = 0; md5Maker = 0;
messagePass = false; messagePass = false;
playerType = r.ReadByte(); playerType = r.ReadByte();
......
...@@ -7,12 +7,7 @@ namespace MDPro3 ...@@ -7,12 +7,7 @@ namespace MDPro3
{ {
public static class TaskUtility public static class TaskUtility
{ {
private static readonly int DeltaTime; private static readonly int DeltaTime = 16;
static TaskUtility()
{
DeltaTime = 1000 / Application.targetFrameRate;
}
public static async Task WaitWhile(Func<bool> condition) public static async Task WaitWhile(Func<bool> condition)
{ {
......
...@@ -140,7 +140,7 @@ PlayerSettings: ...@@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0 loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0 visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0 tvOSBundleVersion: 1.0
bundleVersion: 1.2.3 bundleVersion: 1.2.3.1
preloadedAssets: preloadedAssets:
- {fileID: 11400000, guid: 5fb02d2098f52054b89ce4a9f63ba9ee, type: 2} - {fileID: 11400000, guid: 5fb02d2098f52054b89ce4a9f63ba9ee, type: 2}
- {fileID: -944628639613478452, guid: a916821eb5eea2842a69be6041bcdb82, type: 3} - {fileID: -944628639613478452, guid: a916821eb5eea2842a69be6041bcdb82, type: 3}
......
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