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

small scene changes and reenable mouse centering and hiding

This commit is contained in:
Glence 2023-03-05 21:11:24 +08:00
parent e27b143819
commit 9f57ed1ef1
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scenes/Level2.shade
View File

@ -5443,7 +5443,6 @@
Default Texture: 63979907 Default Texture: 63979907
Hovered Texture: 51379325 Hovered Texture: 51379325
Clicked Texture: 66788278 Clicked Texture: 66788278
current texture: 0
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 10 Canvas ID: 10
@ -5477,7 +5476,6 @@
Default Texture: 61602036 Default Texture: 61602036
Hovered Texture: 58910810 Hovered Texture: 58910810
Clicked Texture: 57786063 Clicked Texture: 57786063
current texture: 0
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 10 Canvas ID: 10
@ -5513,7 +5511,6 @@
Default Texture: 64806384 Default Texture: 64806384
Hovered Texture: 58347825 Hovered Texture: 58347825
Clicked Texture: 63234380 Clicked Texture: 63234380
current texture: 0
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 10 Canvas ID: 10
@ -8917,7 +8914,7 @@
Collider Component: Collider Component:
Colliders: Colliders:
- Is Trigger: false - Is Trigger: false
Collision Tag: 0 Collision Tag: 1
Type: Box Type: Box
Half Extents: {x: 0.400000006, y: 1.29999995, z: 1} Half Extents: {x: 0.400000006, y: 1.29999995, z: 1}
Friction: 0.400000006 Friction: 0.400000006

15
Assets/Scripts/UI/SC_MainMenu.cs
View File

@ -24,23 +24,12 @@ public class MainMenu : Script
protected override void start() protected override void start()
{ {
//Input.SetMouseCentering(false); Input.SetMouseCentering(false);
//Application.IsCursorVisible = true; Application.IsCursorVisible = true;
SceneFadeInOut.Instance.CallFadeOut(); SceneFadeInOut.Instance.CallFadeOut();
} }
protected override void update() protected override void update()
{ {
/* if (Input.GetKeyDown(Input.KeyCode.K) && obj)
{
if (testRenderable.Material.GetProperty<float>("data.alpha") == 1)
{
testRenderable.Material.SetProperty<float>("data.alpha", 0);
}
else if (testRenderable.Material.GetProperty<float>("data.alpha") == 0)
{
testRenderable.Material.SetProperty<float>("data.alpha", 1);
}
}*/
if (Input.GetKeyDown(Input.KeyCode.Space)) if (Input.GetKeyDown(Input.KeyCode.Space))
{ {

2
SHADE_Managed/src/Engine/Application.cxx
View File

@ -78,7 +78,7 @@ namespace SHADE
} }
void Application::IsCursorVisible::set(bool value) void Application::IsCursorVisible::set(bool value)
{ {
//SHWindow::SetMouseVisible(value); SHWindow::SetMouseVisible(value);
} }
double Application::FixDeltaTime::get() double Application::FixDeltaTime::get()
{ {

2
SHADE_Managed/src/Input/Input.cxx
View File

@ -149,7 +149,7 @@ namespace SHADE
void Input::SetMouseCentering(bool state) void Input::SetMouseCentering(bool state)
{ {
//SHInputManager::SetMouseCentering(state); SHInputManager::SetMouseCentering(state);
} }
bool Input::GetMouseCentering() bool Input::GetMouseCentering()