Skip to content

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

fix replay message bug

parent 68c14202
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 46 deletions
Assets/Fonts/SourceHanSansSC-Medium SDF.asset
View file @ e8adb80c
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 @ e8adb80c
......@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510
- rid: 5650211206403981511
- rid: 5650211206403981512
- rid: 5650211606802202691
- rid: 5650211675045101746
- rid: 5650211206403981514
- rid: 5650211206403981515
- rid: 5650211606802202692
- rid: 5650211606802202693
- rid: 5650211675045101747
- rid: 5650211675045101748
- rid: 5650211206403981518
- rid: 5650211606802202694
- rid: 5650211675045101749
- rid: 5650211206403981520
- rid: 5650211606802202695
- rid: 5650211675045101750
- rid: 5650211206403981522
- rid: 5650211606802202696
- rid: 5650211606802202697
- rid: 5650211606802202698
- rid: 5650211606802202699
- rid: 5650211606802202700
- rid: 5650211675045101751
- rid: 5650211675045101752
- rid: 5650211675045101753
- rid: 5650211675045101754
- rid: 5650211675045101755
- rid: 5650211206403981528
- rid: 5650211206403981529
- rid: 5650211206403981530
......@@ -159,7 +159,7 @@ MonoBehaviour:
m_version: 0
m_EnableCompilationCaching: 1
m_EnableValidityChecks: 1
- rid: 5650211606802202691
- rid: 5650211675045101746
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
......@@ -174,14 +174,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: 5650211606802202692
- rid: 5650211675045101747
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: 5650211606802202693
- rid: 5650211675045101748
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
......@@ -189,7 +189,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: 5650211606802202694
- rid: 5650211675045101749
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
......@@ -201,7 +201,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: 5650211606802202695
- rid: 5650211675045101750
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
......@@ -214,7 +214,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: 5650211606802202696
- rid: 5650211675045101751
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -225,12 +225,12 @@ MonoBehaviour:
traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3}
skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3}
skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
- rid: 5650211606802202697
- rid: 5650211675045101752
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 5650211606802202698
- rid: 5650211675045101753
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -240,14 +240,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 5650211606802202699
- rid: 5650211675045101754
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 5650211606802202700
- rid: 5650211675045101755
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @ e8adb80c
......@@ -1373,6 +1373,7 @@ namespace MDPro3
public int turns;
public bool isFirst;
public bool isObserver;
int playerType;
public bool myTurn = true;
public DuelPhase phase = DuelPhase.Draw;
public delegate void ResponseHandler(byte[] buffer);
......@@ -2590,8 +2591,46 @@ namespace MDPro3
switch ((GameMessage)p.Function)
{
case GameMessage.sibyl_chat:
r.ReadInt32();
PrintDuelLog(r.ReadALLUnicode());
player = r.ReadInt32();
if (!GetMessageConfig(player))
break;
switch (player)
{
case 0:
name = name_0;
if (playerType < 7 &&
((playerType < 2 && !isFirst) || (playerType >= 2 && isFirst)))
name = name_1;
break;
case 1:
name = name_0_tag;
if (playerType < 7 &&
((playerType < 2 && !isFirst) || (playerType >= 2 && isFirst)))
name = name_1_tag;
break;
case 2:
name = name_1;
if (playerType < 7 &&
((playerType < 2 && !isFirst) || (playerType >= 2 && isFirst)))
name = name_0;
break;
case 3:
name = name_1_tag;
if (playerType < 7 &&
((playerType < 2 && !isFirst) || (playerType >= 2 && isFirst)))
name = name_0_tag;
break;
case 7:
name = InterString.Get("观战者");
break;
default:
name = string.Empty;
break;
}
if (name != string.Empty)
name += ": ";
var content = r.ReadALLUnicode();
MessageManager.Cast(name + content);
break;
case GameMessage.sibyl_name:
name_0 = r.ReadUnicode(50);
......@@ -2600,6 +2639,7 @@ namespace MDPro3
name_1 = r.ReadUnicode(50);
name_1_tag = r.ReadUnicode(50);
name_1_c = r.ReadUnicode(50);
isTag = !(name_0_tag == "---" && name_1_tag == "---" && name_0 == name_0_c && name_1 == name_1_c);
if (Config.Get("ReplayPlayerName0", "@ui").Length > 0)
......@@ -2834,10 +2874,9 @@ namespace MDPro3
cg.interactable = false;
md5Maker = 0;
messagePass = false;
int playerType = r.ReadByte();
playerType = r.ReadByte();
isFirst = (playerType & 0xF) == 0;
Room.coreShowing = 2;
Program.I().room.AddChatItem(-2, "Core Ready");
isObserver = (playerType & 0xF0) > 0;
if (r.BaseStream.Length > 17)
MasterRule = r.ReadByte();
......@@ -6326,9 +6365,11 @@ namespace MDPro3
}
public Package GetNamePacket()
{
var p__ = new Package();
p__.Function = (int)GameMessage.sibyl_name;
p__.Data = new BinaryMaster();
var p__ = new Package
{
Function = (int)GameMessage.sibyl_name,
Data = new BinaryMaster()
};
p__.Data.writer.WriteUnicode(name_0, 50);
p__.Data.writer.WriteUnicode(name_0_tag, 50);
p__.Data.writer.WriteUnicode(name_0_c != "" ? name_0_c : name_0, 50);
......@@ -6341,18 +6382,17 @@ namespace MDPro3
bool GetAutoInfo()
{
bool returnValue = true;
if (condition == Condition.Duel
&& Config.Get("DuelAutoInfo", "0") == "0")
returnValue = false;
return false;
if (condition == Condition.Watch
&& Config.Get("WatchAutoInfo", "0") == "0")
returnValue = false;
return false;
if (condition == Condition.Replay
&& Config.Get("ReplayAutoInfo", "0") == "0")
returnValue = false;
return false;
return returnValue;
return true;
}
public void RefreshAllCardsLabel()
......
Assets/Wallpaper.meta → Assets/SpineWallpaper.meta
View file @ e8adb80c
fileFormatVersion: 2
guid: d5dd6464ba3b1474e97da38e0b56bf3a
guid: cb0d99550494121449fce888a44fb14e
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
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