bug fix

Assets/Main.unity

@@ -6610,7 +6610,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.99994, y: 0}
+  m_AnchoredPosition: {x: -399.99988, y: 0}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &129642814
@@ -6992,7 +6992,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -7533,7 +7533,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: -490.00018, y: 0}
+  m_AnchoredPosition: {x: -490.00037, y: 0}
   m_SizeDelta: {x: 490, y: 2000}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &153416284
@@ -10133,7 +10133,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.4, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -11507,7 +11507,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1687306876}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.99999994
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -12549,7 +12549,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &250597852
 RectTransform:
   m_ObjectHideFlags: 0
@@ -12568,7 +12568,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49982, y: -540}
+  m_AnchoredPosition: {x: 247.49988, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &250597853
@@ -14563,10 +14563,7 @@ MonoBehaviour:
   ocgcore: {fileID: 1513174787}
   room: {fileID: 437956626}
   editDeck: {fileID: 531693331}
-  testFloat1: 20
-  testFloat2: 90
-  testFloat3: 10
-  testFloat4: 90
+  timeScaleFloat: 1
   currentServant: {fileID: 0}
   currentSubServant: {fileID: 0}
   depth: 0
@@ -15142,7 +15139,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49982, y: -540}
+  m_AnchoredPosition: {x: 247.49988, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &296823158
@@ -17258,7 +17255,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.99994, y: 300}
+  m_AnchoredPosition: {x: -399.99988, y: 300}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &365844423
@@ -20648,9 +20645,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -47, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &422163130
 MonoBehaviour:
@@ -21477,7 +21474,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -24861,8 +24858,8 @@ RectTransform:
   m_Father: {fileID: 1211888579}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.4, y: 0}
-  m_AnchorMax: {x: 0.4, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -25668,8 +25665,8 @@ RectTransform:
   m_Father: {fileID: 278804550}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.33333334, y: 0}
-  m_AnchorMax: {x: 0.33333334, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -25821,7 +25818,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -25896,8 +25893,8 @@ RectTransform:
   m_Father: {fileID: 381289150}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -27285,7 +27282,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.41666666, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -33248,7 +33245,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49982, y: -540}
+  m_AnchoredPosition: {x: 247.49988, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &681567863
@@ -34005,7 +34002,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.000030517578}
+  m_AnchoredPosition: {x: 0, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &702608002
@@ -34835,8 +34832,8 @@ RectTransform:
   m_Father: {fileID: 110713675}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -35900,7 +35897,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -419.9997, y: -60}
+  m_AnchoredPosition: {x: -419.99988, y: -60}
   m_SizeDelta: {x: 400, y: 760}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &736958434
@@ -36673,8 +36670,8 @@ RectTransform:
   m_Father: {fileID: 1624786178}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.41666666, y: 0}
-  m_AnchorMax: {x: 0.41666666, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -37255,7 +37252,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 476827028}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.6304826
+  m_Size: 0.62626565
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -38689,16 +38686,16 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 1513174787}
-        m_TargetAssemblyTypeName: OcgCore, Assembly-CSharp
+        m_TargetAssemblyTypeName: MDPro3.OcgCore, Assembly-CSharp
         m_MethodName: OnDuelResultConfirmed
-        m_Mode: 1
+        m_Mode: 6
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
           m_IntArgument: 0
           m_FloatArgument: 0
           m_StringArgument: 
-          m_BoolArgument: 0
+          m_BoolArgument: 1
         m_CallState: 2
 --- !u!114 &813652853
 MonoBehaviour:
@@ -40094,9 +40091,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -47, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &835420699
 MonoBehaviour:
@@ -43429,8 +43426,8 @@ RectTransform:
   m_Father: {fileID: 678206924}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.52}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -46215,7 +46212,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1163139165}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.99999994
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -47871,7 +47868,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -49155,7 +49152,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1005556389
 RectTransform:
   m_ObjectHideFlags: 0
@@ -49174,7 +49171,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49982, y: -540}
+  m_AnchoredPosition: {x: 247.49988, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1005556390
@@ -52788,7 +52785,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.000030517578}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &1110086322
@@ -52900,7 +52897,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -53278,7 +53275,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &1117266860
@@ -61267,8 +61264,8 @@ RectTransform:
   m_Father: {fileID: 1292915441}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.19999999}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -64605,7 +64602,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -65581,7 +65578,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49982, y: -540}
+  m_AnchoredPosition: {x: 247.49988, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1371617110
@@ -65733,7 +65730,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.99994, y: 150}
+  m_AnchoredPosition: {x: -399.99988, y: 150}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1374530642
@@ -67478,7 +67475,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1714379351}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.99999994
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -68904,7 +68901,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -71845,7 +71842,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.33333334, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -82955,7 +82952,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 677938099}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.99999994
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -88248,7 +88245,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.99994, y: -150}
+  m_AnchoredPosition: {x: -399.99988, y: -150}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1800729521
@@ -96918,7 +96915,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -102356,7 +102353,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -103191,7 +103188,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Prefabs/MessageItem.prefab

