janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-28 12:22:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed homescene

Browse Source
This commit is contained in:
Janis M
2022-01-18 10:33:36 +01:00
parent eff2619acd
commit 3bcc95612d
4 changed files with 96 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Assets/Prefabs/UI/InputField.prefab
View File

@@ -523,7 +523,6 @@ GameObject:
- component: {fileID: 4927034121091652283}
- component: {fileID: 4927034121091652285}
- component: {fileID: 4927034121091652284}
- component: {fileID: 4927034121091652286}
m_Layer: 5
m_Name: FocusText
m_TagString: Untagged
@@ -648,32 +647,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &4927034121091652286
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4927034121091652282}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3b73e2bcfc623314cbd9352da494f1f9, type: 3}
m_Name:
m_EditorClassIdentifier:
markerHeight: 20
transitionStartTime: 0.1
transitionEndTime: 0.1
helpTextOriginColor: {r: 0, g: 0, b: 0, a: 0}
helpTextColor: {r: 0, g: 0, b: 0, a: 0}
focusTextOriginColor: {r: 0, g: 0, b: 0, a: 0}
focusTextColor: {r: 0, g: 0, b: 0, a: 0}
helpTextEndPosition: -25
focusTextEndPosition: 20
marker: {fileID: 0}
focusText: {fileID: 0}
helpText: {fileID: 0}
underline: {fileID: 0}
placeholder: {fileID: 0}
--- !u!1 &4927034121194567461
GameObject:
m_ObjectHideFlags: 0

5
Assets/Scenes/HomeScene.unity
View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_IndirectSpecularColor: {r: 0.18028331, g: 0.2257133, b: 0.3069217, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -5098,7 +5098,8 @@ PrefabInstance:
propertyPath: InputType
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 4927034121091652286, guid: 2bcd316cc5d96504197c7bd6f749e4d9, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 2bcd316cc5d96504197c7bd6f749e4d9, type: 3}
--- !u!1001 &7086846158179689576
PrefabInstance:

2
Assets/Scripts/HomeMenu/HomeSceneInputField.cs
View File

