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

Level changes and bug fix #453

Merged
glencelow merged 3 commits from PlayerController into main 2023-04-01 16:43:19 +08:00
Conversation 0 Commits 3 Files Changed 8 +82 -62
8 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ce6288880a - Show all commits

9
Assets/Scenes/Level1.shade
View File

@ -9485,7 +9485,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.400000006, y: 0.400000006, z: 0.699999988}
Translate: {x: 0.800000012, y: 0.400000006, z: 0.699999988}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 4.26499987, y: 2, z: 1}
IsActive: true
@ -9520,7 +9520,12 @@
Hovered: false
Clicked: false
IsActive: true
Scripts: ~
Scripts:
- Type: SHADE_Scripting.UI.SingleScaleBounce
Enabled: true
durationUp: 0.150000006
durationDown: 0.300000012
scaleSize: 1.20000005
- EID: 626
Name: Result Canvas
IsActive: false

22
Assets/Scenes/Level2.shade
View File

@ -17082,7 +17082,7 @@
Scripts:
- Type: SHADE_Scripting.UI.PreviewLevel
Enabled: true
levelTransistion: 609
levelTransistion: 608
endPoint1: [-3.5, 1.5, -4.5]
endPoint2: [0, 2, 4.5]
endPoint3: [1.14999998, 2.20000005, 2]
@ -17305,7 +17305,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.400000006, y: 0.400000006, z: 0.699999988}
Translate: {x: 0.800000012, y: 0.400000006, z: 0.699999988}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 4.26499987, y: 2, z: 1}
IsActive: true
@ -17487,8 +17487,8 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: 0, z: -0.329473495}
Rotate: {x: -0, y: 0, z: -0}
Translate: {x: 0, y: 0, z: 0}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Scripts: ~
@ -17653,7 +17653,7 @@
Clicked: false
IsActive: true
Scripts: ~
- EID: 609
- EID: 608
Name: LevelTransistionCanvas
IsActive: true
NumberOfChildren: 2
@ -17666,15 +17666,15 @@
Scripts:
- Type: LevelTransistion
Enabled: true
logo: 608
bg: 607
logo: 607
bg: 606
duration: 0.5
bgEndPositionX: 3000
logoEndPositionX: 3000
rotAndScale: false
rotationAmt: 360
scaleAmt: 631
- EID: 608
- EID: 607
Name: LevelTransistionLogo
IsActive: true
NumberOfChildren: 0
@ -17689,12 +17689,12 @@
Material: 126117259
IsActive: true
UI Component:
Canvas ID: 609
Canvas ID: 608
Hovered: false
Clicked: false
IsActive: true
Scripts: ~
- EID: 607
- EID: 606
Name: LevelTransistionBG
IsActive: true
NumberOfChildren: 0
@ -17709,7 +17709,7 @@
Material: 132131066
IsActive: true
UI Component:
Canvas ID: 609
Canvas ID: 608
Hovered: false
Clicked: false
IsActive: true

29
Assets/Scenes/Level3.shade
View File