@@ -134,7 +134,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Scripts/MDPro3/Duel/DuelButton.cs

@@ -186,7 +186,7 @@ namespace MDPro3.UI
                             if(cookieCard.p.controller == 0)
                                 height = 250f;
                             else
-                                height = -100;
+                                height = -200;
                         }
                     }
                 }

Assets/Scripts/MDPro3/Duel/TcpHelper.cs

@@ -24,26 +24,29 @@ namespace MDPro3
         public static string lastRecordName = "";
         public static List<Package> packagesInRecord = new List<Package>();
 
+        private static readonly Queue<Package> messageQueue = new Queue<Package>();
+        public static void InitializeSender()
+        {
+            var senderThead = new Thread(Sender);
+            senderThead.IsBackground = true;
+            senderThead.Start();
+        }
+
         public static void Join(string ipString, string name, string portString, string pswString, string version)
         {
-            //Debug.Log("TcpHelper-Join-Start");
             if (canJoin)
             {
-                //Debug.Log("TcpHelper-Join-canJoin: true");
-
                 if (tcpClient == null || tcpClient.Connected == false)
                 {
-                    //Debug.Log("TcpHelper-Join-mark1");
-
                     canJoin = false;
                     try
                     {
-                        //Debug.Log("TcpHelper-Join-mark2");
-
                         tcpClient = new TcpClientWithTimeout(ipString, int.Parse(portString), 3000).Connect();
                         networkStream = tcpClient.GetStream();
                         var t = new Thread(Receiver);
                         t.Start();
+                        messageQueue.Clear();
+                        InitializeSender();
                         CtosMessage_PlayerInfo(name);
                         CtosMessage_JoinGame(pswString, version);
                     }
@@ -56,16 +59,12 @@ namespace MDPro3
             }
             else
             {
-                //Debug.Log("TcpHelper-Join-canJoin: false");
-
                 onDisConnected = true;
             }
         }
 
         public static void Receiver()
         {
-            //Debug.Log("TcpHelper-Receiver-Start");
-
             try
             {
                 while (tcpClient != null
@@ -74,19 +73,13 @@ namespace MDPro3
                     && Program.Running
                     && !Program.I().room.duelEnded)
                 {
-                    //Debug.Log("TcpHelper-Receiver-Mark1");
-
                     var data = SocketMaster.ReadPacket(networkStream);
                     AddDateJumoLine(data);
                 }
-                //Debug.Log("TcpHelper-Receiver-Mark2");
-
                 onDisConnected = true;
             }
             catch
             {
-                //Debug.Log("TcpHelper-Receiver-Mark3");
-
                 onDisConnected = true;
             }
         }
@@ -231,37 +224,56 @@ namespace MDPro3
 
         public static void Send(Package message)
         {
-            if (tcpClient != null && tcpClient.Connected)
+            lock (locker)
             {
-                var t = new Thread(Sender);
-                t.Start(message);
+                messageQueue.Enqueue(message);
             }
         }
 
-        private static void Sender(object o)
+        private static void Sender()
         {
-            try
+            while (tcpClient != null && tcpClient.Connected)
             {
+                Package currentMessage;
                 lock (locker)
                 {
-                    var message = (Package)o;
-                    var data = message.Data.Get();
-                    var memstream = new MemoryStream();
-                    var b = new BinaryWriter(memstream);
-                    b.Write(BitConverter.GetBytes((short)data.Length + 1), 0, 2);
-                    b.Write(BitConverter.GetBytes((byte)message.Function), 0, 1);
+                    if (messageQueue.Count == 0)
+                        continue;
+                    currentMessage = messageQueue.Dequeue();
+                }
+                try
+                {
+                    var data = currentMessage.Data.Get();
+                    using (MemoryStream memstream = new MemoryStream())
+                    {
+                        using (BinaryWriter b = new BinaryWriter(memstream))
+                        {
+                            b.Write(BitConverter.GetBytes((short)(data.Length + 1)), 0, 2);
+                            b.Write(BitConverter.GetBytes((byte)currentMessage.Function), 0, 1);
                             b.Write(data, 0, data.Length);
-                    var s = memstream.ToArray();
-                    //Debug.Log(BitConverter.ToString(s));
+                        }
+                        byte[] s = memstream.ToArray();
+                        try
+                        {
                             tcpClient.Client.Send(s);
                         }
+                        catch (SocketException ex)
+                        {
+                            Debug.LogError($"Failed to send data: {ex.Message}");
+                            onDisConnected = true;
+                            break;
+                        }
+                    }
                 }
                 catch
                 {
                     onDisConnected = true;
+                    break;
+                }
             }
         }
 
+        #region CtosMessage
         public static void CtosMessage_Response(byte[] response)
         {
             var message = new Package();
@@ -408,7 +420,7 @@ namespace MDPro3
             message.Function = (int)CtosMessage.HsStart;
             Send(message);
         }
-
+        #endregion
         public static List<Package> ReadPackagesInRecord(string path)
         {
             List<Package> re = null;
@@ -766,20 +778,15 @@ namespace MDPro3
     {
         private static byte[] ReadFull(NetworkStream stream, int length)
         {
-            //Debug.Log("TcpHelper-ReadReadFull-Start");
-
             var buf = new byte[length];
             var rlen = 0;
             while (rlen < buf.Length)
             {
-                //Debug.Log("TcpHelper-ReadReadFull-Mark1");
-
                 var currentLength = stream.Read(buf, rlen, buf.Length - rlen);
                 rlen += currentLength;
                 if (currentLength == 0)
                 {
                     TcpHelper.onDisConnected = true;
-                    //Debug.Log("TcpHelper-ReadReadFull-Set onDisConnected True");
                     break;
                 }
             }
@@ -788,8 +795,6 @@ namespace MDPro3
 
         public static byte[] ReadPacket(NetworkStream stream)
         {
-            //Debug.Log("TcpHelper-ReadPacket-Start");
-
             var hdr = ReadFull(stream, 2);
             var plen = BitConverter.ToUInt16(hdr, 0);
             var buf = ReadFull(stream, plen);

Assets/Scripts/MDPro3/Program.cs

@@ -45,6 +45,10 @@ namespace MDPro3
         public Room room;
         public EditDeck editDeck;
 
+#if UNITY_EDITOR
+        public float timeScaleFloat = 1;
+
+#endif
         #region Initializement
 
         private static Program instance;
@@ -165,11 +169,6 @@ namespace MDPro3
         public static bool InputGetMouse1Up;
         public static float pressingTime;
 
-        public float testFloat1;
-        public float testFloat2;
-        public float testFloat3;
-        public float testFloat4;
-
         void Update()
         {
             InputGetMouse0 = Input.GetMouseButton(0);
@@ -206,8 +205,9 @@ namespace MDPro3
             foreach (Manager manager in managers) manager.PerFrameFunction();
             foreach (Servant servant in servants) servant.PerFrameFunction();
 
-            if (Input.GetKey(KeyCode.P))
-                OcgCore.messagePass = true;
+#if UNITY_EDITOR
+            timeScale = timeScaleFloat;
+#endif
         }
 
         public void UnloadUnusedAssets()

Assets/Scripts/MDPro3/Servants/OcgCore.cs

@@ -20,6 +20,7 @@ using MDPro3.YGOSharp.OCGWrapper.Enums;
 using static YgomGame.Bg.BgEffectSettingInner;
 using MDPro3.UI;
 
+
 namespace MDPro3
 {
     public class OcgCore : Servant
@@ -278,7 +279,7 @@ namespace MDPro3
             }
         }
 
-        public void OnDuelResultConfirmed()
+        public void OnDuelResultConfirmed(bool manual = false)
         {
             Program.I().room.joinWithReconnect = false;
 
@@ -310,6 +311,22 @@ namespace MDPro3
             }
 
             if (condition == Condition.Watch)
+            {
+                if (manual)
+                {
+                    surrended = false;
+                    Program.I().room.duelEnded = false;
+                    Program.I().room.needSide = false;
+                    Program.I().room.sideWaitingObserver = false;
+                    if (Program.I().currentSubServant != null)
+                    {
+                        Program.I().currentSubServant.Hide(-1);
+                        Program.I().currentSubServant = null;
+                    }
+                    TcpHelper.CtosMessage_LeaveGame();
+                    OnExit();
+                }
+                else
                 {
                     if (duelEnded)
                         Hide(0);
@@ -320,6 +337,7 @@ namespace MDPro3
                         field0.SetActive(true);
                         field1.SetActive(true);
                     }
+                }
                 return;
             }
 
@@ -1276,8 +1294,8 @@ namespace MDPro3
 
         public void SendReturn(byte[] buffer)
         {
+            handler?.Invoke(buffer);
             ClearResponse();
-            if (handler != null) handler(buffer);
         }
 
         public void Sleep(int framsIn100)
@@ -1286,6 +1304,14 @@ namespace MDPro3
             if (illustion > MessageBeginTime) MessageBeginTime = illustion;
         }
 
+        public void OnResend()
+        {
+            var binaryMaster = new BinaryMaster();
+            binaryMaster = new BinaryMaster();
+            binaryMaster.writer.Write(-1);
+            SendReturn(binaryMaster.Get());
+        }
+
         public void StocMessage_TimeLimit(BinaryReader r)
         {
             int player = LocalPlayer(r.ReadByte());
@@ -4088,101 +4114,54 @@ namespace MDPro3
                     }
 
                     var handleFlag = 0;
-                    //无强制发动的卡
                     if (forced == 0)
                     {
-                        //无关键卡
                         if (spcount == 0)
                         {
-                            //全时点
-                            if (chainCondition == ChainCondition.All)
+                            switch (chainCondition)
                             {
-                                //无卡连锁
+                                case ChainCondition.All:
                                     if (chainCards.Count == 0)
-                                    //无连锁提示
                                         handleFlag = -1;
-                                //有卡连锁
                                     else
-                                {
-                                    //一个效果需要处理
-                                    if (chainCards.Count == 1 && chainCards[0].effects.Count == 1)
                                         handleFlag = 1;
-                                    //多个效果需要处理
-                                    else
-                                        handleFlag = 2;
-                                }
-                            }
-                            else
+                                    break;
+                                default:
                                     handleFlag = 0;
+                                    break;
+                            }
                         }
-                        //有关键卡
                         else
                         {
-                            //无卡连锁
                             if (chainCards.Count == 0)
                             {
                                 handleFlag = 0;
                                 if (chainCondition == ChainCondition.All)
                                     handleFlag = -1;
                             }
-                            //有卡连锁
                             else
                             {
                                 if (chainCondition == ChainCondition.No)
                                     handleFlag = 0;
                                 else
-                                {
-                                    if (chainCards.Count == 1 && chainCards[0].effects.Count == 1)
                                     handleFlag = 1;
-                                    else
-                                        handleFlag = 2;
-                                }
                             }
                         }
                     }
-                    //有强制发动的卡
-                    else
-                    {
-                        //有一张强制发动的卡
-                        if (chainCards.Count == 1 && chainCards[0].effects.Count == 1)
-                            handleFlag = 4;
-                        //有多张强制发动的卡
                     else
                         handleFlag = 3;
-                    }
-                    //响应
-                    //无卡连锁提示
-                    if (handleFlag == -1)
-                    {
-                        //TODO or not to
-                        binaryMaster = new BinaryMaster();
-                        binaryMaster.writer.Write(-1);
-                        SendReturn(binaryMaster.Get());
-                    }
-                    //直接回复
-                    else if (handleFlag == 0)
-                    {
-                        binaryMaster = new BinaryMaster();
-                        binaryMaster.writer.Write(-1);
-                        SendReturn(binaryMaster.Get());
-                    }
-                    //处理一张 废除
-                    if (handleFlag == 1)
-                        handleFlag = 2;
-                    //处理多张
-                    if (handleFlag == 2)
+
+                    switch (handleFlag)
                     {
+                        case 1:
                             ShowPopupSelectCard(InterString.Get("选择效果发动。"), chainCards, 1, 1, true, false);
-                    }
-                    //处理多张强制发动的卡
-                    else if (handleFlag == 3)
-                    {
-                        ShowPopupSelectCard(InterString.Get("选择必发效果发动。"), chainCards, 1, 1, false, false);
-                    }
-                    //处理一张强制发动的卡
-                    else if (handleFlag == 4)
-                    {
+                            break;
+                        case 3:
                             ShowPopupSelectCard(InterString.Get("选择必发效果发动。"), chainCards, 1, 1, false, false);
+                            break;
+                        default:
+                            OnResend();
+                            break;
                     }
                     break;
                 case GameMessage.SelectCard:

Assets/Scripts/MDPro3/UI/Handler/PlaceSelector.cs

@@ -431,7 +431,7 @@ namespace MDPro3.UI
                         }
                     }
                 }
-                if ((passController & 0x1F00) > 0)
+                if ((passController & 0x3F00) > 0)
                 {
                     if ((p.location & (uint)CardLocation.SpellZone) > 0)
                     {

Assets/Scripts/MDPro3/UI/Popup/PopupServer.cs

@@ -57,10 +57,10 @@ namespace MDPro3.UI
                 textMode.text,
                 toggleNoCheck.switchOn ? "T" : "F",
                 toggleNoShuffle.switchOn ? "T" : "F",
-                inputTime.text,
-                inputLP.text,
-                inputHand.text,
-                inputDraw.text
+                inputTime.text == "" ? "0" : inputTime.text,
+                inputLP.text == "" ? "8000" : inputLP.text,
+                inputHand.text == "" ? "5" : inputHand.text,
+                inputDraw.text == "" ? "1" : inputDraw.text
             };
         }
 

ProjectSettings/ProjectSettings.asset

@@ -134,9 +134,8 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.5.2
-  preloadedAssets:
-  - {fileID: 11400000, guid: 5fb02d2098f52054b89ce4a9f63ba9ee, type: 2}
+  bundleVersion: 0.5.3
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

Version.txt

-0.5.2
+0.6.1