@@ -62,7 +62,7 @@ public class HomeSceneInputField : MonoBehaviour, IPointerClickHandler
void Update()
{
//UnFocus && isActive
if (!inputField.isFocused)
if (inputField && !inputField.isFocused)
{
isFocused = false;

184
UserSettings/Layouts/default-2021.dwlt
View File

@@ -15,9 +15,9 @@ MonoBehaviour:
m_PixelRect:
serializedVersion: 2
x: 0
y: 43
width: 1920
height: 989
y: 43.2
width: 1536
height: 772.8
m_ShowMode: 4
m_Title: Game
m_RootView: {fileID: 2}
@@ -44,8 +44,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1920
height: 989
width: 1536
height: 773
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1920
width: 1536
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 969
width: 1920
y: 753
width: 1536
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -114,12 +114,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
width: 1920
height: 939
width: 1536
height: 723
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 17
controlID: 87
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -139,12 +139,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1480
height: 939
width: 1184
height: 723
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 18
controlID: 88
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -164,12 +164,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1480
height: 565
width: 1184
height: 435
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 19
controlID: 89
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -187,10 +187,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 342
height: 565
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
width: 274
height: 435
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -211,10 +211,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 342
x: 274
y: 0
width: 1138
height: 565
width: 910
height: 435
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 12}
@@ -239,9 +239,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 565
width: 1480
height: 374
y: 435
width: 1184
height: 288
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 15}
@@ -265,10 +265,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1480
x: 1184
y: 0
width: 440
height: 939
width: 352
height: 723
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 17}
@@ -292,14 +292,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 342
y: 73
width: 1136
height: 544
x: 274.4
y: 73.6
width: 908
height: 414
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -310,7 +310,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 930, y: 523}
m_TargetSize: {x: 699, y: 393}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -325,10 +325,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -465
m_HBaseRangeMax: 465
m_VBaseRangeMin: -261.5
m_VBaseRangeMax: 261.5
m_HBaseRangeMin: -279.6
m_HBaseRangeMax: 279.6
m_VBaseRangeMin: -157.2
m_VBaseRangeMax: 157.2
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -346,23 +346,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 1136
height: 523
width: 908
height: 393
m_Scale: {x: 1, y: 1}
m_Translation: {x: 568, y: 261.5}
m_Translation: {x: 454, y: 196.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -568
y: -261.5
width: 1136
height: 523
x: -454
y: -196.5
width: 908
height: 393
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1136, y: 544}
m_LastWindowPixelSize: {x: 1135, y: 517.5}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -384,14 +384,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 73
width: 341
height: 544
y: 73.6
width: 273
height: 414
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -401,7 +401,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 8ad4fcff18d5fcff16d8fcff5cd9fcffdcdbfcff7e81fdff8681fdff88faffff626d0000be6d0000026e0000126e0000c4990100d09a0100b09b0100
m_ExpandedIDs: aef5ffff76f7ffffbaf8ffffe06c0000446d0000846d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -441,14 +441,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 342
y: 73
width: 1136
height: 544
x: 274.4
y: 73.6
width: 908
height: 414
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -459,7 +459,7 @@ MonoBehaviour:
collapsed: 0
displayed: 1
snapOffset: {x: -100, y: -26}
snapOffsetDelta: {x: -1, y: 0}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 3
id: Tool Settings
index: 0
@@ -656,14 +656,14 @@ MonoBehaviour:
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneLighting: 1
m_2DMode: 1
m_2DMode: 0
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 477.7048, y: 262.99408, z: 106.25005}
m_Target: {x: 15.310783, y: 6.3692627, z: 4.0604887}
speed: 2
m_Value: {x: 477.7048, y: 262.99408, z: 106.25005}
m_Value: {x: 15.310783, y: 6.3692627, z: 4.0604887}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -692,17 +692,17 @@ MonoBehaviour:
m_Size: {x: 1, y: 1}
yGrid:
m_Fade:
m_Target: 0
m_Target: 1
speed: 2
m_Value: 0
m_Value: 1
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
zGrid:
m_Fade:
m_Target: 1
m_Target: 0
speed: 2
m_Value: 1
m_Value: 0
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
@@ -710,17 +710,17 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0, y: 0, z: 0, w: 1}
m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_Size:
m_Target: 337.91748
m_Target: 1.1451244
speed: 2
m_Value: 337.91748
m_Value: 1.1451244
m_Ortho:
m_Target: 1
m_Target: 0
speed: 2
m_Value: 1
m_Value: 0
m_CameraSettings:
m_Speed: 1
m_SpeedNormalized: 0.5
@@ -757,14 +757,14 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 638
width: 1479
height: 353
y: 508
width: 1183
height: 267
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -790,14 +790,14 @@ MonoBehaviour:
m_LastFolders:
- Assets/Prefabs
m_LastFoldersGridSize: -1
m_LastProjectPath: M:\Programs\Unity\PROJECTS\defrain
m_LastProjectPath: C:\Users\Janis\Unity Projects\defrain
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 79}
m_SelectedIDs: 18740000
m_LastClickedID: 29720
m_ExpandedIDs: 00000000f2730000f47300001874000000ca9a3b
scrollPos: {x: 0, y: 105}
m_SelectedIDs: 40740000
m_LastClickedID: 29760
m_ExpandedIDs: 000000001074000012740000147400004074000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -825,7 +825,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000f2730000f4730000
m_ExpandedIDs: 00000000107400001274000014740000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -897,14 +897,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 638
width: 1479
height: 353
y: 508
width: 1183
height: 267
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -925,14 +925,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1480
y: 73
width: 439
height: 918
x: 1184
y: 73.6
width: 351
height: 702
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -944,7 +944,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_LastVerticalScrollValue: 364
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker: