Fixed Button texture swapping. Fixed Button scripts on scene change. Added buttons to scenes. Added SHEDITOR define for Managed #341
|
@ -36,6 +36,9 @@
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
Material: 123313564
|
Material: 123313564
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 1
|
||||||
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
- EID: 5
|
- EID: 5
|
||||||
Name: Main Menu Button
|
Name: Main Menu Button
|
||||||
|
@ -56,6 +59,9 @@
|
||||||
Hovered Texture: 55999018
|
Hovered Texture: 55999018
|
||||||
Clicked Texture: 66382894
|
Clicked Texture: 66382894
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 1
|
||||||
|
IsActive: true
|
||||||
Scripts:
|
Scripts:
|
||||||
- Type: ChangeSceneButton
|
- Type: ChangeSceneButton
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
@ -79,6 +85,9 @@
|
||||||
Hovered Texture: 65045286
|
Hovered Texture: 65045286
|
||||||
Clicked Texture: 58607560
|
Clicked Texture: 58607560
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 1
|
||||||
|
IsActive: true
|
||||||
Scripts:
|
Scripts:
|
||||||
- Type: QuitButton
|
- Type: QuitButton
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
|
@ -22,6 +22,9 @@
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
Material: 121834459
|
Material: 121834459
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 0
|
||||||
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
- EID: 5
|
- EID: 5
|
||||||
Name: Start Game Button
|
Name: Start Game Button
|
||||||
|
@ -42,6 +45,9 @@
|
||||||
Hovered Texture: 62235279
|
Hovered Texture: 62235279
|
||||||
Clicked Texture: 64722619
|
Clicked Texture: 64722619
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 0
|
||||||
|
IsActive: true
|
||||||
Scripts:
|
Scripts:
|
||||||
- Type: ChangeSceneButton
|
- Type: ChangeSceneButton
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
@ -65,6 +71,9 @@
|
||||||
Hovered Texture: 65045286
|
Hovered Texture: 65045286
|
||||||
Clicked Texture: 58607560
|
Clicked Texture: 58607560
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 0
|
||||||
|
IsActive: true
|
||||||
Scripts:
|
Scripts:
|
||||||
- Type: QuitButton
|
- Type: QuitButton
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
|
@ -9,17 +9,22 @@ public class ChangeSceneButton : Script
|
||||||
protected override void start()
|
protected override void start()
|
||||||
{
|
{
|
||||||
UIElement ui = GetComponent<UIElement>();
|
UIElement ui = GetComponent<UIElement>();
|
||||||
ui.OnClick.RegisterAction(() =>
|
if (ui != null)
|
||||||
{
|
{
|
||||||
if(sceneID != 0)
|
ui.OnClick.RegisterAction(() =>
|
||||||
{
|
{
|
||||||
Audio.PlaySFXOnce2D("event:/UI/success");
|
if (sceneID != 0)
|
||||||
SceneManager.ChangeScene(sceneID);
|
{
|
||||||
Audio.StopAllSounds();
|
Audio.PlaySFXOnce2D("event:/UI/success");
|
||||||
}
|
SceneManager.ChangeScene(sceneID);
|
||||||
});
|
Audio.StopAllSounds();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogError("Failed to register button action for ChangeSceneButton.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,12 +6,22 @@ public class QuitButton : Script
|
||||||
protected override void start()
|
protected override void start()
|
||||||
{
|
{
|
||||||
UIElement ui = GetComponent<UIElement>();
|
UIElement ui = GetComponent<UIElement>();
|
||||||
ui.OnClick.RegisterAction(() =>
|
if (ui != null)
|
||||||
{
|
{
|
||||||
Audio.StopAllSounds();
|
ui.OnClick.RegisterAction(() =>
|
||||||
Application.Quit();
|
{
|
||||||
});
|
ui.OnClick.RegisterAction(() =>
|
||||||
|
{
|
||||||
|
Audio.StopAllSounds();
|
||||||
|
Application.Quit();
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogError("Failed to register button action for QuitButton.");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
protected override void update()
|
protected override void update()
|
||||||
|
|
|
@ -205,6 +205,7 @@ namespace SHADE
|
||||||
|
|
||||||
AddComponentToComponentNode<SHTextRenderableComponent>(components, eid);
|
AddComponentToComponentNode<SHTextRenderableComponent>(components, eid);
|
||||||
AddComponentToComponentNode<SHAnimatorComponent>(components, eid);
|
AddComponentToComponentNode<SHAnimatorComponent>(components, eid);
|
||||||
|
AddComponentToComponentNode<SHUIComponent>(components, eid);
|
||||||
|
|
||||||
node[ComponentsNode] = components;
|
node[ComponentsNode] = components;
|
||||||
|
|
||||||
|
@ -263,6 +264,7 @@ namespace SHADE
|
||||||
AddComponentID<SHToggleButtonComponent>(componentIDList, componentsNode);
|
AddComponentID<SHToggleButtonComponent>(componentIDList, componentsNode);
|
||||||
AddComponentID<SHTextRenderableComponent>(componentIDList, componentsNode);
|
AddComponentID<SHTextRenderableComponent>(componentIDList, componentsNode);
|
||||||
AddComponentID<SHAnimatorComponent>(componentIDList, componentsNode);
|
AddComponentID<SHAnimatorComponent>(componentIDList, componentsNode);
|
||||||
|
AddComponentID<SHUIComponent>(componentIDList, componentsNode);
|
||||||
|
|
||||||
return componentIDList;
|
return componentIDList;
|
||||||
}
|
}
|
||||||
|
@ -347,5 +349,6 @@ namespace SHADE
|
||||||
SHSerializationHelper::InitializeComponentFromNode<SHTextRenderableComponent>(componentsNode, eid);
|
SHSerializationHelper::InitializeComponentFromNode<SHTextRenderableComponent>(componentsNode, eid);
|
||||||
SHSerializationHelper::InitializeComponentFromNode<SHLightComponent>(componentsNode, eid);
|
SHSerializationHelper::InitializeComponentFromNode<SHLightComponent>(componentsNode, eid);
|
||||||
SHSerializationHelper::InitializeComponentFromNode<SHAnimatorComponent>(componentsNode, eid);
|
SHSerializationHelper::InitializeComponentFromNode<SHAnimatorComponent>(componentsNode, eid);
|
||||||
|
SHSerializationHelper::InitializeComponentFromNode<SHUIComponent>(componentsNode, eid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue