xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge branch 'main' into PlayerController

This commit is contained in:
Glence 2023-03-05 14:42:31 +08:00
parent e417ebdfcc 29d33d45ad
commit 7a577ecd6b
13 changed files with 273 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Materials/UI/UIMat_MainMenu.shmat
View File

@ -3,6 +3,6 @@
SubPass: UI SubPass: UI
Properties: Properties:
data.color: {x: 1, y: 1, z: 1, w: 1} data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 54429632 data.textureIndex: 58181851
data.alpha: 1 data.alpha: 1
data.beta: {x: 1, y: 1, z: 1} data.beta: {x: 1, y: 1, z: 1}

24
Assets/Scenes/Level1.shade
View File

@ -5202,10 +5202,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 456 - EID: 456
@ -5235,10 +5235,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 455 - EID: 455
@ -5268,10 +5268,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 454 - EID: 454

24
Assets/Scenes/Level2.shade
View File

@ -5450,10 +5450,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 0 - EID: 0
@ -5483,10 +5483,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 458 - EID: 458
@ -5516,10 +5516,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 11 - EID: 11

52
Assets/Scenes/LoseScene.shade
View File

@ -73,10 +73,10 @@
sceneID: 97158628 sceneID: 97158628
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 6 - EID: 6
@ -108,10 +108,10 @@
Enabled: true Enabled: true
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 3 - EID: 3
@ -154,3 +154,39 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.TweenManager - Type: SHADE_Scripting.UI.TweenManager
Enabled: true Enabled: true
- EID: 450
Name: TransitionCanvas
IsActive: true
NumberOfChildren: 1
Components:
Canvas Component:
Canvas Width: 1920
Canvas Height: 1080
Scale by canvas width: false
IsActive: true
Scripts: ~
- EID: 65982
Name: Transition
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: 0, z: 0.100000001}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 2500, y: 1080, z: 1}
IsActive: true
Renderable Component:
Mesh: 141771688
Material: 120016136
IsActive: true
UI Component:
Canvas ID: 450
Hovered: false
Clicked: false
IsActive: true
Scripts:
- Type: SHADE_Scripting.UI.SceneFadeInOut
Enabled: true
alphaValue: 1
fadeInTime: 0.5
fadeOutTime: 0.5

194
Assets/Scenes/MainMenu.shade
View File

