Changed inventory to C instead of I (Better keyboard handling)
This commit is contained in:
Finnchen123
parent
eded2be2ef
commit
1c0b2dcf68
@ -327,7 +327,7 @@
|
|||||||
{
|
{
|
||||||
"name": "",
|
"name": "",
|
||||||
"id": "41d6126e-54e9-4ac3-9fd7-20ecf4db4eaa",
|
"id": "41d6126e-54e9-4ac3-9fd7-20ecf4db4eaa",
|
||||||
"path": "<Keyboard>/i",
|
"path": "<Keyboard>/c",
|
||||||
"interactions": "",
|
"interactions": "",
|
||||||
"processors": "",
|
"processors": "",
|
||||||
"groups": "KeyboardMouse",
|
"groups": "KeyboardMouse",
|
||||||
|
|||||||
@ -10632,7 +10632,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: '[1-6]'
|
m_Text: '[1-4]'
|
||||||
--- !u!222 &546991487
|
--- !u!222 &546991487
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -12930,165 +12930,6 @@ RectTransform:
|
|||||||
m_AnchoredPosition: {x: 22.500004, y: 55.6}
|
m_AnchoredPosition: {x: 22.500004, y: 55.6}
|
||||||
m_SizeDelta: {x: 25, y: 25}
|
m_SizeDelta: {x: 25, y: 25}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &685130858
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 685130859}
|
|
||||||
- component: {fileID: 685130861}
|
|
||||||
- component: {fileID: 685130860}
|
|
||||||
- component: {fileID: 685130862}
|
|
||||||
- component: {fileID: 685130863}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: txtInventory
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &685130859
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 685130858}
|
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
||||||
m_ConstrainProportionsScale: 0
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 2041716424}
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0.7, y: 0.2}
|
|
||||||
m_AnchorMax: {x: 0.9, y: 0.3}
|
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!114 &685130860
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 685130858}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_Maskable: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_FontData:
|
|
||||||
m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3}
|
|
||||||
m_FontSize: 15
|
|
||||||
m_FontStyle: 0
|
|
||||||
m_BestFit: 0
|
|
||||||
m_MinSize: 1
|
|
||||||
m_MaxSize: 40
|
|
||||||
m_Alignment: 4
|
|
||||||
m_AlignByGeometry: 0
|
|
||||||
m_RichText: 1
|
|
||||||
m_HorizontalOverflow: 0
|
|
||||||
m_VerticalOverflow: 0
|
|
||||||
m_LineSpacing: 1
|
|
||||||
m_Text: Inventory
|
|
||||||
--- !u!222 &685130861
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 685130858}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &685130862
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 685130858}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_StringReference:
|
|
||||||
m_TableReference:
|
|
||||||
m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79
|
|
||||||
m_TableEntryReference:
|
|
||||||
m_KeyId: 0
|
|
||||||
m_Key:
|
|
||||||
m_FallbackState: 0
|
|
||||||
m_WaitForCompletion: 0
|
|
||||||
m_LocalVariables: []
|
|
||||||
m_FormatArguments: []
|
|
||||||
m_UpdateString:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls:
|
|
||||||
- m_Target: {fileID: 685130860}
|
|
||||||
m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI
|
|
||||||
m_MethodName: set_text
|
|
||||||
m_Mode: 0
|
|
||||||
m_Arguments:
|
|
||||||
m_ObjectArgument: {fileID: 0}
|
|
||||||
m_ObjectArgumentAssemblyTypeName:
|
|
||||||
m_IntArgument: 0
|
|
||||||
m_FloatArgument: 0
|
|
||||||
m_StringArgument:
|
|
||||||
m_BoolArgument: 0
|
|
||||||
m_CallState: 1
|
|
||||||
references:
|
|
||||||
version: 2
|
|
||||||
RefIds: []
|
|
||||||
--- !u!114 &685130863
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 685130858}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_TrackedObjects:
|
|
||||||
- rid: 6167802955520540865
|
|
||||||
references:
|
|
||||||
version: 2
|
|
||||||
RefIds:
|
|
||||||
- rid: 6167802955520540865
|
|
||||||
type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization}
|
|
||||||
data:
|
|
||||||
m_Target: {fileID: 685130860}
|
|
||||||
m_TrackedProperties:
|
|
||||||
items:
|
|
||||||
- rid: 6167802955520540866
|
|
||||||
m_UpdateType: 0
|
|
||||||
- rid: 6167802955520540866
|
|
||||||
type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization}
|
|
||||||
data:
|
|
||||||
m_Localized:
|
|
||||||
m_TableReference:
|
|
||||||
m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79
|
|
||||||
m_TableEntryReference:
|
|
||||||
m_KeyId: 207075507171328
|
|
||||||
m_Key:
|
|
||||||
m_FallbackState: 0
|
|
||||||
m_WaitForCompletion: 0
|
|
||||||
m_LocalVariables: []
|
|
||||||
m_PropertyPath: m_Text
|
|
||||||
--- !u!1 &695890917
|
--- !u!1 &695890917
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -13427,7 +13268,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Fenster
|
m_Text: Window
|
||||||
--- !u!222 &709576934
|
--- !u!222 &709576934
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -13641,7 +13482,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Deutsch
|
m_Text: 800x600
|
||||||
--- !u!222 &722907595
|
--- !u!222 &722907595
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -31560,126 +31401,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1618461707}
|
m_GameObject: {fileID: 1618461707}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1619439161
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1619439162}
|
|
||||||
- component: {fileID: 1619439164}
|
|
||||||
- component: {fileID: 1619439163}
|
|
||||||
- component: {fileID: 1619439165}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: txtInventory_Binding
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &1619439162
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1619439161}
|
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
||||||
m_ConstrainProportionsScale: 0
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 2041716424}
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0.9, y: 0.2}
|
|
||||||
m_AnchorMax: {x: 1, y: 0.3}
|
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!114 &1619439163
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1619439161}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_Maskable: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_FontData:
|
|
||||||
m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3}
|
|
||||||
m_FontSize: 15
|
|
||||||
m_FontStyle: 0
|
|
||||||
m_BestFit: 0
|
|
||||||
m_MinSize: 1
|
|
||||||
m_MaxSize: 40
|
|
||||||
m_Alignment: 4
|
|
||||||
m_AlignByGeometry: 0
|
|
||||||
m_RichText: 1
|
|
||||||
m_HorizontalOverflow: 0
|
|
||||||
m_VerticalOverflow: 0
|
|
||||||
m_LineSpacing: 1
|
|
||||||
m_Text: I
|
|
||||||
--- !u!222 &1619439164
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1619439161}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &1619439165
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1619439161}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_StringReference:
|
|
||||||
m_TableReference:
|
|
||||||
m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79
|
|
||||||
m_TableEntryReference:
|
|
||||||
m_KeyId: 0
|
|
||||||
m_Key:
|
|
||||||
m_FallbackState: 0
|
|
||||||
m_WaitForCompletion: 0
|
|
||||||
m_LocalVariables: []
|
|
||||||
m_FormatArguments: []
|
|
||||||
m_UpdateString:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls:
|
|
||||||
- m_Target: {fileID: 1619439163}
|
|
||||||
m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI
|
|
||||||
m_MethodName: set_text
|
|
||||||
m_Mode: 0
|
|
||||||
m_Arguments:
|
|
||||||
m_ObjectArgument: {fileID: 0}
|
|
||||||
m_ObjectArgumentAssemblyTypeName:
|
|
||||||
m_IntArgument: 0
|
|
||||||
m_FloatArgument: 0
|
|
||||||
m_StringArgument:
|
|
||||||
m_BoolArgument: 0
|
|
||||||
m_CallState: 1
|
|
||||||
references:
|
|
||||||
version: 2
|
|
||||||
RefIds: []
|
|
||||||
--- !u!1 &1625554084
|
--- !u!1 &1625554084
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -38927,8 +38648,6 @@ RectTransform:
|
|||||||
- {fileID: 915509929}
|
- {fileID: 915509929}
|
||||||
- {fileID: 1672679298}
|
- {fileID: 1672679298}
|
||||||
- {fileID: 546991485}
|
- {fileID: 546991485}
|
||||||
- {fileID: 685130859}
|
|
||||||
- {fileID: 1619439162}
|
|
||||||
m_Father: {fileID: 1388225951}
|
m_Father: {fileID: 1388225951}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
"secondaryRegen": 5,
|
"secondaryRegen": 5,
|
||||||
"isDodging": "False",
|
"isDodging": "False",
|
||||||
"killcount": 0,
|
"killcount": 0,
|
||||||
"treecount": 0,
|
"treecount": 1,
|
||||||
"orecount": 0,
|
"orecount": 0,
|
||||||
"luck": 20,
|
"luck": 20,
|
||||||
"difficulty": 0
|
"difficulty": 0
|
||||||
@ -52,7 +52,7 @@
|
|||||||
"slot0": {
|
"slot0": {
|
||||||
"bag1": {
|
"bag1": {
|
||||||
"rarity": "COMMON",
|
"rarity": "COMMON",
|
||||||
"itemName": "Rock",
|
"itemName": "Wood",
|
||||||
|
|
||||||
},
|
},
|
||||||
"bag2": "empty",
|
"bag2": "empty",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user