From 9886250d1907d19b4269aae5af84d3042c149d32 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Tue, 21 Mar 2023 14:47:14 +0800 Subject: [PATCH] scene merge --- Assets/Scenes/Level1.shade | 48 ++++-- Assets/Scenes/Level2.shade | 74 +++++--- Assets/Scenes/Level3.shade | 340 ++++++++++++++++++++----------------- 3 files changed, 270 insertions(+), 192 deletions(-) diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index af4c20e3..c64dde4e 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -6842,6 +6842,7 @@ timer: 200 scoreText: 237 timeText: 525 + minusTimerText: 65735 multiplierText: 524 maxMultiplierDuration: 5 maxMultiplierCombo: 10 @@ -8044,9 +8045,9 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -775, y: 325, z: 0.600000024} + Translate: {x: -800, y: 365, z: 0.600000024} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 120, y: 120, z: 1} + Scale: {x: 100, y: 100, z: 60} IsActive: true Text Renderer Component: Text: My name is Brandon. @@ -8062,7 +8063,7 @@ Scripts: - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning Enabled: true - offsetPerDigit: 30 + offsetPerDigit: 25 - Type: SHADE_Scripting.UI.SingleScaleBounce Enabled: true durationUp: 0.150000006 @@ -8071,12 +8072,12 @@ - EID: 525 Name: Timer Text IsActive: true - NumberOfChildren: 1 + NumberOfChildren: 2 Components: Transform Component: - Translate: {x: 650, y: 350, z: 0.100000001} + Translate: {x: 700, y: 400, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 85, y: 85, z: 1} + Scale: {x: 60, y: 60, z: 1} IsActive: true Text Renderer Component: Text: My name is Brandon. @@ -8110,15 +8111,40 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 65735 + Name: Minus Timer Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -0.800000012, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: false + Text Renderer Component: + Text: -10 + Font: 174412429 + Color: {x: 1, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: false + Scripts: + - Type: SHADE_Scripting.UI.MinusTimerText + Enabled: true + duration: 2 - EID: 524 Name: Multiplier Text IsActive: true NumberOfChildren: 1 Components: Transform Component: - Translate: {x: -800, y: 175, z: 0.100000001} + Translate: {x: -800, y: 250, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 80, y: 80, z: 1} + Scale: {x: 50, y: 50, z: 60} IsActive: true Text Renderer Component: Text: X2 @@ -8143,7 +8169,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0.649999976, y: 0.400000006, z: 0.98999995} + Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 4.26499987, y: 2, z: 1} IsActive: true @@ -8165,9 +8191,9 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -740, y: 400, z: 59.9999962} + Translate: {x: -770, y: 425, z: 59.9999962} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 414, y: 240, z: 1} + Scale: {x: 345.600006, y: 200, z: 60} IsActive: true Renderable Component: Mesh: 141771688 diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index ee82e785..1cae00e9 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -2878,8 +2878,9 @@ Score: 0 timer: 200 scoreText: 237 - timeText: 66057 - multiplierText: 65675 + timeText: 131278 + minusTimerText: 131211 + multiplierText: 66055 maxMultiplierDuration: 5 maxMultiplierCombo: 10 multiplierFont: 60 @@ -14824,7 +14825,7 @@ FOV: 90 IsActive: true Scripts: ~ -- EID: 65735 +- EID: 131271 Name: Gameplay Canvas IsActive: true NumberOfChildren: 4 @@ -14841,9 +14842,9 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -775, y: 325, z: 0.600000024} + Translate: {x: -800, y: 365, z: 0.600000024} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 120, y: 120, z: 1} + Scale: {x: 100, y: 100, z: 60} IsActive: true Text Renderer Component: Text: My name is Brandon. @@ -14852,28 +14853,28 @@ Text Size: {x: 1, y: 1, z: 1} IsActive: true UI Component: - Canvas ID: 65735 + Canvas ID: 131271 Hovered: false Clicked: false IsActive: true Scripts: - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning Enabled: true - offsetPerDigit: 30 + offsetPerDigit: 25 - Type: SHADE_Scripting.UI.SingleScaleBounce Enabled: true durationUp: 0.150000006 durationDown: 0.300000012 scaleSize: 1.20000005 -- EID: 66057 +- EID: 131278 Name: Timer Text IsActive: true - NumberOfChildren: 1 + NumberOfChildren: 2 Components: Transform Component: - Translate: {x: 650, y: 350, z: 0.100000001} + Translate: {x: 700, y: 400, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 85, y: 85, z: 1} + Scale: {x: 60, y: 60, z: 1} IsActive: true Text Renderer Component: Text: My name is Brandon. @@ -14882,7 +14883,7 @@ Text Size: {x: 1, y: 1, z: 1} IsActive: true UI Component: - Canvas ID: 65735 + Canvas ID: 131271 Hovered: false Clicked: false IsActive: true @@ -14902,20 +14903,45 @@ Material: 126220632 IsActive: true UI Component: - Canvas ID: 65735 + Canvas ID: 131271 Hovered: false Clicked: false IsActive: true Scripts: ~ -- EID: 65675 +- EID: 131211 + Name: Minus Timer Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -0.800000012, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: false + Text Renderer Component: + Text: -10 + Font: 174412429 + Color: {x: 1, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 131271 + Hovered: false + Clicked: false + IsActive: false + Scripts: + - Type: SHADE_Scripting.UI.MinusTimerText + Enabled: true + duration: 2 +- EID: 66055 Name: Multiplier Text IsActive: true NumberOfChildren: 1 Components: Transform Component: - Translate: {x: -800, y: 175, z: 0.100000001} + Translate: {x: -800, y: 250, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 80, y: 80, z: 1} + Scale: {x: 50, y: 50, z: 60} IsActive: true Text Renderer Component: Text: X2 @@ -14924,7 +14950,7 @@ Text Size: {x: 1, y: 1, z: 1} IsActive: true UI Component: - Canvas ID: 65735 + Canvas ID: 131271 Hovered: false Clicked: false IsActive: true @@ -14934,13 +14960,13 @@ maxSize: 1 minSize: 0.300000012 minAlpha: 0.300000012 -- EID: 519 +- EID: 131593 Name: Multiplier BG IsActive: true NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0.649999976, y: 0.400000006, z: 0.98999995} + Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 4.26499987, y: 2, z: 1} IsActive: true @@ -14949,29 +14975,29 @@ Material: 133784677 IsActive: true UI Component: - Canvas ID: 65735 + Canvas ID: 131271 Hovered: false Clicked: false IsActive: true Scripts: - Type: FixRotation Enabled: true -- EID: 65742 +- EID: 568 Name: Score BG IsActive: true NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -740, y: 400, z: 59.9999962} + Translate: {x: -770, y: 425, z: 59.9999962} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 414, y: 240, z: 1} + Scale: {x: 345.600006, y: 200, z: 60} IsActive: true Renderable Component: Mesh: 141771688 Material: 127527215 IsActive: true UI Component: - Canvas ID: 65735 + Canvas ID: 131271 Hovered: false Clicked: false IsActive: true diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade index d7b5a026..7b3c8319 100644 --- a/Assets/Scenes/Level3.shade +++ b/Assets/Scenes/Level3.shade @@ -8657,18 +8657,18 @@ Scripts: ~ - EID: 542 Name: ====AI===== - IsActive: false + IsActive: true NumberOfChildren: 0 Components: Transform Component: Translate: {x: 0.892607987, y: 0, z: 1.50168896} Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} - IsActive: false + IsActive: true Renderable Component: Mesh: 140697366 Material: 129495479 - IsActive: false + IsActive: true RigidBody Component: Type: Dynamic Drag: 0.00999999978 @@ -8683,7 +8683,7 @@ Freeze Rotation X: true Freeze Rotation Y: false Freeze Rotation Z: true - IsActive: false + IsActive: true Collider Component: Colliders: - Is Trigger: false @@ -8695,7 +8695,7 @@ Density: 1 Position Offset: {x: 0, y: 0.899999976, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false + IsActive: true Scripts: - Type: Homeowner1 Enabled: true @@ -8814,158 +8814,6 @@ Scale: {x: 1, y: 1, z: 1} IsActive: true Scripts: ~ -- EID: 526 - Name: Gameplay Canvas - IsActive: true - NumberOfChildren: 4 - Components: - Canvas Component: - Canvas Width: 1920 - Canvas Height: 1080 - Scale by canvas width: false - IsActive: true - Scripts: ~ -- EID: 237 - Name: Score Text - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -775, y: 325, z: 0.600000024} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 120, y: 120, z: 1} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning - Enabled: true - offsetPerDigit: 30 - - Type: SHADE_Scripting.UI.SingleScaleBounce - Enabled: true - durationUp: 0.150000006 - durationDown: 0.300000012 - scaleSize: 1.20000005 -- EID: 525 - Name: Timer Text - IsActive: true - NumberOfChildren: 1 - Components: - Transform Component: - Translate: {x: 650, y: 350, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 85, y: 85, z: 1} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 520 - Name: Timer BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 5, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 126220632 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 524 - Name: Multiplier Text - IsActive: true - NumberOfChildren: 1 - Components: - Transform Component: - Translate: {x: -800, y: 175, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 80, y: 80, z: 1} - IsActive: true - Text Renderer Component: - Text: X2 - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.MultiplierTextFx - Enabled: true - maxSize: 1 - minSize: 0.300000012 - minAlpha: 0.300000012 -- EID: 519 - Name: Multiplier BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.649999976, y: 0.400000006, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 4.26499987, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 133784677 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: FixRotation - Enabled: true -- EID: 521 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -740, y: 400, z: 59.9999962} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 414, y: 240, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 127527215 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ - EID: 238 Name: ====GameManager==== IsActive: true @@ -8982,6 +8830,7 @@ timer: 200 scoreText: 237 timeText: 525 + minusTimerText: 524 multiplierText: 524 maxMultiplierDuration: 5 maxMultiplierCombo: 10 @@ -14775,4 +14624,181 @@ Position Offset: {x: 0, y: 0.200000003, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true + Scripts: ~ +- EID: 526 + Name: Gameplay Canvas + IsActive: true + NumberOfChildren: 4 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 237 + Name: Score Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -800, y: 365, z: 0.600000024} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 60} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning + Enabled: true + offsetPerDigit: 25 + - Type: SHADE_Scripting.UI.SingleScaleBounce + Enabled: true + durationUp: 0.150000006 + durationDown: 0.300000012 + scaleSize: 1.20000005 +- EID: 525 + Name: Timer Text + IsActive: true + NumberOfChildren: 2 + Components: + Transform Component: + Translate: {x: 700, y: 400, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 60, y: 60, z: 1} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 520 + Name: Timer BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 5, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 126220632 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 524 + Name: Minus Timer Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -0.800000012, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: false + Text Renderer Component: + Text: -10 + Font: 174412429 + Color: {x: 1, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: false + Scripts: + - Type: SHADE_Scripting.UI.MinusTimerText + Enabled: true + duration: 2 +- EID: 521 + Name: Multiplier Text + IsActive: true + NumberOfChildren: 1 + Components: + Transform Component: + Translate: {x: -800, y: 250, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 50, y: 50, z: 60} + IsActive: true + Text Renderer Component: + Text: X2 + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.MultiplierTextFx + Enabled: true + maxSize: 1 + minSize: 0.300000012 + minAlpha: 0.300000012 +- EID: 519 + Name: Multiplier BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 4.26499987, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 133784677 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: FixRotation + Enabled: true +- EID: 599 + Name: Score BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -770, y: 425, z: 59.9999962} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 345.600006, y: 200, z: 60} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127527215 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true Scripts: ~ \ No newline at end of file