tanghai 2 ani în urmă
părinte
comite
5c68864e18

+ 1 - 9
Share/Analyzer/Config/AnalyzeAssembly.cs

@@ -12,35 +12,27 @@
         private const string UnityModelView = "Unity.ModelView";
         private const string UnityHotfixView = "Unity.HotfixView";
 
-        private const string UnityModelCodes = "Unity.Model.Codes";
-        private const string UnityHotfixCodes = "Unity.Hotfix.Codes";
-        private const string UnityModelViewCodes = "Unity.ModelView.Codes";
-        private const string UnityHotfixViewCodes = "Unity.HotfixView.Codes";
-
         public static readonly string[] AllHotfix =
         {
             DotNetHotfix, UnityHotfix, UnityHotfixView, 
-            UnityHotfixCodes, UnityHotfixViewCodes
         };
 
         public static readonly string[] AllModel =
         {
             DotNetModel, UnityModel, 
-            UnityModelView, UnityModelViewCodes, UnityModelCodes
+            UnityModelView
         };
 
         public static readonly string[] AllModelHotfix =
         {
             DotNetModel, DotNetHotfix, 
             UnityModel, UnityHotfix, UnityModelView, UnityHotfixView, 
-            UnityModelCodes, UnityModelViewCodes, UnityHotfixCodes, UnityHotfixViewCodes
         };
         
         public static readonly string[] All =
         {
             DotNetCore, DotNetModel, DotNetHotfix, 
             UnityCore, UnityModel, UnityHotfix, UnityModelView, UnityHotfixView, 
-            UnityModelCodes, UnityModelViewCodes, UnityHotfixCodes, UnityHotfixViewCodes
         };
 
         public static readonly string[] ServerModelHotfix =

+ 256 - 174
Unity/Assets/Bundles/UI/LockStep/UILSRoom.prefab

@@ -104,9 +104,11 @@ MonoBehaviour:
   - key: jumpToCount
     gameObject: {fileID: 2605382529560068387}
   - key: Replay
-    gameObject: {fileID: 4950388163098801764}
+    gameObject: {fileID: 3338259576684795284}
   - key: Play
-    gameObject: {fileID: 8605938705347275872}
+    gameObject: {fileID: 5523617649012132494}
+  - key: predict
+    gameObject: {fileID: 2600689584668777061}
 --- !u!1 &443161762425607488
 GameObject:
   m_ObjectHideFlags: 0
@@ -180,7 +182,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 0
     m_HorizontalOverflow: 1
@@ -212,18 +214,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1034478521492131682}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8038570048930686843}
-  m_RootOrder: 0
+  m_Father: {fileID: 4771239781044397799}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 71.178986, y: 55}
-  m_SizeDelta: {x: 64.358, y: 30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 217, y: -35}
+  m_SizeDelta: {x: 64.35803, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8506536753367236583
 CanvasRenderer:
@@ -379,13 +381,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 592631028990097364}
-  m_Father: {fileID: 5522546681671907567}
-  m_RootOrder: 2
+  m_Father: {fileID: 8664983122881471485}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 386.3188, y: -68}
-  m_SizeDelta: {x: 95.2377, y: 30}
+  m_AnchoredPosition: {x: 173.06715, y: -20}
+  m_SizeDelta: {x: 88.572, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6307454425002981456
 CanvasRenderer:
@@ -469,6 +471,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2600689584668777061
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5457420057147269815}
+  - component: {fileID: 26533898283190444}
+  - component: {fileID: 3677809357678589843}
+  m_Layer: 5
+  m_Name: predict
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5457420057147269815
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2600689584668777061}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4771239781044397799}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 139, y: -35}
+  m_SizeDelta: {x: 51.980774, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &26533898283190444
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2600689584668777061}
+  m_CullTransparentMesh: 1
+--- !u!114 &3677809357678589843
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2600689584668777061}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!1 &2605382529560068387
 GameObject:
   m_ObjectHideFlags: 0
@@ -495,20 +577,20 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2605382529560068387}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7377958395629660970}
   - {fileID: 950963626573382337}
