Skip to content

GitLab

O
Overbrewed
Commit 1abbc354 authored by Sebastian's avatar Sebastian
Browse files
Options

fixed errors in UI

parent 47d7ab88
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 96 deletions
Assets/_Game/Animation/AnimationsUI/StartMenuAnimator.controller
View file @ 1abbc354
......@@ -156,7 +156,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -910022716516846869}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -383,7 +383,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -910022716516846869}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......
Assets/_Game/Animation/AnimationsUI/pressed.anim
View file @ 1abbc354
......@@ -312,12 +312,4 @@ AnimationClip:
script: {fileID: 0}
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events:
- time: 0
functionName: PlaySound
data:
objectReferenceParameter: {fileID: 8300000, guid: 3667059f7be73544183f6d8d90a70371,
type: 3}
floatParameter: 0
intParameter: 0
messageOptions: 0
m_Events: []
Assets/_Game/Animation/AnimationsUI/selected.anim
View file @ 1abbc354
......@@ -447,12 +447,4 @@ AnimationClip:
script: {fileID: 0}
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events:
- time: 0
functionName: PlaySound
data:
objectReferenceParameter: {fileID: 8300000, guid: da1b160ba7e6b4bf0a40defe83b864d4,
type: 3}
floatParameter: 0
intParameter: 0
messageOptions: 0
m_Events: []
Assets/_Game/Scenes/MainMenu.unity
View file @ 1abbc354
......@@ -235,7 +235,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 137270270}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a9479cceaa15e824baa78aa4ef36ac1a, type: 3}
m_Name:
......@@ -444,8 +444,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f57446199a8dd13498319b79677621d4, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -519,8 +517,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 22
......@@ -598,8 +594,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 22
......@@ -677,8 +671,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 22
......@@ -756,8 +748,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2cb6d47d50192b140bc9a06cb3473dee, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -895,8 +885,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 27
......@@ -1065,8 +1053,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: b1292f515e4bc194193a076f61cfd65f, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -1140,8 +1126,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 22
......@@ -1219,8 +1203,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 1325a1106ca51d4468664f37d98cf0f2, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -1294,8 +1276,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 668ba200fdfade440b9200d0426d780c, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -1369,8 +1349,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 62b54b59ca80732489aa9c309204229f, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -1444,8 +1422,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 5e3ebc41d1867844c879ac49ab741e28, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -1519,8 +1495,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 22
......@@ -1598,8 +1572,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f8002e9448fd52543905ea1b334e1c5c, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -1765,8 +1737,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
......@@ -1866,8 +1836,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: ba3da271cd9efd64a90dbe3edec6ced8, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -2066,8 +2034,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1292209474
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2086,8 +2052,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f77dd9b960bc8dd47a16ff70cb2bdc70, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -2262,8 +2226,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1390123038
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2282,8 +2244,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7fefd86a052f00c49a9fdca78ac4b88e, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -2416,8 +2376,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 22
......@@ -2495,8 +2453,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 27
......@@ -2581,8 +2537,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
......@@ -2723,8 +2677,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1902483130
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2743,8 +2695,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 1943bcedfe2a41e4a8d492761d4ab124, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -2865,8 +2815,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 22
......@@ -2944,8 +2892,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0bb1b320c3545bb43b7915063547ec61, type: 3}
m_FontSize: 27
......
Assets/_Game/Scripts/UI/MenuButtonController.cs
View file @ 1abbc354
......@@ -25,27 +25,27 @@ public class MenuButtonController : MonoBehaviour
// Update is called once per frame
void Update () {
if(_inputManager.Direction().z != 0)
{
if(!isKeyDown){
if (_inputManager.Direction().z < 0) {
if(index < maxBtnIndex){
index++;
}else{
index = 0;
}
} else if(_inputManager.Direction().z > 0){
if(index > 0){
index --;
}else{
index = maxBtnIndex;
}
}
isKeyDown = true;
}
}else{
isKeyDown = false;
}
// if(_inputManager.Direction().z != 0)
// {
// if(!isKeyDown){
// if (_inputManager.Direction().z < 0) {
// if(index < maxBtnIndex){
// index++;
// }else{
// index = 0;
// }
// } else if(_inputManager.Direction().z > 0){
// if(index > 0){
// index --;
// }else{
// index = maxBtnIndex;
// }
// }
// isKeyDown = true;
// }
// }else{
// isKeyDown = false;
// }
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment