From c91897f46add9989daee4afc2419ddca075daeff Mon Sep 17 00:00:00 2001 From: Glence Date: Tue, 22 Nov 2022 17:28:48 +0800 Subject: [PATCH] made changescene a public in sceneManager.hxx added a main menu scene added some new texture --- Assets/Audio/Master.strings.bank | Bin 2058 -> 2008 bytes Assets/Audio/SFX.bank | Bin 297952 -> 297088 bytes Assets/Scenes/MainMenu.shade | 9 ++++++++- Assets/Scenes/PlayerControllerTest.shade | 16 ++++++++-------- .../Gameplay/Player/SC_PlayerController.cs | 17 ++++++++++------- Assets/Scripts/Gameplay/SC_GameManager.cs | 9 ++++----- Assets/Scripts/SC_MainMenu.cs | 6 +++++- SHADE_Managed/src/Scene/SceneManager.hxx | 3 ++- 8 files changed, 37 insertions(+), 23 deletions(-) diff --git a/Assets/Audio/Master.strings.bank b/Assets/Audio/Master.strings.bank index d858d0f6666bd0ae7bc13e2850c5289f110b53e8..60d036cb4fb9ad9f7b58dbd1cf14e6993aa24071 100644 GIT binary patch delta 724 zcmYk4J4{qj5Qe{Vmj!(AP*7e9cTrvniZ&J|NJzX1iiv@ZF)mwQCYkgubKBnUYm>#%qWS@r0&*uK}5cl8) z*rS5p1&dC?sDgruSu?KdZW9WsmR7fnv)I0M9i|u5NX?brEvcIl4nYp?*H@C3Pk#<7 zY_0(}UiPS`aLs3-h-cxF8&G87%7l6eXB28JTu}ofAQV!J*Wu^UfZv;7DL=OWmE)Gl E{|#wSs{jB1 delta 804 zcmYk4OKVe66otQ&G`2o!TdmLfNb4i5)z$|pR1m8q5Njt*B7z{qCecW%v2AJvAp>VB zf>dxQ=%6~3;>fYTz=`0*k#n7P5Wge}y{yYRd*6NbJ$tS5z3W+b|5Q4aigZ9Kc|D$* z%*I{v()We$wR9%?>r?-mQ0vU3!Nto-B&)aCP ze8G)cbGmdv#l|O5Vi4QBQ9c`CFSXxcTCPJ-}pUck{7m9OZql?9v2h-(+$1G0g$3~fC zJd;gMk;|m7kV)MjmnP0>I1Em!H45+FPe1}jLG3-g7AdmEJCW{ajH4*0!l;F(RvCv< z@L}kwfu8GvhQyn9;7rr-#_9h(Dkoz9pL5*JU;U diff --git a/Assets/Audio/SFX.bank b/Assets/Audio/SFX.bank index 7a7b0bbe647ac6b6adc6770f580ba114d2460888..5826bbc77d28aa6abbb28a992f2dac2b7c3f6172 100644 GIT binary patch delta 249 zcmaDbU8rHAkW!GRn_EQ(3xk_$n1Y*chyn)#14ADW_W-evXK=_3zl}?fcp`ZwuJM$XsK|GWnx`Y;!|UdqWT- P5HkTW^Y(@ymIO-x|42uG delta 925 zcmZpeDD+^ukW!GRo7;_U76v!hFa~1gX*jI1qI#Ii1+oKKpEkS0i ztmFIJQv1Sng8H@%2E98rGcruxAS|-^4nGqsH7vyG;N*U> z1QC!%4uvl>i`CLt)OYsvtcVW}n*32rgNK=cgQ4M{i^SEVw?j5di(9hRmjN{g`1%C< zIQxaL0NIRC563~o{ef~$YCtx+ahZ#jr<4cpcAZ%8>9@M~isc}E3=Ga8LH;U0niY%7 z(L)0itT}-|#Q{OS7}ke?#2tftfpShZKsLH{Kp`;TU?@w?$xqHKsf6%9I8HW@Q>yO( z@_=rE8_NXY`ucl~~`M zJ&{uUbz)PX^7Zg22WbX*bOp!(L1Cy43JnT#!Qvov2Y><-0&X0HGJwKi=%)yM>XlXfmU}XtRQUyMjL>5HkTW^L7P) HmIO-xcj78g diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 30363b79..136584f0 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -54,4 +54,11 @@ Far: 10000 Perspective: true IsActive: true - Scripts: ~ \ No newline at end of file + Scripts: ~ +- EID: 4 + Name: Default + IsActive: true + NumberOfChildren: 0 + Components: ~ + Scripts: + - Type: MainMenu \ No newline at end of file diff --git a/Assets/Scenes/PlayerControllerTest.shade b/Assets/Scenes/PlayerControllerTest.shade index 9d9a7698..d39e7801 100644 --- a/Assets/Scenes/PlayerControllerTest.shade +++ b/Assets/Scenes/PlayerControllerTest.shade @@ -120,7 +120,7 @@ delayTimer: 1 aimingLength: 1.5 - Type: StateMachine - currentStateName: Idle State + currentStateName: "" currentAnimName: "" - EID: 3 Name: HoldingPoint @@ -140,13 +140,13 @@ Components: Transform Component: Translate: {x: 0, y: 0, z: 0} - Rotate: {x: -0.361278683, y: 4.97423792, z: 0} + Rotate: {x: -0.738241911, y: 0.48064509, z: 0} Scale: {x: 1, y: 1, z: 1} IsActive: true Camera Component: - Position: {x: 0.330392599, y: -2.72767258, z: 5.02710676} - Pitch: -42.2981491 - Yaw: 16.4989166 + Position: {x: -0.0897406489, y: -4.07369709, z: 3.6087606} + Pitch: -42.2981453 + Yaw: 16.4989109 Roll: 0 Width: 1920 Height: 1080 @@ -275,10 +275,10 @@ - Type: GameManager itemPool: 12 zonePool: 15 - currGameState: 3 - totalItemCount: 2 + currGameState: 0 + totalItemCount: 0 Score: 0 - timer: 4.00741768 + timer: 50 - EID: 12 Name: ItemPool IsActive: true diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs index 27e18659..4673d12c 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs @@ -92,19 +92,14 @@ public class PlayerController : Script //rigidbody check rb = GetComponent(); - if (rb == null) + if (!rb) Debug.LogError("RigidBody is NULL!"); //Transform check tranform = GetComponent(); - if(tranform == null) + if(!tranform) Debug.LogError("tranform is NULL!"); - //PickAndThrow check - pat = GetScript(); - if (pat == null) - Debug.LogError("PickAndThrow is NULL!"); - stateMachine = AddScript(); Dictionary dictionary = new Dictionary(); dictionary.Add(typeof(PlayerIdleState), new PlayerIdleState(stateMachine)); @@ -120,6 +115,14 @@ public class PlayerController : Script protected override void update() { + //PickAndThrow check + if (!pat) + { + pat = GetScript(); + if(!pat) + Debug.LogError("PickAndThrow is NULL!"); + } + if (!cam) cam = GetComponentInChildren(); if(!camArm) diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index 98d2ca23..2301a2a1 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -6,17 +6,16 @@ public class GameManager : Script { public enum GameState { - MAINMENU, START, WIN, - LOSE, - TOTAL + LOSE } public GameObject itemPool; public GameObject zonePool; - public GameState currGameState; + [NonSerialized] + public GameState currGameState; [NonSerialized] public int totalItemCount; [NonSerialized] @@ -31,7 +30,7 @@ public class GameManager : Script { totalItemCount = 0; Score = 0; - currGameState = GameState.MAINMENU; + currGameState = GameState.START; if (itemPool) { diff --git a/Assets/Scripts/SC_MainMenu.cs b/Assets/Scripts/SC_MainMenu.cs index ff8c58dd..56579541 100644 --- a/Assets/Scripts/SC_MainMenu.cs +++ b/Assets/Scripts/SC_MainMenu.cs @@ -1,13 +1,17 @@ using System; using SHADE; -public class SC_MainMenu : Script +public class MainMenu : Script { protected override void awake() { } protected override void update() { + if (Input.GetKey(Input.KeyCode.Space)) + { + SceneManager.ChangeScene(86098106); + } } } diff --git a/SHADE_Managed/src/Scene/SceneManager.hxx b/SHADE_Managed/src/Scene/SceneManager.hxx index e1b30bc3..e1e1ec0a 100644 --- a/SHADE_Managed/src/Scene/SceneManager.hxx +++ b/SHADE_Managed/src/Scene/SceneManager.hxx @@ -21,6 +21,7 @@ namespace SHADE { public ref class SceneManager abstract sealed { - static void ChangeScene(AssetID sceneAssetID); + public : + static void ChangeScene(AssetID sceneAssetID); }; }