-  m_Father: {fileID: 8038570048930686843}
-  m_RootOrder: 2
+  m_Father: {fileID: 1594851067972007820}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 268.49597, y: 55}
-  m_SizeDelta: {x: 114.992004, y: 30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 61.816162, y: -20}
+  m_SizeDelta: {x: 114.99194, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8986492370509680478
 CanvasRenderer:
@@ -806,8 +888,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5522546681671907567}
-  - {fileID: 8038570048930686843}
+  - {fileID: 7223618113462743409}
+  - {fileID: 5457420057147269815}
+  - {fileID: 7599094040480740423}
+  - {fileID: 1594851067972007820}
+  - {fileID: 8664983122881471485}
   m_Father: {fileID: 224438795553994780}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -854,6 +939,84 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3338259576684795284
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1594851067972007820}
+  - component: {fileID: 105324571726425836}
+  - component: {fileID: 6133690225159913531}
+  m_Layer: 5
+  m_Name: Replay
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1594851067972007820
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3338259576684795284}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1929971304662293886}
+  - {fileID: 2420295471407332701}
+  m_Father: {fileID: 4771239781044397799}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 152.56421, y: -128.3}
+  m_SizeDelta: {x: 247.2521, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &105324571726425836
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3338259576684795284}
+  m_CullTransparentMesh: 1
+--- !u!114 &6133690225159913531
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3338259576684795284}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3772973125405389865
 GameObject:
   m_ObjectHideFlags: 0
@@ -880,19 +1043,19 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3772973125405389865}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5666966668622771674}
-  m_Father: {fileID: 8038570048930686843}
-  m_RootOrder: 3
+  m_Father: {fileID: 1594851067972007820}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 375.6798, y: 55}
-  m_SizeDelta: {x: 73.35959, y: 30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 175.66568, y: -20}
+  m_SizeDelta: {x: 86.691, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2804252284832091920
 CanvasRenderer:
@@ -1001,18 +1164,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4603167191084436825}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8038570048930686843}
-  m_RootOrder: 1
+  m_Father: {fileID: 4771239781044397799}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 151, y: 55}
-  m_SizeDelta: {x: 51.980774, y: 30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 59, y: -35}
+  m_SizeDelta: {x: 51.980774, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7833112692715830900
 CanvasRenderer:
@@ -1056,7 +1219,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
---- !u!1 &4950388163098801764
+--- !u!1 &5523617649012132494
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1064,38 +1227,76 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8038570048930686843}
+  - component: {fileID: 8664983122881471485}
+  - component: {fileID: 3632380933066769871}
+  - component: {fileID: 6755659637872327147}
   m_Layer: 5
-  m_Name: Replay
+  m_Name: Play
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &8038570048930686843
+--- !u!224 &8664983122881471485
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4950388163098801764}
+  m_GameObject: {fileID: 5523617649012132494}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7599094040480740423}
-  - {fileID: 7223618113462743409}
-  - {fileID: 1929971304662293886}
-  - {fileID: 2420295471407332701}
+  - {fileID: 3090481317299282819}
+  - {fileID: 895650316332628775}
   m_Father: {fileID: 4771239781044397799}
-  m_RootOrder: 1
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 153.79, y: -86.4}
+  m_SizeDelta: {x: 244.81, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3632380933066769871
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5523617649012132494}
+  m_CullTransparentMesh: 1
+--- !u!114 &6755659637872327147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5523617649012132494}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5756238228320737012
 GameObject:
   m_ObjectHideFlags: 0
@@ -1129,13 +1330,13 @@ RectTransform:
   m_Children:
   - {fileID: 5584600435331946617}
   - {fileID: 1792105715031702230}
-  m_Father: {fileID: 5522546681671907567}
-  m_RootOrder: 1
+  m_Father: {fileID: 8664983122881471485}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 251, y: -68}
-  m_SizeDelta: {x: 160, y: 30}
+  m_AnchoredPosition: {x: 59.67009, y: -20}
+  m_SizeDelta: {x: 113.3402, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1370278903330398853
 CanvasRenderer:
@@ -1403,122 +1604,3 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Save Replay
---- !u!1 &6878862313097994145
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 280236444452826813}
-  - component: {fileID: 6242254895195686563}
-  - component: {fileID: 479013233324409552}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &280236444452826813
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6878862313097994145}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5522546681671907567}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105.864136, y: -68}
-  m_SizeDelta: {x: 113.92828, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6242254895195686563
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6878862313097994145}
-  m_CullTransparentMesh: 1
---- !u!114 &479013233324409552
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6878862313097994145}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 'relay name:'
---- !u!1 &8605938705347275872
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5522546681671907567}
-  m_Layer: 5
-  m_Name: Play
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5522546681671907567
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8605938705347275872}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 280236444452826813}
-  - {fileID: 3090481317299282819}
-  - {fileID: 895650316332628775}
-  m_Father: {fileID: 4771239781044397799}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}