@ -21,7 +21,7 @@
IsActive: true IsActive: true
Renderable Component: Renderable Component:
Mesh: 141771688 Mesh: 141771688
Material: 129138332 Material: 121834459
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 0 Canvas ID: 0
@ -100,10 +100,10 @@
sceneID: 91947920 sceneID: 91947920
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: "event:/Music/player_undetected\x00<30><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 6 - EID: 6
@ -135,10 +135,10 @@
Enabled: true Enabled: true
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 7 - EID: 7
@ -168,10 +168,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
@ -204,10 +204,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
@ -240,10 +240,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
@ -276,10 +276,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
@ -352,23 +352,23 @@
Scripts: ~ Scripts: ~
- EID: 14 - EID: 14
Name: BackGround Name: BackGround
IsActive: false IsActive: true
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0, y: 0, z: 0.5} Translate: {x: 0, y: 0, z: 2.5}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1920, y: 1080, z: 1} Scale: {x: 1920, y: 1080, z: 1}
IsActive: false IsActive: true
Renderable Component: Renderable Component:
Mesh: 141771688 Mesh: 141771688
Material: 121834459 Material: 121834459
IsActive: false IsActive: true
UI Component: UI Component:
Canvas ID: 13 Canvas ID: 13
Hovered: false Hovered: false
Clicked: false Clicked: false
IsActive: false IsActive: true
Scripts: ~ Scripts: ~
- EID: 15 - EID: 15
Name: Instruction Image Name: Instruction Image
@ -378,7 +378,7 @@
Transform Component: Transform Component:
Translate: {x: 0, y: 0, z: 0.400000006} Translate: {x: 0, y: 0, z: 0.400000006}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1344, y: 756, z: 1} Scale: {x: 1167.40002, y: 900, z: 1}
IsActive: true IsActive: true
Renderable Component: Renderable Component:
Mesh: 141771688 Mesh: 141771688
@ -428,10 +428,10 @@
multiImageList: 15 multiImageList: 15
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 17 - EID: 17
@ -465,10 +465,10 @@
multiImageList: 15 multiImageList: 15
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 18 - EID: 18
@ -501,18 +501,10 @@
canvasToActivate: 0 canvasToActivate: 0
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002
clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ButtonFX
Enabled: true
onHoverEnterSound: event:/Music/player_undetected
onHoverExitSound: event:/Music/player_undetected
onClickSound: event:/Music/player_undetected
onReleaseSound: event:/Music/player_undetected
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 19 - EID: 19
@ -528,23 +520,23 @@
Scripts: ~ Scripts: ~
- EID: 20 - EID: 20
Name: BackGround Name: BackGround
IsActive: false IsActive: true
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0, y: 0, z: 1} Translate: {x: 0, y: 0, z: 1.5}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1920, y: 1080, z: 1} Scale: {x: 1920, y: 1080, z: 1}
IsActive: false IsActive: true
Renderable Component: Renderable Component:
Mesh: 141771688 Mesh: 141771688
Material: 121834459 Material: 121834459
IsActive: false IsActive: true
UI Component: UI Component:
Canvas ID: 19 Canvas ID: 19
Hovered: false Hovered: false
Clicked: false Clicked: false
IsActive: false IsActive: true
Scripts: ~ Scripts: ~
- EID: 21 - EID: 21
Name: BackButton Name: BackButton
@ -574,6 +566,14 @@
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
Enabled: true Enabled: true
canvasToActivate: 0 canvasToActivate: 0
- Type: SHADE_Scripting.UI.ButtonFX
Enabled: true
onHoverEnterSound: Empty
onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element
onReleaseSound: Empty
hoverScale: 1.10000002
clickScale: 0.899999976
- EID: 22 - EID: 22
Name: Options Title Text Name: Options Title Text
IsActive: true IsActive: true
@ -587,7 +587,7 @@
Text Renderer Component: Text Renderer Component:
Text: Options Text: Options
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -609,7 +609,7 @@
Text Renderer Component: Text Renderer Component:
Text: Audio Text: Audio
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -647,7 +647,7 @@
Text Renderer Component: Text Renderer Component:
Text: Master Text: Master
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -669,7 +669,7 @@
Text Renderer Component: Text Renderer Component:
Text: SFX Text: SFX
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -691,7 +691,7 @@
Text Renderer Component: Text Renderer Component:
Text: BGM Text: BGM
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -798,7 +798,7 @@
Text Renderer Component: Text Renderer Component:
Text: Camera Text: Camera
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -836,7 +836,7 @@
Text Renderer Component: Text Renderer Component:
Text: FOV Text: FOV
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -858,7 +858,7 @@
Text Renderer Component: Text Renderer Component:
Text: Sensitivity Text: Sensitivity
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -958,7 +958,7 @@
Text Renderer Component: Text Renderer Component:
Text: 100 Text: 100
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -985,7 +985,7 @@
Text Renderer Component: Text Renderer Component:
Text: 100 Text: 100
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -1012,7 +1012,7 @@
Text Renderer Component: Text Renderer Component:
Text: 100 Text: 100
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -1055,7 +1055,7 @@
Text Renderer Component: Text Renderer Component:
Text: 100 Text: 100
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -1082,7 +1082,7 @@
Text Renderer Component: Text Renderer Component:
Text: 100 Text: 100
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:
@ -1099,7 +1099,7 @@
- EID: 46 - EID: 46
Name: Credits Canvas Name: Credits Canvas
IsActive: false IsActive: false
NumberOfChildren: 3 NumberOfChildren: 4
Components: Components:
Canvas Component: Canvas Component:
Canvas Width: 1920 Canvas Width: 1920
@ -1108,12 +1108,12 @@
IsActive: false IsActive: false
Scripts: ~ Scripts: ~
- EID: 47 - EID: 47
Name: BackGround Name: Scrolling Credits
IsActive: true IsActive: true
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0, y: -3800, z: 0.100000001} Translate: {x: 0, y: -3800, z: 1.5}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1920, y: 8026, z: 1} Scale: {x: 1920, y: 8026, z: 1}
IsActive: true IsActive: true
@ -1159,6 +1159,14 @@
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
Enabled: true Enabled: true
canvasToActivate: 0 canvasToActivate: 0
- Type: SHADE_Scripting.UI.ButtonFX
Enabled: true
onHoverEnterSound: Empty
onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element
onReleaseSound: Empty
hoverScale: 1.10000002
clickScale: 0.899999976
- EID: 49 - EID: 49
Name: Credits Title Text Name: Credits Title Text
IsActive: false IsActive: false
@ -1172,7 +1180,7 @@
Text Renderer Component: Text Renderer Component:
Text: Credits Text: Credits
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: false IsActive: false
UI Component: UI Component:
@ -1181,6 +1189,26 @@
Clicked: false Clicked: false
IsActive: false IsActive: false
Scripts: ~ Scripts: ~
- EID: 55
Name: BackGround
IsActive: false
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: 0, z: 1.5}
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: 46
Hovered: false
Clicked: false
IsActive: false
Scripts: ~
- EID: 50 - EID: 50
Name: Level Select Canvas Name: Level Select Canvas
IsActive: false IsActive: false
@ -1194,23 +1222,23 @@
Scripts: ~ Scripts: ~
- EID: 51 - EID: 51
Name: BackGround Name: BackGround
IsActive: false IsActive: true
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0, y: 0, z: 1} Translate: {x: 0, y: 0, z: 1.5}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1920, y: 1080, z: 1} Scale: {x: 1920, y: 1080, z: 1}
IsActive: false IsActive: true
Renderable Component: Renderable Component:
Mesh: 141771688 Mesh: 141771688
Material: 121834459 Material: 121834459
IsActive: false IsActive: true
UI Component: UI Component:
Canvas ID: 50 Canvas ID: 50
Hovered: false Hovered: false
Clicked: false Clicked: false
IsActive: false IsActive: true
Scripts: ~ Scripts: ~
- EID: 52 - EID: 52
Name: BackButton Name: BackButton
@ -1240,6 +1268,14 @@
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
Enabled: true Enabled: true
canvasToActivate: 0 canvasToActivate: 0
- Type: SHADE_Scripting.UI.ButtonFX
Enabled: true
onHoverEnterSound: Empty
onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element
onReleaseSound: Empty
hoverScale: 1.10000002
clickScale: 0.899999976
- EID: 53 - EID: 53
Name: Level Select Title Text Name: Level Select Title Text
IsActive: true IsActive: true
@ -1253,7 +1289,7 @@
Text Renderer Component: Text Renderer Component:
Text: Level Select Text: Level Select
Font: 174412429 Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1} Text Size: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
UI Component: UI Component:

