From 6132d2b72f96ea7d8e5bf4a0e92e35f06913d508 Mon Sep 17 00:00:00 2001 From: Bernard Laptop Date: Thu, 31 Jan 2019 16:47:08 +1100 Subject: [PATCH 1/2] Removed a debug from ym end --- Assets/AmplifyShaderEditor/Examples/Official.meta | 8 -------- .../Plugins/EditorResources/Templates.meta | 8 -------- Assets/Scipts/PlayerControllers/RemotePlayer.cs | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta diff --git a/Assets/AmplifyShaderEditor/Examples/Official.meta b/Assets/AmplifyShaderEditor/Examples/Official.meta deleted file mode 100644 index 15d9465..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d32786c99caa66e41baea4ab6d1c1cb8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta deleted file mode 100644 index 9cf984b..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 211faf49d0bea6c4081e4e1135d19686 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scipts/PlayerControllers/RemotePlayer.cs b/Assets/Scipts/PlayerControllers/RemotePlayer.cs index d72c69c..a6a4474 100644 --- a/Assets/Scipts/PlayerControllers/RemotePlayer.cs +++ b/Assets/Scipts/PlayerControllers/RemotePlayer.cs @@ -33,7 +33,7 @@ public class RemotePlayer : Player { float setSpeed = Mathf.Lerp(LastSpeed, DesiredSpeed, 0.1f); Animator.SetFloat("WalkSpeed", setSpeed); - Debug.Log(setSpeed); + //Debug.Log(setSpeed); LastSpeed = setSpeed; PlayerModel.transform.LookAt(PlayerModel.transform.position + dir, Vector3.up); From 52697ea13852452db82afab2980515b4636dda89 Mon Sep 17 00:00:00 2001 From: Bernard Laptop Date: Thu, 31 Jan 2019 17:03:01 +1100 Subject: [PATCH 2/2] Fixed veggie issue --- .../{HD SRP Samples.unitypackage.meta => Official.meta} | 3 ++- .../CustomRTRain.meta} | 3 ++- ...om RT Samples.unitypackage.meta => SimpleTerrain.meta} | 3 ++- ...rassWindToTerrain.unitypackage.meta => Substance.meta} | 3 ++- .../Substance/LegacySubstanceExample.unitypackage.meta | 7 ------- .../Examples/Official/Substance2018.meta | 8 ++++++++ .../Substance2018/Substance2018.unitypackage.meta | 7 ------- .../Plugins/EditorResources/Templates.meta | 8 ++++++++ .../Templates/CustomRTTemplates.unitypackage.meta | 7 ------- .../Plugins/EditorResources/Templates/SRP.meta | 8 ++++++++ .../SRP/HDSRPTemplates (Legacy).unitypackage.meta | 7 ------- .../Templates/SRP/HDSRPTemplates.unitypackage.meta | 7 ------- .../SRP/LWSRPTemplates (Legacy).unitypackage.meta | 7 ------- .../Templates/SRP/LWSRPTemplates.unitypackage.meta | 7 ------- Assets/Scipts/Recipe.cs | 1 - Assets/Scipts/UI/LobbyUIController.cs | 1 + 16 files changed, 33 insertions(+), 54 deletions(-) rename Assets/AmplifyShaderEditor/Examples/{HD SRP Samples.unitypackage.meta => Official.meta} (67%) rename Assets/AmplifyShaderEditor/Examples/{LW SRP Samples.unitypackage.meta => Official/CustomRTRain.meta} (67%) rename Assets/AmplifyShaderEditor/Examples/Official/{CustomRTRain/Custom RT Samples.unitypackage.meta => SimpleTerrain.meta} (67%) rename Assets/AmplifyShaderEditor/Examples/Official/{SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta => Substance.meta} (67%) delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta diff --git a/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta rename to Assets/AmplifyShaderEditor/Examples/Official.meta index 872a1e1..15d9465 100644 --- a/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta +++ b/Assets/AmplifyShaderEditor/Examples/Official.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: d1c0b77896049554fa4b635531caf741 +guid: d32786c99caa66e41baea4ab6d1c1cb8 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta rename to Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta index 74eb369..2d0c900 100644 --- a/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta +++ b/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 6ecbfd0a046659943a69328c98ff0442 +guid: 917f314cd7500ab41a37e0c60edaf755 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta rename to Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta index 5b4b6c6..d50bf8c 100644 --- a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta +++ b/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 88dfe89a073bdf748bf05396f5285cdd +guid: e14f9199031928442a76fcb851644355 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta rename to Assets/AmplifyShaderEditor/Examples/Official/Substance.meta index f13afd9..68bce78 100644 --- a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta +++ b/Assets/AmplifyShaderEditor/Examples/Official/Substance.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 11f44bcb01ea56742bb7177b439b1a4f +guid: 3a1c9292d8fac714e9091922355abcd7 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta deleted file mode 100644 index 5417a54..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 490e8164148c52c468b633dcc1c12d57 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta new file mode 100644 index 0000000..2a2c78c --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50c3f69bf74856340867f04dd9288b24 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta deleted file mode 100644 index bed3c3e..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: af7de8b91a27c254fa1bd24c01ae6e8e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta new file mode 100644 index 0000000..9cf984b --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 211faf49d0bea6c4081e4e1135d19686 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta deleted file mode 100644 index 1e0464d..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 191365b4aece81443875ae2bb7243b55 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta new file mode 100644 index 0000000..7e6002c --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc9e432e1a0a4764f80870c080173cb7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta deleted file mode 100644 index 2d96284..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4dc1afbcc68875c4780502f5e6b80158 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta deleted file mode 100644 index e51ee6d..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9a5e61a8b3421b944863d0946e32da0a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta deleted file mode 100644 index 8a216b9..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b53d2f3b156ff104f90d4d7693d769c8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta deleted file mode 100644 index 0f3221b..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c816894a3147d343891060451241bfe -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scipts/Recipe.cs b/Assets/Scipts/Recipe.cs index 5b508a2..ad6024e 100644 --- a/Assets/Scipts/Recipe.cs +++ b/Assets/Scipts/Recipe.cs @@ -93,7 +93,6 @@ public class Recipe : MonoBehaviour { IEnumerator ItemLookup(string VeggieName, int change) { - Debug.Log("Veggie" + VeggieName + " " + change); for (int i = 0; i < Veggies.Length; i++) { if(Veggies[i].Name == VeggieName) diff --git a/Assets/Scipts/UI/LobbyUIController.cs b/Assets/Scipts/UI/LobbyUIController.cs index f2488f9..ebd1a61 100644 --- a/Assets/Scipts/UI/LobbyUIController.cs +++ b/Assets/Scipts/UI/LobbyUIController.cs @@ -7,5 +7,6 @@ public class LobbyUIController : MonoBehaviour { public void OnClickStartGame() { Multiplayer.ClientManager.Instance.SendMessage(Multiplayer.PlayerMsgID.GameStart, new Multiplayer.PlayerMsg(Multiplayer.ClientManager.Instance.ID)); + Multiplayer.PlayersManager.Instance.LocalPlayer.GetComponent().heldVeggie = null; } }