diff --git a/Assets/01.Scenes/04.TycoonTest.unity b/Assets/01.Scenes/04.TycoonTest.unity index cd4d3f168..812550330 100644 --- a/Assets/01.Scenes/04.TycoonTest.unity +++ b/Assets/01.Scenes/04.TycoonTest.unity @@ -115337,7 +115337,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: gridEditorMode: 2 - buildableGridObjectTypeSOList: [] + buildableGridObjectTypeSOList: + - {fileID: 11400000, guid: db38344e6a3f47245936c7801e21da4a, type: 2} + - {fileID: 11400000, guid: 3ca29f507bc64be49b297cead4c98d9c, type: 2} buildableEdgeObjectTypeSOList: [] buildableFreeObjectTypeSOList: [] gridAxis: 0 @@ -115468,6 +115470,7 @@ GameObject: - component: {fileID: 1058630011848233343} - component: {fileID: 1058630011848233328} - component: {fileID: 1058630011848233331} + - component: {fileID: 1058630011848233344} m_Layer: 31 m_Name: EGB Pro Grid XZ m_TagString: Grid @@ -115490,6 +115493,19 @@ Transform: m_Children: [] m_Father: {fileID: 3395727475779132006} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1058630011848233344 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1058630011848233341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 062ac134069421b47a82646846b3dc3f, type: 3} + m_Name: + m_EditorClassIdentifier: + gridBuilder: {fileID: 1058630011848233328} --- !u!222 &1083735922034247184 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/BlueWater/Sail/ShipMove.cs b/Assets/02.Scripts/BlueWater/Sail/ShipMove.cs index 69351c735..97f4df9c3 100644 --- a/Assets/02.Scripts/BlueWater/Sail/ShipMove.cs +++ b/Assets/02.Scripts/BlueWater/Sail/ShipMove.cs @@ -14,6 +14,9 @@ namespace BlueWater public float speed = 50.0f; protected float force = 0.0f; public float force_add = 0.002f; + + [SerializeField] + private float rotate_speed = 1.0f; [SerializeField] private ParticleSystem Rings; @@ -68,15 +71,15 @@ namespace BlueWater if (Input.GetKey(KeyCode.RightArrow)|| Input.GetKey(KeyCode.H)) { - obj.transform.Rotate(new Vector3(0.0f, speed * Time.deltaTime , 0.0f)); + obj.transform.Rotate(new Vector3(0.0f, speed * Time.deltaTime * rotate_speed , 0.0f)); } else if (Input.GetKey(KeyCode.LeftArrow)|| Input.GetKey(KeyCode.F)) { - obj.transform.Rotate(new Vector3(0.0f, speed * -Time.deltaTime , 0.0f)); + obj.transform.Rotate(new Vector3(0.0f, speed * -Time.deltaTime * rotate_speed, 0.0f)); } else { - obj.transform.Rotate(new Vector3(0.0f, 0.0f * Time.deltaTime , 0.0f)); + obj.transform.Rotate(new Vector3(0.0f, 0.0f * Time.deltaTime * rotate_speed, 0.0f)); } } diff --git a/Assets/02.Scripts/DDD/Prop/Buildable.meta b/Assets/02.Scripts/DDD/Prop/Buildable.meta new file mode 100644 index 000000000..c68b901d2 --- /dev/null +++ b/Assets/02.Scripts/DDD/Prop/Buildable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 363342e54a8ca0243b3794a22065bc94 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/DDD/Prop/Buildable/ChangeBuildMode.cs b/Assets/02.Scripts/DDD/Prop/Buildable/ChangeBuildMode.cs new file mode 100644 index 000000000..ce92cb6e7 --- /dev/null +++ b/Assets/02.Scripts/DDD/Prop/Buildable/ChangeBuildMode.cs @@ -0,0 +1,28 @@ +using SoulGames.EasyGridBuilderPro; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +public class ChangeBuildMode : MonoBehaviour +{ + [SerializeField] + private EasyGridBuilderPro gridBuilder; + + // Update is called once per frame + void Update() + { + if (Input.GetKeyDown(KeyCode.R)) + { + if (gridBuilder.showEditorAndRuntimeCanvasGrid) + { + gridBuilder.showEditorAndRuntimeCanvasGrid = false; + // bloomEffect.tint.value = orgColor; + } + else + { + gridBuilder.showEditorAndRuntimeCanvasGrid = true; + // bloomEffect.tint.value = new Color(0.0f , 0.0f, 0.0f); + } + } + } +} diff --git a/Assets/02.Scripts/DDD/Prop/Buildable/ChangeBuildMode.cs.meta b/Assets/02.Scripts/DDD/Prop/Buildable/ChangeBuildMode.cs.meta new file mode 100644 index 000000000..3a3ad1c48 --- /dev/null +++ b/Assets/02.Scripts/DDD/Prop/Buildable/ChangeBuildMode.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 062ac134069421b47a82646846b3dc3f \ No newline at end of file