52
Assets/Scenes/WinScene.shade
View File

@ -73,10 +73,10 @@
sceneID: 97158628 sceneID: 97158628
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 6 - EID: 6
@ -108,10 +108,10 @@
Enabled: true Enabled: true
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: event:/Music/player_undetected onHoverEnterSound: Empty
onHoverExitSound: event:/Music/player_undetected onHoverExitSound: Empty
onClickSound: event:/Music/player_undetected onClickSound: event:/UI/mouse_down_element
onReleaseSound: event:/Music/player_undetected onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 3 - EID: 3
@ -154,3 +154,39 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.TweenManager - Type: SHADE_Scripting.UI.TweenManager
Enabled: true Enabled: true
- EID: 450
Name: TransitionCanvas
IsActive: true
NumberOfChildren: 1
Components:
Canvas Component:
Canvas Width: 1920
Canvas Height: 1080
Scale by canvas width: false
IsActive: true
Scripts: ~
- EID: 65982
Name: Transition
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: 0, z: 0.100000001}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 2500, y: 1080, z: 1}
IsActive: true
Renderable Component:
Mesh: 141771688
Material: 120016136
IsActive: true
UI Component:
Canvas ID: 450
Hovered: false
Clicked: false
IsActive: true
Scripts:
- Type: SHADE_Scripting.UI.SceneFadeInOut
Enabled: true
alphaValue: 1
fadeInTime: 0.5
fadeOutTime: 0.5

30
Assets/Scripts/UI/SC_ButtonFX.cs
View File