@ -9380,7 +9380,7 @@
Scripts:
- Type: SHADE_Scripting.UI.PreviewLevel
Enabled: true
levelTransistion: 230
levelTransistion: 229
endPoint1: [-1.79999995, 1.5, 0.5]
endPoint2: [5, 3.5, 0.5]
endPoint3: [-0.5, 1.5, 3.5]
@ -15634,8 +15634,8 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: 0, z: -0.329473495}
Rotate: {x: -0, y: 0, z: -0}
Translate: {x: 0, y: 0, z: 0}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Scripts: ~
@ -15789,7 +15789,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
Translate: {x: 0.800000012, y: 0.400000006, z: 0.98999995}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 4.26499987, y: 2, z: 1}
IsActive: true
@ -15824,7 +15824,12 @@
Hovered: false
Clicked: false
IsActive: true
Scripts: ~
Scripts:
- Type: SHADE_Scripting.UI.SingleScaleBounce
Enabled: true
durationUp: 0.150000006
durationDown: 0.300000012
scaleSize: 1.20000005
- EID: 505
Name: Result Canvas
IsActive: false
@ -15986,7 +15991,7 @@
Clicked: false
IsActive: true
Scripts: ~
- EID: 230
- EID: 229
Name: LevelTransistionCanvas
IsActive: true
NumberOfChildren: 2
@ -15999,15 +16004,15 @@
Scripts:
- Type: LevelTransistion
Enabled: true
logo: 229
bg: 228
logo: 228
bg: 227
duration: 0.5
bgEndPositionX: 3000
logoEndPositionX: 3000
rotAndScale: false
rotationAmt: 360
scaleAmt: 631
- EID: 229
- EID: 228
Name: LevelTransistionLogo
IsActive: true
NumberOfChildren: 0
@ -16022,12 +16027,12 @@
Material: 126117259
IsActive: true
UI Component:
Canvas ID: 230
Canvas ID: 229
Hovered: false
Clicked: false
IsActive: true
Scripts: ~
- EID: 228
- EID: 227
Name: LevelTransistionBG
IsActive: true
NumberOfChildren: 0
@ -16042,7 +16047,7 @@
Material: 132131066
IsActive: true
UI Component:
Canvas ID: 230
Canvas ID: 229
Hovered: false
Clicked: false
IsActive: true

6
Assets/Scripts/Gameplay/SC_GameManager.cs
View File

@ -237,9 +237,9 @@ public class GameManager : Script
//if (textBounce)
// textBounce.ScaleBounceOnce();
/*
if (textBounce)
textBounce.ScaleBounceOnce();*/
if (textBGBounce)
textBGBounce.ScaleBounceOnce();

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

@ -54,7 +54,7 @@ namespace SHADE_Scripting.UI
protected override void start()
{
thread = TweenManager.CreateTweenThread(0.1f, 0.9f, 1.0f, EASING_METHOD.EASE_IN_SINE);
thread = TweenManager.CreateTweenThread(0.1f, 0.9f, 1.0f, EASING_METHOD.EASE_OUT_BACK);
Transform transform = GetComponent<Transform>();

7
Assets/Scripts/UI/SC_MultiplierTextFx.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace SHADE_Scripting.UI
@ -40,8 +41,13 @@ namespace SHADE_Scripting.UI
protected override void update()
{
if (sizeThread == null || sizeInvertThread == null)
return;
Transform transform = GetComponent<Transform>();
GetComponent<TextRenderable>().Text = $"X {GameManager.Instance.currMultiplierCombo}";
if (transform != null)
{
@ -66,7 +72,6 @@ namespace SHADE_Scripting.UI
public void ShowMultiplier(int multiplier, float duration)
{
GetComponent<TextRenderable>().Text = $"X {multiplier}";
sizeThread.duration = duration + sizeUpDuration;
sizeInvertThread.Reset();

3
Assets/Scripts/UI/SC_ScaleBounce.cs
View File

@ -36,6 +36,9 @@ namespace SHADE_Scripting.UI
protected override void update()
{
if (thread == null)
return;
if (isActive != lastActive && isActive == true)
{
thread.Reset();

4
Assets/Scripts/UI/SC_SingleScaleBounce.cs
View File

@ -38,7 +38,7 @@ namespace SHADE_Scripting.UI
protected override void start()
{
thread = TweenManager.CreateTweenThread(0.0f, 1.0f, 1.0f, EASING_METHOD.EASE_IN_SINE);
thread = TweenManager.CreateTweenThread(0.0f, 1.0f, 1.0f, EASING_METHOD.LINEAR);
}
@ -50,6 +50,7 @@ namespace SHADE_Scripting.UI
{
scaleUp = false;
thread.duration = durationDown;
thread.method = EASING_METHOD.LINEAR;
thread.ResetInvert();
}
}
@ -65,6 +66,7 @@ namespace SHADE_Scripting.UI
{
thread.duration = durationUp;
thread.Reset(1.0f, scaleSize);
thread.method = EASING_METHOD.EASE_OUT_BACK;
}
else
{