diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index e3e5532..891b73b 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -22,6 +22,8 @@ m_Component: - component: {fileID: 1845617020408148629} - component: {fileID: 2647236827943958594} + - component: {fileID: 8076821645923605816} + - component: {fileID: 446445004819590403} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -59,6 +61,41 @@ m_EditorClassIdentifier: PlayerID: 0 ItemID: 0 + ItemRoot: {fileID: 0} + Type: + DeleteOnDisconnect: 1 +--- !u!114 &8076821645923605816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fac14d91eb200479e945e56930d545, type: 3} + m_Name: + m_EditorClassIdentifier: + ForceLocal: 0 + Speed: 8 +--- !u!143 &446445004819590403 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.37 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.26, z: 0} --- !u!1 &1845617020995435925 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +184,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845617020995435925} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -164,6 +201,11 @@ propertyPath: m_Name value: CastLight objectReference: {fileID: 0} + - target: {fileID: 7996748540272408192, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7996748540272408193, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, type: 3} propertyPath: m_LocalPosition.x diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index e3e5532..891b73b 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -22,6 +22,8 @@ m_Component: - component: {fileID: 1845617020408148629} - component: {fileID: 2647236827943958594} + - component: {fileID: 8076821645923605816} + - component: {fileID: 446445004819590403} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -59,6 +61,41 @@ m_EditorClassIdentifier: PlayerID: 0 ItemID: 0 + ItemRoot: {fileID: 0} + Type: + DeleteOnDisconnect: 1 +--- !u!114 &8076821645923605816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fac14d91eb200479e945e56930d545, type: 3} + m_Name: + m_EditorClassIdentifier: + ForceLocal: 0 + Speed: 8 +--- !u!143 &446445004819590403 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.37 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.26, z: 0} --- !u!1 &1845617020995435925 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +184,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845617020995435925} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -164,6 +201,11 @@ propertyPath: m_Name value: CastLight objectReference: {fileID: 0} + - target: {fileID: 7996748540272408192, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7996748540272408193, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index f43129a..4bcb9b4 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -989,7 +989,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088763451 GameObject: @@ -1120,7 +1120,7 @@ - {fileID: 1088763452} - {fileID: 228536900} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1668528467 GameObject: @@ -1353,7 +1353,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2071196361 GameObject: @@ -1448,72 +1448,3 @@ m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1845617019786728178 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.91 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.02 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.8 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148631, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 20538681c6e8e81459a344bc7ad46234, type: 3} diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index e3e5532..891b73b 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -22,6 +22,8 @@ m_Component: - component: {fileID: 1845617020408148629} - component: {fileID: 2647236827943958594} + - component: {fileID: 8076821645923605816} + - component: {fileID: 446445004819590403} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -59,6 +61,41 @@ m_EditorClassIdentifier: PlayerID: 0 ItemID: 0 + ItemRoot: {fileID: 0} + Type: + DeleteOnDisconnect: 1 +--- !u!114 &8076821645923605816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fac14d91eb200479e945e56930d545, type: 3} + m_Name: + m_EditorClassIdentifier: + ForceLocal: 0 + Speed: 8 +--- !u!143 &446445004819590403 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.37 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.26, z: 0} --- !u!1 &1845617020995435925 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +184,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845617020995435925} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -164,6 +201,11 @@ propertyPath: m_Name value: CastLight objectReference: {fileID: 0} + - target: {fileID: 7996748540272408192, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7996748540272408193, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index f43129a..4bcb9b4 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -989,7 +989,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088763451 GameObject: @@ -1120,7 +1120,7 @@ - {fileID: 1088763452} - {fileID: 228536900} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1668528467 GameObject: @@ -1353,7 +1353,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2071196361 GameObject: @@ -1448,72 +1448,3 @@ m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1845617019786728178 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.91 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.02 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.8 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148631, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 20538681c6e8e81459a344bc7ad46234, type: 3} diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index f7373e1..e301823 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -28,15 +28,36 @@ netHost = FindObjectOfType(); } + private Vector3 lastPos; + void Start() + { + UpdateLastAutoProps(); + + } + + private void UpdateLastAutoProps() + { + lastPos = RootTransform.position; + } + public bool IsLocal { - get { return PlayerID == netHost.LocalPlayerID; } + get { return netHost == null || PlayerID == netHost.LocalPlayerID; } } // Update is called once per frame void Update() { - + CheckAutoProps(); + } + + private void CheckAutoProps() + { + if (netHost != null && lastPos != RootTransform.position) + { + netHost.SendItemUpdate(this); + } + UpdateLastAutoProps(); } public Transform RootTransform diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index e3e5532..891b73b 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -22,6 +22,8 @@ m_Component: - component: {fileID: 1845617020408148629} - component: {fileID: 2647236827943958594} + - component: {fileID: 8076821645923605816} + - component: {fileID: 446445004819590403} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -59,6 +61,41 @@ m_EditorClassIdentifier: PlayerID: 0 ItemID: 0 + ItemRoot: {fileID: 0} + Type: + DeleteOnDisconnect: 1 +--- !u!114 &8076821645923605816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fac14d91eb200479e945e56930d545, type: 3} + m_Name: + m_EditorClassIdentifier: + ForceLocal: 0 + Speed: 8 +--- !u!143 &446445004819590403 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.37 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.26, z: 0} --- !u!1 &1845617020995435925 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +184,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845617020995435925} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -164,6 +201,11 @@ propertyPath: m_Name value: CastLight objectReference: {fileID: 0} + - target: {fileID: 7996748540272408192, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7996748540272408193, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index f43129a..4bcb9b4 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -989,7 +989,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088763451 GameObject: @@ -1120,7 +1120,7 @@ - {fileID: 1088763452} - {fileID: 228536900} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1668528467 GameObject: @@ -1353,7 +1353,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2071196361 GameObject: @@ -1448,72 +1448,3 @@ m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1845617019786728178 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.91 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.02 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.8 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148631, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 20538681c6e8e81459a344bc7ad46234, type: 3} diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index f7373e1..e301823 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -28,15 +28,36 @@ netHost = FindObjectOfType(); } + private Vector3 lastPos; + void Start() + { + UpdateLastAutoProps(); + + } + + private void UpdateLastAutoProps() + { + lastPos = RootTransform.position; + } + public bool IsLocal { - get { return PlayerID == netHost.LocalPlayerID; } + get { return netHost == null || PlayerID == netHost.LocalPlayerID; } } // Update is called once per frame void Update() { - + CheckAutoProps(); + } + + private void CheckAutoProps() + { + if (netHost != null && lastPos != RootTransform.position) + { + netHost.SendItemUpdate(this); + } + UpdateLastAutoProps(); } public Transform RootTransform diff --git a/Assets/Scripts/Item.cs.meta b/Assets/Scripts/Item.cs.meta index b142fc6..0296c79 100644 --- a/Assets/Scripts/Item.cs.meta +++ b/Assets/Scripts/Item.cs.meta @@ -4,7 +4,7 @@ externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index e3e5532..891b73b 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -22,6 +22,8 @@ m_Component: - component: {fileID: 1845617020408148629} - component: {fileID: 2647236827943958594} + - component: {fileID: 8076821645923605816} + - component: {fileID: 446445004819590403} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -59,6 +61,41 @@ m_EditorClassIdentifier: PlayerID: 0 ItemID: 0 + ItemRoot: {fileID: 0} + Type: + DeleteOnDisconnect: 1 +--- !u!114 &8076821645923605816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fac14d91eb200479e945e56930d545, type: 3} + m_Name: + m_EditorClassIdentifier: + ForceLocal: 0 + Speed: 8 +--- !u!143 &446445004819590403 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.37 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.26, z: 0} --- !u!1 &1845617020995435925 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +184,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845617020995435925} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -164,6 +201,11 @@ propertyPath: m_Name value: CastLight objectReference: {fileID: 0} + - target: {fileID: 7996748540272408192, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7996748540272408193, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index f43129a..4bcb9b4 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -989,7 +989,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088763451 GameObject: @@ -1120,7 +1120,7 @@ - {fileID: 1088763452} - {fileID: 228536900} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1668528467 GameObject: @@ -1353,7 +1353,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2071196361 GameObject: @@ -1448,72 +1448,3 @@ m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1845617019786728178 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.91 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.02 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.8 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148631, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 20538681c6e8e81459a344bc7ad46234, type: 3} diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index f7373e1..e301823 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -28,15 +28,36 @@ netHost = FindObjectOfType(); } + private Vector3 lastPos; + void Start() + { + UpdateLastAutoProps(); + + } + + private void UpdateLastAutoProps() + { + lastPos = RootTransform.position; + } + public bool IsLocal { - get { return PlayerID == netHost.LocalPlayerID; } + get { return netHost == null || PlayerID == netHost.LocalPlayerID; } } // Update is called once per frame void Update() { - + CheckAutoProps(); + } + + private void CheckAutoProps() + { + if (netHost != null && lastPos != RootTransform.position) + { + netHost.SendItemUpdate(this); + } + UpdateLastAutoProps(); } public Transform RootTransform diff --git a/Assets/Scripts/Item.cs.meta b/Assets/Scripts/Item.cs.meta index b142fc6..0296c79 100644 --- a/Assets/Scripts/Item.cs.meta +++ b/Assets/Scripts/Item.cs.meta @@ -4,7 +4,7 @@ externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/NetHost.cs b/Assets/Scripts/NetHost.cs index 6bbb804..66eb5fd 100644 --- a/Assets/Scripts/NetHost.cs +++ b/Assets/Scripts/NetHost.cs @@ -164,6 +164,8 @@ SendItemUpdate(item); + items[item.Key] = item; + return item; } @@ -203,6 +205,8 @@ item.gameObject.SendMessage("StartRemote", null, SendMessageOptions.DontRequireReceiver); item.UpdateFromData(itemData); + + items[item.Key] = item; } else { diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index e3e5532..891b73b 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -22,6 +22,8 @@ m_Component: - component: {fileID: 1845617020408148629} - component: {fileID: 2647236827943958594} + - component: {fileID: 8076821645923605816} + - component: {fileID: 446445004819590403} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -59,6 +61,41 @@ m_EditorClassIdentifier: PlayerID: 0 ItemID: 0 + ItemRoot: {fileID: 0} + Type: + DeleteOnDisconnect: 1 +--- !u!114 &8076821645923605816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fac14d91eb200479e945e56930d545, type: 3} + m_Name: + m_EditorClassIdentifier: + ForceLocal: 0 + Speed: 8 +--- !u!143 &446445004819590403 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.37 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.26, z: 0} --- !u!1 &1845617020995435925 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +184,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845617020995435925} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -164,6 +201,11 @@ propertyPath: m_Name value: CastLight objectReference: {fileID: 0} + - target: {fileID: 7996748540272408192, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7996748540272408193, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index f43129a..4bcb9b4 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -989,7 +989,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088763451 GameObject: @@ -1120,7 +1120,7 @@ - {fileID: 1088763452} - {fileID: 228536900} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1668528467 GameObject: @@ -1353,7 +1353,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2071196361 GameObject: @@ -1448,72 +1448,3 @@ m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1845617019786728178 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.91 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.02 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.8 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148631, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 20538681c6e8e81459a344bc7ad46234, type: 3} diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index f7373e1..e301823 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -28,15 +28,36 @@ netHost = FindObjectOfType(); } + private Vector3 lastPos; + void Start() + { + UpdateLastAutoProps(); + + } + + private void UpdateLastAutoProps() + { + lastPos = RootTransform.position; + } + public bool IsLocal { - get { return PlayerID == netHost.LocalPlayerID; } + get { return netHost == null || PlayerID == netHost.LocalPlayerID; } } // Update is called once per frame void Update() { - + CheckAutoProps(); + } + + private void CheckAutoProps() + { + if (netHost != null && lastPos != RootTransform.position) + { + netHost.SendItemUpdate(this); + } + UpdateLastAutoProps(); } public Transform RootTransform diff --git a/Assets/Scripts/Item.cs.meta b/Assets/Scripts/Item.cs.meta index b142fc6..0296c79 100644 --- a/Assets/Scripts/Item.cs.meta +++ b/Assets/Scripts/Item.cs.meta @@ -4,7 +4,7 @@ externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/NetHost.cs b/Assets/Scripts/NetHost.cs index 6bbb804..66eb5fd 100644 --- a/Assets/Scripts/NetHost.cs +++ b/Assets/Scripts/NetHost.cs @@ -164,6 +164,8 @@ SendItemUpdate(item); + items[item.Key] = item; + return item; } @@ -203,6 +205,8 @@ item.gameObject.SendMessage("StartRemote", null, SendMessageOptions.DontRequireReceiver); item.UpdateFromData(itemData); + + items[item.Key] = item; } else { diff --git a/Assets/Scripts/NetHost.cs.meta b/Assets/Scripts/NetHost.cs.meta index 2ce81c7..49f7f4e 100644 --- a/Assets/Scripts/NetHost.cs.meta +++ b/Assets/Scripts/NetHost.cs.meta @@ -4,7 +4,7 @@ externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 200 icon: {instanceID: 0} userData: assetBundleName: diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index e3e5532..891b73b 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -22,6 +22,8 @@ m_Component: - component: {fileID: 1845617020408148629} - component: {fileID: 2647236827943958594} + - component: {fileID: 8076821645923605816} + - component: {fileID: 446445004819590403} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -59,6 +61,41 @@ m_EditorClassIdentifier: PlayerID: 0 ItemID: 0 + ItemRoot: {fileID: 0} + Type: + DeleteOnDisconnect: 1 +--- !u!114 &8076821645923605816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fac14d91eb200479e945e56930d545, type: 3} + m_Name: + m_EditorClassIdentifier: + ForceLocal: 0 + Speed: 8 +--- !u!143 &446445004819590403 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.37 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.26, z: 0} --- !u!1 &1845617020995435925 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +184,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845617020995435925} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -164,6 +201,11 @@ propertyPath: m_Name value: CastLight objectReference: {fileID: 0} + - target: {fileID: 7996748540272408192, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7996748540272408193, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index f43129a..4bcb9b4 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -989,7 +989,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088763451 GameObject: @@ -1120,7 +1120,7 @@ - {fileID: 1088763452} - {fileID: 228536900} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1668528467 GameObject: @@ -1353,7 +1353,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2071196361 GameObject: @@ -1448,72 +1448,3 @@ m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1845617019786728178 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.91 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.02 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.8 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148631, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 20538681c6e8e81459a344bc7ad46234, type: 3} diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index f7373e1..e301823 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -28,15 +28,36 @@ netHost = FindObjectOfType(); } + private Vector3 lastPos; + void Start() + { + UpdateLastAutoProps(); + + } + + private void UpdateLastAutoProps() + { + lastPos = RootTransform.position; + } + public bool IsLocal { - get { return PlayerID == netHost.LocalPlayerID; } + get { return netHost == null || PlayerID == netHost.LocalPlayerID; } } // Update is called once per frame void Update() { - + CheckAutoProps(); + } + + private void CheckAutoProps() + { + if (netHost != null && lastPos != RootTransform.position) + { + netHost.SendItemUpdate(this); + } + UpdateLastAutoProps(); } public Transform RootTransform diff --git a/Assets/Scripts/Item.cs.meta b/Assets/Scripts/Item.cs.meta index b142fc6..0296c79 100644 --- a/Assets/Scripts/Item.cs.meta +++ b/Assets/Scripts/Item.cs.meta @@ -4,7 +4,7 @@ externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/NetHost.cs b/Assets/Scripts/NetHost.cs index 6bbb804..66eb5fd 100644 --- a/Assets/Scripts/NetHost.cs +++ b/Assets/Scripts/NetHost.cs @@ -164,6 +164,8 @@ SendItemUpdate(item); + items[item.Key] = item; + return item; } @@ -203,6 +205,8 @@ item.gameObject.SendMessage("StartRemote", null, SendMessageOptions.DontRequireReceiver); item.UpdateFromData(itemData); + + items[item.Key] = item; } else { diff --git a/Assets/Scripts/NetHost.cs.meta b/Assets/Scripts/NetHost.cs.meta index 2ce81c7..49f7f4e 100644 --- a/Assets/Scripts/NetHost.cs.meta +++ b/Assets/Scripts/NetHost.cs.meta @@ -4,7 +4,7 @@ externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 200 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Shaders/Standard.mat b/Assets/Shaders/Standard.mat index 68fba6b..6c99964 100644 --- a/Assets/Shaders/Standard.mat +++ b/Assets/Shaders/Standard.mat @@ -61,9 +61,9 @@ - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.117 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.404 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -73,5 +73,5 @@ - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.6320754, g: 0.3056324, b: 0.11031505, a: 1} + - _Color: {r: 0.4528302, g: 0.16023806, b: 0.1516554, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/.gitignore b/.gitignore index 65afa32..b9acb70 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +BuildPC # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Editor/PostBuildActions.cs b/Assets/Editor/PostBuildActions.cs index 4757ced..27dfd26 100755 --- a/Assets/Editor/PostBuildActions.cs +++ b/Assets/Editor/PostBuildActions.cs @@ -10,9 +10,12 @@ [PostProcessBuild] public static void OnPostProcessBuild(BuildTarget target, string targetPath) { - var path = Path.Combine(targetPath, "Build/UnityLoader.js"); - var text = File.ReadAllText(path); - text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); - File.WriteAllText(path, text); + if (target == BuildTarget.WebGL) + { + var path = Path.Combine(targetPath, "Build/UnityLoader.js"); + var text = File.ReadAllText(path); + text = text.Replace("UnityLoader.SystemInfo.mobile", "false"); + File.WriteAllText(path, text); + } } } \ No newline at end of file diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index e3e5532..891b73b 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -22,6 +22,8 @@ m_Component: - component: {fileID: 1845617020408148629} - component: {fileID: 2647236827943958594} + - component: {fileID: 8076821645923605816} + - component: {fileID: 446445004819590403} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -59,6 +61,41 @@ m_EditorClassIdentifier: PlayerID: 0 ItemID: 0 + ItemRoot: {fileID: 0} + Type: + DeleteOnDisconnect: 1 +--- !u!114 &8076821645923605816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fac14d91eb200479e945e56930d545, type: 3} + m_Name: + m_EditorClassIdentifier: + ForceLocal: 0 + Speed: 8 +--- !u!143 &446445004819590403 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845617020408148631} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Height: 1.37 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: -0.26, z: 0} --- !u!1 &1845617020995435925 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +184,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845617020995435925} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -164,6 +201,11 @@ propertyPath: m_Name value: CastLight objectReference: {fileID: 0} + - target: {fileID: 7996748540272408192, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7996748540272408193, guid: 6150feaa57b82fc41b4cf5adc7a7dd91, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index f43129a..4bcb9b4 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -989,7 +989,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088763451 GameObject: @@ -1120,7 +1120,7 @@ - {fileID: 1088763452} - {fileID: 228536900} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1668528467 GameObject: @@ -1353,7 +1353,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2071196361 GameObject: @@ -1448,72 +1448,3 @@ m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1845617019786728178 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.91 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.02 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.8 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148629, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1845617020408148631, guid: 20538681c6e8e81459a344bc7ad46234, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 20538681c6e8e81459a344bc7ad46234, type: 3} diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index f7373e1..e301823 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -28,15 +28,36 @@ netHost = FindObjectOfType(); } + private Vector3 lastPos; + void Start() + { + UpdateLastAutoProps(); + + } + + private void UpdateLastAutoProps() + { + lastPos = RootTransform.position; + } + public bool IsLocal { - get { return PlayerID == netHost.LocalPlayerID; } + get { return netHost == null || PlayerID == netHost.LocalPlayerID; } } // Update is called once per frame void Update() { - + CheckAutoProps(); + } + + private void CheckAutoProps() + { + if (netHost != null && lastPos != RootTransform.position) + { + netHost.SendItemUpdate(this); + } + UpdateLastAutoProps(); } public Transform RootTransform diff --git a/Assets/Scripts/Item.cs.meta b/Assets/Scripts/Item.cs.meta index b142fc6..0296c79 100644 --- a/Assets/Scripts/Item.cs.meta +++ b/Assets/Scripts/Item.cs.meta @@ -4,7 +4,7 @@ externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/NetHost.cs b/Assets/Scripts/NetHost.cs index 6bbb804..66eb5fd 100644 --- a/Assets/Scripts/NetHost.cs +++ b/Assets/Scripts/NetHost.cs @@ -164,6 +164,8 @@ SendItemUpdate(item); + items[item.Key] = item; + return item; } @@ -203,6 +205,8 @@ item.gameObject.SendMessage("StartRemote", null, SendMessageOptions.DontRequireReceiver); item.UpdateFromData(itemData); + + items[item.Key] = item; } else { diff --git a/Assets/Scripts/NetHost.cs.meta b/Assets/Scripts/NetHost.cs.meta index 2ce81c7..49f7f4e 100644 --- a/Assets/Scripts/NetHost.cs.meta +++ b/Assets/Scripts/NetHost.cs.meta @@ -4,7 +4,7 @@ externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 200 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Shaders/Standard.mat b/Assets/Shaders/Standard.mat index 68fba6b..6c99964 100644 --- a/Assets/Shaders/Standard.mat +++ b/Assets/Shaders/Standard.mat @@ -61,9 +61,9 @@ - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.117 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.404 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -73,5 +73,5 @@ - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.6320754, g: 0.3056324, b: 0.11031505, a: 1} + - _Color: {r: 0.4528302, g: 0.16023806, b: 0.1516554, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f389349..446a7e3 100755 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -80,7 +80,7 @@ bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 @@ -91,7 +91,7 @@ xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0