@ -1,4 +1,4 @@
using SHADE; using SHADE;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -9,10 +9,10 @@ namespace SHADE_Scripting.UI
{ {
public class ButtonFX:Script public class ButtonFX:Script
{ {
public string onHoverEnterSound = "event:/Music/player_undetected"; public string onHoverEnterSound = "Empty";
public string onHoverExitSound = "event:/Music/player_undetected"; public string onHoverExitSound = "Empty";
public string onClickSound = "event:/Music/player_undetected"; public string onClickSound = "event:/UI/mouse_down_element";
public string onReleaseSound = "event:/Music/player_undetected"; public string onReleaseSound = "Empty";
[NonSerialized] [NonSerialized]
private AudioClipHandler onHoverEnterACHandler; private AudioClipHandler onHoverEnterACHandler;
@ -40,9 +40,15 @@ namespace SHADE_Scripting.UI
protected override void awake() protected override void awake()
{ {
if(onHoverEnterSound != "Empty")
onHoverEnterACHandler = SHADE.Audio.CreateAudioClip(onHoverEnterSound); onHoverEnterACHandler = SHADE.Audio.CreateAudioClip(onHoverEnterSound);
if(onHoverExitSound != "Empty")
onHoverExitACHandler = SHADE.Audio.CreateAudioClip(onHoverExitSound); onHoverExitACHandler = SHADE.Audio.CreateAudioClip(onHoverExitSound);
if (onClickSound != "Empty")
onClickACHandler = SHADE.Audio.CreateAudioClip(onClickSound); onClickACHandler = SHADE.Audio.CreateAudioClip(onClickSound);
if (onReleaseSound != "Empty")
onReleaseACHandler = SHADE.Audio.CreateAudioClip(onReleaseSound); onReleaseACHandler = SHADE.Audio.CreateAudioClip(onReleaseSound);
} }
@ -64,7 +70,7 @@ namespace SHADE_Scripting.UI
ui.OnClick.RegisterAction(() => ui.OnClick.RegisterAction(() =>
{ {
if (onClickSound != "") if (onClickSound != "Empty")
onClickACHandler.Play(); onClickACHandler.Play();
tweening = true; tweening = true;
if(thread != null) if(thread != null)
@ -73,8 +79,10 @@ namespace SHADE_Scripting.UI
ui.OnRelease.RegisterAction(() => ui.OnRelease.RegisterAction(() =>
{ {
if (onReleaseSound != "") if (onReleaseSound != "Empty")
onReleaseACHandler.Play(); onReleaseACHandler.Play();
tweening = true; tweening = true;
if (thread != null) if (thread != null)
thread.Reset(currentScale, 1.0f); thread.Reset(currentScale, 1.0f);
@ -82,8 +90,12 @@ namespace SHADE_Scripting.UI
ui.OnHoverEnter.RegisterAction(() => ui.OnHoverEnter.RegisterAction(() =>
{ {
if (onHoverEnterSound != "") if (onHoverEnterSound!="Empty")
{
onHoverEnterACHandler.Play(); onHoverEnterACHandler.Play();
}
tweening = true; tweening = true;
if (thread != null) if (thread != null)
thread.Reset(currentScale, hoverScale); thread.Reset(currentScale, hoverScale);
@ -91,7 +103,7 @@ namespace SHADE_Scripting.UI
ui.OnHoverExit.RegisterAction(() => ui.OnHoverExit.RegisterAction(() =>
{ {
if (onHoverExitSound != "") if (onHoverExitSound != "Empty")
onHoverExitACHandler.Play(); onHoverExitACHandler.Play();
tweening = true; tweening = true;
if (thread != null) if (thread != null)

BIN
Assets/Texture/UI/MainMenuBG.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/MainMenuBG.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/MainMenuBG.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: MainMenuBG
ID: 58181851
Type: 3

7
SHADE_Engine/src/Camera/SHCameraSystem.cpp
View File

@ -272,6 +272,13 @@ namespace SHADE
if (arm->isActive == true) if (arm->isActive == true)
{ {
camera.offset = arm->GetOffset(); camera.offset = arm->GetOffset();
SHVec3 tOffset = arm->GetTargetOffset();
tOffset = SHVec3::RotateY(tOffset, SHMath::DegreesToRadians(arm->GetYaw()));
if (arm->lookAtCameraOrigin) if (arm->lookAtCameraOrigin)
CameraLookAt(camera, camera.position + arm->GetTargetOffset()); CameraLookAt(camera, camera.position + arm->GetTargetOffset());

2
SHADE_Engine/src/Editor/SHEditorUI.cpp
View File

@ -308,7 +308,7 @@ namespace SHADE
const bool CHANGED = ImGui::InputText("##", &buffer[0], TEXT_FIELD_MAX_LENGTH); const bool CHANGED = ImGui::InputText("##", &buffer[0], TEXT_FIELD_MAX_LENGTH);
if (CHANGED) if (CHANGED)
{ {
value = std::string(buffer.data(), buffer.data() + TEXT_FIELD_MAX_LENGTH); value = std::string(buffer.data(), buffer.data() + std::strlen(buffer.data()));
} }
return CHANGED; return CHANGED;
} }

9
SHADE_Managed/src/Utility/Convert.cxx
View File

@ -91,12 +91,17 @@ namespace SHADE
{ {
if (str == nullptr) if (str == nullptr)
return ""; return "";
return msclr::interop::marshal_as<std::string>(str); std::string s = msclr::interop::marshal_as<std::string>(str);
s.substr(0, str->Length);
return s;
} }
System::String^ Convert::ToCLI(const std::string& str) System::String^ Convert::ToCLI(const std::string& str)
{ {
return msclr::interop::marshal_as<System::String^>(str); if (str.empty())
return "";
return msclr::interop::marshal_as<System::String^>(str)->Substring(0, str.length());
} }
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/