+ 0 - 8
Unity/Assets/Scripts/Core/LockStep.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 70189de8f3c1f441694ef7eb16ba4e78
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 4 - 0
Unity/Assets/Scripts/Editor/AssetPostProcessor/OnGenerateCSProjectProcessor.cs

@@ -17,6 +17,10 @@ namespace ET
 
             if (path.EndsWith("Unity.Codes.csproj"))
             {
+                if (!Define.EnableCodes)
+                {
+                    return content;
+                }
                 GlobalConfig globalConfig = Resources.Load<GlobalConfig>("GlobalConfig");
                 if (globalConfig.BuildType == BuildType.Release)
                 {

+ 0 - 8
Unity/Assets/Scripts/HotfixView/Client/Demo/Camera.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2a6db53ec6138384188e073f2be742c9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Assets/Scripts/HotfixView/Client/Demo/Global.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7e97782fb5c300b47b582923348e6337
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
Unity/Assets/Scripts/HotfixView/Client/LockStep/LSUnitViewSystem.cs

@@ -41,7 +41,7 @@ namespace ET.Client
 
             Vector3 unitPos = unit.Position.ToVector();
             const float speed = 6f;
-            float speed2 = 6 * self.Room().SpeedMultiply;
+            float speed2 = speed * self.Room().SpeedMultiply;
             
             if (unitPos != self.Position)
             {

+ 10 - 7
Unity/Assets/Scripts/HotfixView/Client/LockStep/UI/UILSRoom/UILSRoomComponentSystem.cs

@@ -14,13 +14,14 @@ namespace ET.Client
                 GameObject replay = rc.Get<GameObject>("Replay");
                 GameObject play = rc.Get<GameObject>("Play");
                 
+                self.frameText = rc.Get<GameObject>("progress").GetComponent<Text>();
+                
                 Room room = self.Room();
                 if (room.IsReplay)
                 {
                     replay.SetActive(true);
                     play.SetActive(false);
                     self.totalFrame = rc.Get<GameObject>("framecount").GetComponent<Text>();
-                    self.frameText = rc.Get<GameObject>("progress").GetComponent<Text>();
                     self.jumpToField = rc.Get<GameObject>("jumpToCount").GetComponent<InputField>();
                     self.jump = rc.Get<GameObject>("jump").GetComponent<Button>();
                     self.jump.onClick.AddListener(self.JumpReplay);
@@ -31,6 +32,7 @@ namespace ET.Client
                 {
                     replay.SetActive(false);
                     play.SetActive(true);
+                    self.predictFrameText = rc.Get<GameObject>("predict").GetComponent<Text>();
                     self.saveReplay = rc.Get<GameObject>("SaveReplay").GetComponent<Button>();
                     self.saveName = rc.Get<GameObject>("SaveName").GetComponent<InputField>();
                     self.saveReplay.onClick.AddListener(self.OnSaveReplay);
@@ -43,16 +45,17 @@ namespace ET.Client
             protected override void Update(UILSRoomComponent self)
             {
                 Room room = self.Room();
-                if (room.IsReplay)
+                if (self.frame != room.AuthorityFrame)
                 {
-                    if (self.frame == room.AuthorityFrame)
-                    {
-                        return;
-                    }
-
                     self.frame = room.AuthorityFrame;
                     self.frameText.text = room.AuthorityFrame.ToString();
                 }
+
+                if (self.predictFrame != room.PredictionFrame)
+                {
+                    self.predictFrame = room.PredictionFrame;
+                    self.predictFrameText.text = room.PredictionFrame.ToString();
+                }
             }
         }
 

+ 2 - 0
Unity/Assets/Scripts/ModelView/Client/LockStep/UI/UILSRoom/UILSRoomComponent.cs

@@ -9,8 +9,10 @@ namespace ET.Client
         public InputField saveName;
         public Text totalFrame;
         public Text frameText;
+        public Text predictFrameText;
         public InputField jumpToField;
         public Button jump;
         public int frame;
+        public int predictFrame;
     }
 }

+ 1 - 1
Unity/ProjectSettings/ProjectSettings.asset

@@ -841,7 +841,7 @@ PlayerSettings:
   scriptingDefineSymbols:
     Android: UNITY;SINGLE_THREAD
     Server: UNITY
-    Standalone: UNITY;SINGLE_THREAD;ENABLE_VIEW;ENABLE_CODES
+    Standalone: UNITY;SINGLE_THREAD;ENABLE_VIEW
     WebGL: UNITY
     iPhone: UNITY;SINGLE_THREAD;ENABLE_CODES
   additionalCompilerArguments: {}