Textures update
This commit is contained in:
parent
ed6c05dea1
commit
221e6bde85
|
@ -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: 58181851
|
data.textureIndex: 56004904
|
||||||
data.alpha: 1
|
data.alpha: 1
|
||||||
data.beta: {x: 1, y: 1, z: 1}
|
data.beta: {x: 1, y: 1, z: 1}
|
|
@ -0,0 +1,8 @@
|
||||||
|
- VertexShader: 46580970
|
||||||
|
FragmentShader: 35983630
|
||||||
|
SubPass: UI
|
||||||
|
Properties:
|
||||||
|
data.color: {x: 1, y: 1, z: 1, w: 1}
|
||||||
|
data.textureIndex: 60776650
|
||||||
|
data.alpha: 1
|
||||||
|
data.beta: {x: 1, y: 1, z: 1}
|
|
@ -0,0 +1,3 @@
|
||||||
|
Name: UIMat_MenuBG
|
||||||
|
ID: 130823048
|
||||||
|
Type: 7
|
|
@ -35,9 +35,9 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -700, y: 350, z: 0.300000012}
|
Translate: {x: 0, y: 100, z: 0.300000012}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 355.756439, y: 355.756439, z: 1.18585491}
|
Scale: {x: 600, y: 600, z: 1.18585491}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
|
@ -60,9 +60,9 @@
|
||||||
NumberOfChildren: 6
|
NumberOfChildren: 6
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -60, y: 0, z: 0}
|
Translate: {x: 0, y: -400, z: 0}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 0.899999976, y: 0.899999976, z: 1}
|
Scale: {x: 0.800000012, y: 0.800000012, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
UI Component:
|
UI Component:
|
||||||
Canvas ID: 0
|
Canvas ID: 0
|
||||||
|
@ -76,9 +76,9 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -700, y: 100, z: 0.400000006}
|
Translate: {x: 0, y: 150, z: 0.400000006}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 450, y: 100, z: 1}
|
Scale: {x: 400, y: 100, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
|
@ -112,9 +112,9 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -700, y: -525, z: 0.400000006}
|
Translate: {x: 900, y: 0, z: 0.400000006}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 450, y: 100, z: 1}
|
Scale: {x: 400, y: 100, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
|
@ -147,9 +147,9 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -700, y: -25, 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: 450, y: 100, z: 1}
|
Scale: {x: 400, y: 100, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
|
@ -183,9 +183,9 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -700, y: -150, z: 0.400000006}
|
Translate: {x: -450, y: 0, z: 0.400000006}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 450, y: 100, z: 1}
|
Scale: {x: 400, y: 100, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
|
@ -219,9 +219,9 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -700, y: -275, z: 0.400000006}
|
Translate: {x: -900, y: 0, z: 0.400000006}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 450, y: 100, z: 1}
|
Scale: {x: 400, y: 100, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
|
@ -255,9 +255,9 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -700, y: -400, z: 0.400000006}
|
Translate: {x: 450, y: 0, z: 0.400000006}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 450, y: 100, z: 1}
|
Scale: {x: 400, y: 100, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
|
@ -338,12 +338,12 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components: ~
|
Components: ~
|
||||||
Scripts:
|
Scripts:
|
||||||
- Type: TweenManager
|
- Type: SHADE_Scripting.UI.TweenManager
|
||||||
Enabled: true
|
Enabled: true
|
||||||
- EID: 13
|
- EID: 13
|
||||||
Name: How To Play Canvas
|
Name: How To Play Canvas
|
||||||
IsActive: false
|
IsActive: false
|
||||||
NumberOfChildren: 5
|
NumberOfChildren: 6
|
||||||
Components:
|
Components:
|
||||||
Canvas Component:
|
Canvas Component:
|
||||||
Canvas Width: 1920
|
Canvas Width: 1920
|
||||||
|
@ -508,6 +508,26 @@
|
||||||
onReleaseSound: event:/UI/button_fail
|
onReleaseSound: event:/UI/button_fail
|
||||||
hoverScale: 1.10000002
|
hoverScale: 1.10000002
|
||||||
clickScale: 0.899999976
|
clickScale: 0.899999976
|
||||||
|
- EID: 444
|
||||||
|
Name: SubMenuBackGround
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 0
|
||||||
|
Components:
|
||||||
|
Transform Component:
|
||||||
|
Translate: {x: 0, y: 0, z: 2}
|
||||||
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
|
Scale: {x: 1920, y: 1080, z: 1}
|
||||||
|
IsActive: true
|
||||||
|
Renderable Component:
|
||||||
|
Mesh: 141771688
|
||||||
|
Material: 130823048
|
||||||
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 13
|
||||||
|
Hovered: false
|
||||||
|
Clicked: false
|
||||||
|
IsActive: true
|
||||||
|
Scripts: ~
|
||||||
- EID: 19
|
- EID: 19
|
||||||
Name: Options Canvas
|
Name: Options Canvas
|
||||||
IsActive: false
|
IsActive: false
|
||||||
|
@ -518,14 +538,7 @@
|
||||||
Canvas Height: 1080
|
Canvas Height: 1080
|
||||||
Scale by canvas width: false
|
Scale by canvas width: false
|
||||||
IsActive: false
|
IsActive: false
|
||||||
Scripts:
|
Scripts: ~
|
||||||
- Type: SHADE_Scripting.UI.Options
|
|
||||||
Enabled: true
|
|
||||||
masterVolSlider: 29
|
|
||||||
sfxVolSlider: 30
|
|
||||||
bgmVolSlider: 31
|
|
||||||
fovSlider: 37
|
|
||||||
sensitivitySlider: 38
|
|
||||||
- EID: 20
|
- EID: 20
|
||||||
Name: BackGround
|
Name: BackGround
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
@ -1082,6 +1095,8 @@
|
||||||
- Type: SHADE_Scripting.UI.SliderText
|
- Type: SHADE_Scripting.UI.SliderText
|
||||||
Enabled: true
|
Enabled: true
|
||||||
sliderObj: 29
|
sliderObj: 29
|
||||||
|
minValue: 0
|
||||||
|
maxValue: 0
|
||||||
- EID: 41
|
- EID: 41
|
||||||
Name: SFX Volume Slider Text
|
Name: SFX Volume Slider Text
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
@ -1107,6 +1122,8 @@
|
||||||
- Type: SHADE_Scripting.UI.SliderText
|
- Type: SHADE_Scripting.UI.SliderText
|
||||||
Enabled: true
|
Enabled: true
|
||||||
sliderObj: 30
|
sliderObj: 30
|
||||||
|
minValue: 0
|
||||||
|
maxValue: 0
|
||||||
- EID: 42
|
- EID: 42
|
||||||
Name: BGM Volume Slider Text
|
Name: BGM Volume Slider Text
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
@ -1132,6 +1149,8 @@
|
||||||
- Type: SHADE_Scripting.UI.SliderText
|
- Type: SHADE_Scripting.UI.SliderText
|
||||||
Enabled: true
|
Enabled: true
|
||||||
sliderObj: 31
|
sliderObj: 31
|
||||||
|
minValue: 0
|
||||||
|
maxValue: 0
|
||||||
- EID: 43
|
- EID: 43
|
||||||
Name: Camera Slider Text Group
|
Name: Camera Slider Text Group
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
@ -1173,6 +1192,8 @@
|
||||||
- Type: SHADE_Scripting.UI.SliderText
|
- Type: SHADE_Scripting.UI.SliderText
|
||||||
Enabled: true
|
Enabled: true
|
||||||
sliderObj: 37
|
sliderObj: 37
|
||||||
|
minValue: 0
|
||||||
|
maxValue: 0
|
||||||
- EID: 45
|
- EID: 45
|
||||||
Name: Sensitivity Slider Text
|
Name: Sensitivity Slider Text
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
@ -1198,6 +1219,8 @@
|
||||||
- Type: SHADE_Scripting.UI.SliderText
|
- Type: SHADE_Scripting.UI.SliderText
|
||||||
Enabled: true
|
Enabled: true
|
||||||
sliderObj: 38
|
sliderObj: 38
|
||||||
|
minValue: 0
|
||||||
|
maxValue: 0
|
||||||
- EID: 46
|
- EID: 46
|
||||||
Name: Credits Canvas
|
Name: Credits Canvas
|
||||||
IsActive: false
|
IsActive: false
|
||||||
|
@ -1228,11 +1251,7 @@
|
||||||
Hovered: false
|
Hovered: false
|
||||||
Clicked: false
|
Clicked: false
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts:
|
Scripts: ~
|
||||||
- Type: SHADE_Scripting.UI.ScrollingCredits
|
|
||||||
Enabled: true
|
|
||||||
endY: 4000
|
|
||||||
duration: 20
|
|
||||||
- EID: 48
|
- EID: 48
|
||||||
Name: BackButton
|
Name: BackButton
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
|
|
@ -10,7 +10,8 @@ using System.Threading.Tasks;
|
||||||
EASE_OUT_SINE,
|
EASE_OUT_SINE,
|
||||||
EASE_OUT_BOUNCE,
|
EASE_OUT_BOUNCE,
|
||||||
EASE_IN_BOUNCE,
|
EASE_IN_BOUNCE,
|
||||||
EASE_INOUT_BOUNCE
|
EASE_INOUT_BOUNCE,
|
||||||
|
LINEAR
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class EasingHelper
|
public static class EasingHelper
|
||||||
|
@ -44,6 +45,11 @@ public static class EasingHelper
|
||||||
{
|
{
|
||||||
return EaseInOutBounce(value);
|
return EaseInOutBounce(value);
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
case EASING_METHOD.LINEAR:
|
||||||
|
{
|
||||||
|
return value;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return 0.0f;
|
return 0.0f;
|
||||||
|
|
|
@ -31,6 +31,7 @@ namespace SHADE_Scripting.UI
|
||||||
if(transform != null)
|
if(transform != null)
|
||||||
{
|
{
|
||||||
thread = TweenManager.CreateTweenThread(duration, transform.LocalPosition.y, endY, EASING_METHOD.EASE_IN_SINE);
|
thread = TweenManager.CreateTweenThread(duration, transform.LocalPosition.y, endY, EASING_METHOD.EASE_IN_SINE);
|
||||||
|
//thread.SetResetOnInactive(GameObject);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,8 @@ public class TweenThread
|
||||||
private float value = 0.0f;
|
private float value = 0.0f;
|
||||||
public float startValue = 0.0f;
|
public float startValue = 0.0f;
|
||||||
public float endValue = 1.0f;
|
public float endValue = 1.0f;
|
||||||
|
|
||||||
|
private GameObject goToCheckActive = GameObject.Null;
|
||||||
public TweenThread(float duration, float startValue, float endValue, EASING_METHOD method)
|
public TweenThread(float duration, float startValue, float endValue, EASING_METHOD method)
|
||||||
{
|
{
|
||||||
this.duration = duration;
|
this.duration = duration;
|
||||||
|
@ -21,6 +23,15 @@ public class TweenThread
|
||||||
}
|
}
|
||||||
public void Update(float deltaTime)
|
public void Update(float deltaTime)
|
||||||
{
|
{
|
||||||
|
if (goToCheckActive != GameObject.Null)
|
||||||
|
{
|
||||||
|
if (goToCheckActive.IsActiveInHierarchy == false)
|
||||||
|
{
|
||||||
|
Reset();
|
||||||
|
Debug.Log("RESETTING DUE TO INACTIVE");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (timer >= duration)
|
if (timer >= duration)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -56,6 +67,11 @@ public class TweenThread
|
||||||
{
|
{
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetResetOnInactive(GameObject go)
|
||||||
|
{
|
||||||
|
goToCheckActive = go;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -67,6 +83,9 @@ public class TweenThreadVec3
|
||||||
private Vector3 value = Vector3.Zero;
|
private Vector3 value = Vector3.Zero;
|
||||||
public Vector3 startValue = Vector3.Zero;
|
public Vector3 startValue = Vector3.Zero;
|
||||||
public Vector3 endValue = Vector3.Zero;
|
public Vector3 endValue = Vector3.Zero;
|
||||||
|
|
||||||
|
private GameObject goToCheckActive = GameObject.Null;
|
||||||
|
|
||||||
public TweenThreadVec3(float duration, Vector3 startValue, Vector3 endValue, EASING_METHOD method)
|
public TweenThreadVec3(float duration, Vector3 startValue, Vector3 endValue, EASING_METHOD method)
|
||||||
{
|
{
|
||||||
this.duration = duration;
|
this.duration = duration;
|
||||||
|
@ -76,6 +95,16 @@ public class TweenThreadVec3
|
||||||
}
|
}
|
||||||
public void Update(float deltaTime)
|
public void Update(float deltaTime)
|
||||||
{
|
{
|
||||||
|
if(goToCheckActive != GameObject.Null)
|
||||||
|
{
|
||||||
|
if(goToCheckActive.IsActiveInHierarchy == false)
|
||||||
|
{
|
||||||
|
Reset();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (timer >= duration)
|
if (timer >= duration)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -111,6 +140,11 @@ public class TweenThreadVec3
|
||||||
{
|
{
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetResetOnInactive(GameObject go)
|
||||||
|
{
|
||||||
|
this.goToCheckActive = go;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,3 @@
|
||||||
|
Name: TX_Button_Back
|
||||||
|
ID: 59813125
|
||||||
|
Type: 3
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,3 @@
|
||||||
|
Name: TX_Button_Level1
|
||||||
|
ID: 52916516
|
||||||
|
Type: 3
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,3 @@
|
||||||
|
Name: TX_Button_Level2_1
|
||||||
|
ID: 55380564
|
||||||
|
Type: 3
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,3 @@
|
||||||
|
Name: TX_Button_Level3_1
|
||||||
|
ID: 53392159
|
||||||
|
Type: 3
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,3 @@
|
||||||
|
Name: TX_BG_MainMenu
|
||||||
|
ID: 56004904
|
||||||
|
Type: 3
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,3 @@
|
||||||
|
Name: TX_BG_SubMenus
|
||||||
|
ID: 60776650
|
||||||
|
Type: 3
|
Loading…
Reference in New Issue