diff --git a/Assets/Materials/UI/Instruction_01.shmat b/Assets/Materials/UI/Instruction_01.shmat new file mode 100644 index 00000000..bbcb6352 --- /dev/null +++ b/Assets/Materials/UI/Instruction_01.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 62200943 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UI/Instruction_01.shmat.shmeta b/Assets/Materials/UI/Instruction_01.shmat.shmeta new file mode 100644 index 00000000..a7a5e4d8 --- /dev/null +++ b/Assets/Materials/UI/Instruction_01.shmat.shmeta @@ -0,0 +1,3 @@ +Name: Instruction_01 +ID: 124926341 +Type: 7 diff --git a/Assets/Materials/UI/Instruction_02.shmat b/Assets/Materials/UI/Instruction_02.shmat new file mode 100644 index 00000000..3084049a --- /dev/null +++ b/Assets/Materials/UI/Instruction_02.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 53303669 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UI/Instruction_02.shmat.shmeta b/Assets/Materials/UI/Instruction_02.shmat.shmeta new file mode 100644 index 00000000..dfc296f8 --- /dev/null +++ b/Assets/Materials/UI/Instruction_02.shmat.shmeta @@ -0,0 +1,3 @@ +Name: Instruction_02 +ID: 128721520 +Type: 7 diff --git a/Assets/Materials/UI/Instruction_03.shmat b/Assets/Materials/UI/Instruction_03.shmat new file mode 100644 index 00000000..b548319f --- /dev/null +++ b/Assets/Materials/UI/Instruction_03.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 61780097 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UI/Instruction_03.shmat.shmeta b/Assets/Materials/UI/Instruction_03.shmat.shmeta new file mode 100644 index 00000000..46aa5270 --- /dev/null +++ b/Assets/Materials/UI/Instruction_03.shmat.shmeta @@ -0,0 +1,3 @@ +Name: Instruction_03 +ID: 124482180 +Type: 7 diff --git a/Assets/Materials/UI/Instruction_04.shmat b/Assets/Materials/UI/Instruction_04.shmat new file mode 100644 index 00000000..dba0a45d --- /dev/null +++ b/Assets/Materials/UI/Instruction_04.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 59178524 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UI/Instruction_04.shmat.shmeta b/Assets/Materials/UI/Instruction_04.shmat.shmeta new file mode 100644 index 00000000..728abc0a --- /dev/null +++ b/Assets/Materials/UI/Instruction_04.shmat.shmeta @@ -0,0 +1,3 @@ +Name: Instruction_04 +ID: 129768803 +Type: 7 diff --git a/Assets/Materials/UI/UIMat_Slider.shmat b/Assets/Materials/UI/UIMat_Slider.shmat index ec792a29..fc28932a 100644 --- a/Assets/Materials/UI/UIMat_Slider.shmat +++ b/Assets/Materials/UI/UIMat_Slider.shmat @@ -4,7 +4,7 @@ Properties: data.color: {x: 1, y: 1, z: 1, w: 1} data.textureIndex: 64651793 - data.alpha: 0 + data.alpha: 1 data.beta: {x: 1, y: 1, z: 1} data.sliderThreshold: 1 data.sliderStartColor: {x: 0, y: 1, z: 0, w: 1} diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 7b6e653b..80491f72 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -60,7 +60,7 @@ - Type: SHADE_Scripting.UI.ButtonFX Enabled: true onHoverEnterSound: event:/Music/player_undetected - onHoverExitSound: event:/Music/player_undetected + onHoverExitSound: "event:/Music/player_undetected\x00���������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������" onClickSound: event:/Music/player_undetected onReleaseSound: event:/Music/player_undetected hoverScale: 1.10000002 @@ -148,9 +148,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 52901020 - Hovered Texture: 62235279 - Clicked Texture: 64722619 + Default Texture: 65084899 + Hovered Texture: 58647112 + Clicked Texture: 55758383 IsActive: true UI Component: Canvas ID: 0 @@ -235,6 +235,9 @@ onReleaseSound: event:/Music/player_undetected hoverScale: 1.10000002 clickScale: 0.899999976 + - Type: SHADE_Scripting.UI.ChangeCanvasButton + Enabled: true + canvasToActivate: 19 - EID: 12 Name: Game Icon IsActive: true @@ -243,7 +246,7 @@ Transform Component: Translate: {x: -700, y: 350, z: 0.300000012} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 300, y: 300, z: 1} + Scale: {x: 355.756439, y: 355.756439, z: 1.18585491} IsActive: true Renderable Component: Mesh: 141771688 @@ -317,7 +320,7 @@ - EID: 13 Name: How To Play Canvas IsActive: false - NumberOfChildren: 1 + NumberOfChildren: 5 Components: Canvas Component: Canvas Width: 1920 @@ -344,4 +347,672 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ \ No newline at end of file + Scripts: ~ +- EID: 15 + Name: Instruction Image + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0.400000006} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1344, y: 756, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 124926341 + IsActive: true + UI Component: + Canvas ID: 13 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.MultiImageList + Enabled: true + imageAssetList: + - 124926341 + - 128721520 + - 124482180 + - 129768803 +- EID: 16 + Name: NextButton + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 800, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129340704 + IsActive: true + Button Component: + Default Texture: 0 + Hovered Texture: 0 + Clicked Texture: 0 + IsActive: true + UI Component: + Canvas ID: 13 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.MultiImageListControlButton + Enabled: true + isNext: true + multiImageList: 15 +- EID: 17 + Name: PrevButton + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -800, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129340704 + IsActive: true + Button Component: + Default Texture: 0 + Hovered Texture: 0 + Clicked Texture: 0 + IsActive: true + UI Component: + Canvas ID: 13 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.MultiImageListControlButton + Enabled: true + isNext: false + multiImageList: 15 +- EID: 18 + Name: BackButton + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -800, y: 450, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129340704 + IsActive: true + Button Component: + Default Texture: 0 + Hovered Texture: 0 + Clicked Texture: 0 + IsActive: true + UI Component: + Canvas ID: 13 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.ChangeCanvasButton + Enabled: true + canvasToActivate: 0 +- EID: 19 + Name: Options Canvas + IsActive: false + NumberOfChildren: 11 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: false + Scripts: ~ +- EID: 20 + Name: BackGround + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 1} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: false + Renderable Component: + Mesh: 141771688 + Material: 121834459 + IsActive: false + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: false + Scripts: ~ +- EID: 21 + Name: BackButton + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -800, y: 450, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129340704 + IsActive: true + Button Component: + Default Texture: 0 + Hovered Texture: 0 + Clicked Texture: 0 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.ChangeCanvasButton + Enabled: true + canvasToActivate: 0 +- EID: 22 + Name: Options Title Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -150, y: 400, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 1} + IsActive: true + Text Renderer Component: + Text: Options + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 23 + Name: Audio Title Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -900, y: 300, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 1} + IsActive: true + Text Renderer Component: + Text: Audio + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 25 + Name: Audio Text Group + IsActive: true + NumberOfChildren: 3 + Components: + Transform Component: + Translate: {x: -900, y: 200, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 24 + Name: Master Volume Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: Master + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 26 + Name: SFX Volume Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: SFX + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 27 + Name: BGM Volume Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -200, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: BGM + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 28 + Name: Audio Slider Group + IsActive: true + NumberOfChildren: 3 + Components: + Transform Component: + Translate: {x: 100, y: 225, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 29 + Name: Master Volume Slider + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1000, y: 75, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 128676209 + IsActive: true + Slider Component: + Slider Value: 0 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 30 + Name: SFX Volume Slider + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1000, y: 75, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 128676209 + IsActive: true + Slider Component: + Slider Value: 0 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 31 + Name: BGM Volume Slider + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -200, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1000, y: 75, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 128676209 + IsActive: true + Slider Component: + Slider Value: 0 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 32 + Name: Camera Title Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -900, y: -120, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 1} + IsActive: true + Text Renderer Component: + Text: Camera + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 33 + Name: Camera Text Group + IsActive: true + NumberOfChildren: 2 + Components: + Transform Component: + Translate: {x: -900, y: -220, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 34 + Name: FOV Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: FOV + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 35 + Name: Sensitivity Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: Sensitivity + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 36 + Name: Camera Slider Group + IsActive: true + NumberOfChildren: 2 + Components: + Transform Component: + Translate: {x: 100, y: -200, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 37 + Name: FOV Slider + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1000, y: 75, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 128676209 + IsActive: true + Slider Component: + Slider Value: 0 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 38 + Name: Sensitivity Slider + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1000, y: 75, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 128676209 + IsActive: true + Slider Component: + Slider Value: 0 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 39 + Name: Audio Slider Text Group + IsActive: true + NumberOfChildren: 3 + Components: + Transform Component: + Translate: {x: 700, y: 200, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 40 + Name: Master Volume Slider Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: 100 + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SliderText + Enabled: true + sliderObj: 29 + minValue: 0 + maxValue: 100 +- EID: 41 + Name: SFX Volume Slider Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: 100 + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SliderText + Enabled: true + sliderObj: 30 + minValue: 0 + maxValue: 100 +- EID: 42 + Name: BGM Volume Slider Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -200, z: 0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: 100 + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SliderText + Enabled: true + sliderObj: 31 + minValue: 0 + maxValue: 100 +- EID: 43 + Name: Camera Slider Text Group + IsActive: true + NumberOfChildren: 2 + Components: + Transform Component: + Translate: {x: 700, y: -225, z: -0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 44 + Name: FOV Slider Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: 100 + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SliderText + Enabled: true + sliderObj: 37 + minValue: 0 + maxValue: 100 +- EID: 45 + Name: Sensitivity Slider Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: 100 + Font: 176667660 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SliderText + Enabled: true + sliderObj: 38 + minValue: 0 + maxValue: 100 \ No newline at end of file diff --git a/Assets/Scripts/UI/SC_ButtonFX.cs b/Assets/Scripts/UI/SC_ButtonFX.cs index 9d75735f..bf248724 100644 --- a/Assets/Scripts/UI/SC_ButtonFX.cs +++ b/Assets/Scripts/UI/SC_ButtonFX.cs @@ -53,25 +53,29 @@ namespace SHADE_Scripting.UI ui.OnClick.RegisterAction(() => { - onClickACHandler.Play(); + if (onClickSound != "") + onClickACHandler.Play(); transform.LocalScale = defaultScale * clickScale; }); ui.OnRelease.RegisterAction(() => { - onReleaseACHandler.Play(); + if (onReleaseSound != "") + onReleaseACHandler.Play(); transform.LocalScale = defaultScale; }); ui.OnHoverEnter.RegisterAction(() => { - onHoverEnterACHandler.Play(); + if(onHoverEnterSound != "") + onHoverEnterACHandler.Play(); transform.LocalScale = defaultScale * hoverScale; }); ui.OnHoverExit.RegisterAction(() => { - onHoverExitACHandler.Play(); + if (onHoverExitSound != "") + onHoverExitACHandler.Play(); transform.LocalScale = defaultScale; }); diff --git a/Assets/Scripts/UI/SC_ChangeCanvasButton.cs b/Assets/Scripts/UI/SC_ChangeCanvasButton.cs index 98ee3a73..2c8a5df4 100644 --- a/Assets/Scripts/UI/SC_ChangeCanvasButton.cs +++ b/Assets/Scripts/UI/SC_ChangeCanvasButton.cs @@ -13,11 +13,6 @@ namespace SHADE_Scripting.UI public GameObject canvasToActivate; protected override void awake() - { - - } - - protected override void start() { //if (canvasToActivate.GetComponent() == null) // return; @@ -25,12 +20,18 @@ namespace SHADE_Scripting.UI ui.OnRelease.RegisterAction(() => { Canvas.DeactivateAllCanvas(); - + canvasToActivate.SetActive(true); - Debug.Log("CANVAS CHANGED "); + }); } + protected override void start() + { + + + } + protected override void update() { diff --git a/Assets/Scripts/UI/SC_MultiImageList.cs b/Assets/Scripts/UI/SC_MultiImageList.cs new file mode 100644 index 00000000..d6f2379c --- /dev/null +++ b/Assets/Scripts/UI/SC_MultiImageList.cs @@ -0,0 +1,51 @@ +using SHADE; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SHADE_Scripting.UI +{ + public class MultiImageList:Script + { + public List imageAssetList = new List(); + [NonSerialized] + private int index = 0; + + + protected override void awake() + { + } + + protected override void start() + { + + } + + public void NextImage() + { + ++index; + if(index >= imageAssetList.Count()) + { + index = 0; + } + + Renderable rend = GetComponent(); + rend.SetMaterial(imageAssetList[index]); + + } + + public void PrevImage() + { + if (index == 0) + index = imageAssetList.Count(); + --index; + + Renderable rend = GetComponent(); + rend.SetMaterial(imageAssetList[index]); + } + + + } +} diff --git a/Assets/Scripts/UI/SC_MultiImageList.cs.shmeta b/Assets/Scripts/UI/SC_MultiImageList.cs.shmeta new file mode 100644 index 00000000..ec795cba --- /dev/null +++ b/Assets/Scripts/UI/SC_MultiImageList.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_MultiImageList +ID: 166320642 +Type: 9 diff --git a/Assets/Scripts/UI/SC_MultiImageListControlButton.cs b/Assets/Scripts/UI/SC_MultiImageListControlButton.cs new file mode 100644 index 00000000..4ec50dd4 --- /dev/null +++ b/Assets/Scripts/UI/SC_MultiImageListControlButton.cs @@ -0,0 +1,40 @@ +using SHADE; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SHADE_Scripting.UI +{ + public class MultiImageListControlButton: Script + { + public bool isNext = true; + public GameObject multiImageList; + + protected override void awake() + { + + UIElement ui = GetComponent(); + if (ui != null) + { + ui.OnRelease.RegisterAction(() => + { + + MultiImageList imageList = multiImageList.GetScript(); + if(imageList != null) + { + + if (isNext) + imageList.NextImage(); + else + imageList.PrevImage(); + + } + + }); + } + } + + } +} diff --git a/Assets/Scripts/UI/SC_MultiImageListControlButton.cs.shmeta b/Assets/Scripts/UI/SC_MultiImageListControlButton.cs.shmeta new file mode 100644 index 00000000..5096e110 --- /dev/null +++ b/Assets/Scripts/UI/SC_MultiImageListControlButton.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_MultiImageListControlButton +ID: 164209885 +Type: 9 diff --git a/Assets/Scripts/UI/SC_SliderText.cs b/Assets/Scripts/UI/SC_SliderText.cs new file mode 100644 index 00000000..f2a8c8a4 --- /dev/null +++ b/Assets/Scripts/UI/SC_SliderText.cs @@ -0,0 +1,31 @@ +using SHADE; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SHADE_Scripting.UI +{ + public class SliderText:Script + { + public GameObject sliderObj; + + public int minValue = 0; + public int maxValue = 0; + + + protected override void update() + { + Slider slider = sliderObj.GetComponent(); + TextRenderable text = GetComponent(); + if(slider != null && text != null) + { + Debug.Log("SETTING TEXT"); + text.Text = (slider.GetValue() * (maxValue - minValue) + minValue).ToString(); + } + } + + + } +} diff --git a/Assets/Scripts/UI/SC_SliderText.cs.shmeta b/Assets/Scripts/UI/SC_SliderText.cs.shmeta new file mode 100644 index 00000000..298bd246 --- /dev/null +++ b/Assets/Scripts/UI/SC_SliderText.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_SliderText +ID: 158412308 +Type: 9 diff --git a/Assets/Shaders/UI_Slider_FS.shshaderb b/Assets/Shaders/UI_Slider_FS.shshaderb index 40e321f8..3d340d37 100644 Binary files a/Assets/Shaders/UI_Slider_FS.shshaderb and b/Assets/Shaders/UI_Slider_FS.shshaderb differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_01.dds b/Assets/Texture/UI/TX_WK10_HowToPlay_01.dds new file mode 100644 index 00000000..cc1d68b6 Binary files /dev/null and b/Assets/Texture/UI/TX_WK10_HowToPlay_01.dds differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex b/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex new file mode 100644 index 00000000..061d84c8 Binary files /dev/null and b/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex.shmeta b/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex.shmeta new file mode 100644 index 00000000..fcd72302 --- /dev/null +++ b/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_WK10_HowToPlay_01 +ID: 62200943 +Type: 3 diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_02.dds b/Assets/Texture/UI/TX_WK10_HowToPlay_02.dds new file mode 100644 index 00000000..38ea5b30 Binary files /dev/null and b/Assets/Texture/UI/TX_WK10_HowToPlay_02.dds differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex b/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex new file mode 100644 index 00000000..3fa62e86 Binary files /dev/null and b/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex.shmeta b/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex.shmeta new file mode 100644 index 00000000..56e9b58a --- /dev/null +++ b/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_WK10_HowToPlay_02 +ID: 53303669 +Type: 3 diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_03.dds b/Assets/Texture/UI/TX_WK10_HowToPlay_03.dds new file mode 100644 index 00000000..ac8adee9 Binary files /dev/null and b/Assets/Texture/UI/TX_WK10_HowToPlay_03.dds differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex b/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex new file mode 100644 index 00000000..826d87b2 Binary files /dev/null and b/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex.shmeta b/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex.shmeta new file mode 100644 index 00000000..c190e6d8 --- /dev/null +++ b/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_WK10_HowToPlay_03 +ID: 61780097 +Type: 3 diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_04.dds b/Assets/Texture/UI/TX_WK10_HowToPlay_04.dds new file mode 100644 index 00000000..66298f3a Binary files /dev/null and b/Assets/Texture/UI/TX_WK10_HowToPlay_04.dds differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex b/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex new file mode 100644 index 00000000..3d6504b1 Binary files /dev/null and b/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex.shmeta b/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex.shmeta new file mode 100644 index 00000000..df21f174 --- /dev/null +++ b/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_WK10_HowToPlay_04 +ID: 59178524 +Type: 3 diff --git a/SHADE_Managed/Canvas.hxx b/SHADE_Managed/Canvas.hxx index d9e1ca79..a17d4bb2 100644 --- a/SHADE_Managed/Canvas.hxx +++ b/SHADE_Managed/Canvas.hxx @@ -1,9 +1,9 @@ /************************************************************************************//*! -\file UIElement.hxx -\author Tng Kah Wei, kahwei.tng, 390009620 -\par email: kahwei.tng\@digipen.edu -\date Jan 30, 2023 -\brief Contains the definition of the managed UIElement class with the +\file Canvas.hxx +\author Daniel Chua, 2001877 +\par email: yeechendaniel/@digipen.edu +\date Feb 26, 2023 +\brief Contains the definition of the managed Canvas class with the declaration of functions for working with it. Note: This file is written in C++17/CLI. @@ -24,7 +24,7 @@ of DigiPen Institute of Technology is prohibited. namespace SHADE { /// - /// CLR version of the SHADE Engine's SHUIComponent. + /// CLR version of the SHADE Engine's SHCanvasComponent. /// public ref class Canvas : public Component { diff --git a/SHADE_Managed/Slider.cxx b/SHADE_Managed/Slider.cxx new file mode 100644 index 00000000..163a33a3 --- /dev/null +++ b/SHADE_Managed/Slider.cxx @@ -0,0 +1,26 @@ +// Precompiled Headers +#include "SHpch.h" +// Primary Header +#include "Slider.hxx" +#include "Assets/NativeAsset.hxx" +#include "Utility/Convert.hxx" +#include "Utility/Debug.hxx" + + +#include "ECS_Base/Managers/SHSystemManager.h" +#include "UI/SHUISystem.h" + + +namespace SHADE +{ + Slider::Slider(Entity entity) + : Component(entity) + {} + + float Slider::GetValue() + { + return GetNativeComponent()->GetValue(); + } + + +} diff --git a/SHADE_Managed/Slider.hxx b/SHADE_Managed/Slider.hxx new file mode 100644 index 00000000..7f0efa1e --- /dev/null +++ b/SHADE_Managed/Slider.hxx @@ -0,0 +1,49 @@ +/************************************************************************************//*! +\file Slider.hxx +\author Daniel Chua, 2001877 +\par email: yeechendaniel/@digipen.edu +\date Feb 26, 2023 +\brief Contains the definition of the managed Slider class with the + declaration of functions for working with it. + + Note: This file is written in C++17/CLI. + +Copyright (C) 2023 DigiPen Institute of Technology. +Reproduction or disclosure of this file or its contents without the prior written consent +of DigiPen Institute of Technology is prohibited. +*//*************************************************************************************/ +#pragma once + +// Project Includes +#include "Components/Component.hxx" +#include "Math/Vector3.hxx" +#include "Math/Quaternion.hxx" +// External Dependencies +#include "UI/SHSliderComponent.h" + +namespace SHADE +{ + /// + /// CLR version of the SHADE Engine's SHSliderComponent. + /// + public ref class Slider : public Component + { + internal: + /*-----------------------------------------------------------------------------*/ + /* Constructors */ + /*-----------------------------------------------------------------------------*/ + /// + /// Constructs a Slider Component that represents a native SHSliderComponent + /// tied to the specified Entity. + /// + /// Entity that this Component will be tied to. + Slider(Entity entity); + + public: + + float GetValue(); + + + }; +} +