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

Scene changes #451

Merged
glencelow merged 3 commits from PlayerController into main 2023-04-01 16:11:08 +08:00
Conversation 0 Commits 3 Files Changed 21 +32 -32
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 191ed7de43 - Show all commits

22
Assets/Scenes/Level1.shade
View File

@ -6864,7 +6864,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -6906,7 +6906,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -6948,7 +6948,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -6990,7 +6990,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -8834,7 +8834,7 @@
endPoint2: [1, 1.5, -7.5]
endPoint3: [2.5, 1.5, -3]
playerCamera: 65730
gameplayCanvas: 459
gameplayCanvas: 131271
duration: 3
- EID: 453
Name: PreviewLevel1
@ -9401,7 +9401,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: 0.300000012, z: 0.98999995}
Translate: {x: 0, y: 0.300000012, z: 0.699999988}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 5, y: 2, z: 1}
IsActive: true
@ -9421,7 +9421,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: -0.800000012, z: 0.100000001}
Translate: {x: 0, y: -0.800000012, z: 0.600000024}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: false
@ -9446,12 +9446,12 @@
NumberOfChildren: 1
Components:
Transform Component:
Translate: {x: -800, y: 200, z: 0.100000001}
Translate: {x: -800, y: 200, z: 0.600000024}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 50, y: 50, z: 60}
IsActive: true
Text Renderer Component:
Text: X2
Text: X0
Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1}
Text Size: {x: 1, y: 1, z: 1}
@ -9472,7 +9472,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
Translate: {x: 0.400000006, y: 0.400000006, z: 0.699999988}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 4.26499987, y: 2, z: 1}
IsActive: true
@ -9494,7 +9494,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -770, y: 425, z: 59.9999962}
Translate: {x: -770, y: 425, z: 0.699999988}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 345.600006, y: 200, z: 60}
IsActive: true

18
Assets/Scenes/Level2.shade
View File

@ -15956,7 +15956,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -16124,7 +16124,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -17085,7 +17085,7 @@
endPoint2: [0, 2, 4.5]
endPoint3: [1.14999998, 2.20000005, 2]
playerCamera: 4
gameplayCanvas: 199
gameplayCanvas: 131271
duration: 3
- EID: 555
Name: PreviewLevel1
@ -17232,7 +17232,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: 0.300000012, z: 0.98999995}
Translate: {x: 0, y: 0.300000012, z: 0.699999988}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 5, y: 2, z: 1}
IsActive: true
@ -17252,7 +17252,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: -0.800000012, z: 0.100000001}
Translate: {x: 0, y: -0.800000012, z: 0.600000024}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: false
@ -17277,12 +17277,12 @@
NumberOfChildren: 1
Components:
Transform Component:
Translate: {x: -800, y: 200, z: 0.100000001}
Translate: {x: -800, y: 200, z: 0.600000024}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 50, y: 50, z: 60}
IsActive: true
Text Renderer Component:
Text: X2
Text: X0
Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1}
Text Size: {x: 1, y: 1, z: 1}
@ -17303,7 +17303,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
Translate: {x: 0.400000006, y: 0.400000006, z: 0.699999988}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 4.26499987, y: 2, z: 1}
IsActive: true
@ -17325,7 +17325,7 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -770, y: 425, z: 59.9999962}
Translate: {x: -770, y: 425, z: 0.699999988}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 345.600006, y: 200, z: 60}
IsActive: true

20
Assets/Scenes/Level3.shade
View File

@ -9383,7 +9383,7 @@
endPoint2: [5, 3.5, 0.5]
endPoint3: [-0.5, 1.5, 3.5]
playerCamera: 66063
gameplayCanvas: 526
gameplayCanvas: 66062
duration: 3
- EID: 555
Name: PreviewLevel1
@ -14463,7 +14463,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -14505,7 +14505,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -14547,7 +14547,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -14589,7 +14589,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -14823,7 +14823,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -14865,7 +14865,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -14907,7 +14907,7 @@
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Density: 2
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
@ -15750,12 +15750,12 @@
NumberOfChildren: 1
Components:
Transform Component:
Translate: {x: -800, y: 200, z: 0.100000001}
Translate: {x: -800, y: 200, z: 0.600000024}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 50, y: 50, z: 60}
IsActive: true
Text Renderer Component:
Text: X2
Text: X0
Font: 174412429
Color: {x: 1, y: 1, z: 1, w: 1}
Text Size: {x: 1, y: 1, z: 1}

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

@ -67,7 +67,7 @@ public class GameManager : Script
Score = 0;
currGameState = GameState.START;
itemScored = false;
currMultiplierCombo = 1;
currMultiplierCombo = 0;
currMultiplierDuration = 0;
itemShatter = false;
GamePause = false;
@ -145,7 +145,7 @@ public class GameManager : Script
if (currMultiplierDuration >= maxMultiplierDuration)
{
itemScored = false;
currMultiplierCombo = 1;
currMultiplierCombo = 0;
currMultiplierDuration = 0;
}
}