diff --git a/Assets/Locals/StringTable/MyTexts Shared Data.asset b/Assets/Locals/StringTable/MyTexts Shared Data.asset index b239f3a..12da32f 100644 --- a/Assets/Locals/StringTable/MyTexts Shared Data.asset +++ b/Assets/Locals/StringTable/MyTexts Shared Data.asset @@ -1203,10 +1203,6 @@ MonoBehaviour: m_Key: welcome m_Metadata: m_Items: [] - - m_Id: 13166294331395 - m_Key: wip - m_Metadata: - m_Items: [] - m_Id: 240042459787264 m_Key: wood m_Metadata: diff --git a/Assets/Locals/StringTable/MyTexts_de.asset b/Assets/Locals/StringTable/MyTexts_de.asset index ae40e0a..a2eeb30 100644 --- a/Assets/Locals/StringTable/MyTexts_de.asset +++ b/Assets/Locals/StringTable/MyTexts_de.asset @@ -285,10 +285,6 @@ MonoBehaviour: m_Localized: Musik m_Metadata: m_Items: [] - - m_Id: 13166294331395 - m_Localized: WIP - Work in progress - m_Metadata: - m_Items: [] - m_Id: 13166294331396 m_Localized: Pause m_Metadata: diff --git a/Assets/Locals/StringTable/MyTexts_en.asset b/Assets/Locals/StringTable/MyTexts_en.asset index e2f7906..4e95ae6 100644 --- a/Assets/Locals/StringTable/MyTexts_en.asset +++ b/Assets/Locals/StringTable/MyTexts_en.asset @@ -284,10 +284,6 @@ MonoBehaviour: m_Localized: Music m_Metadata: m_Items: [] - - m_Id: 13166294331395 - m_Localized: WIP - Work in progress - m_Metadata: - m_Items: [] - m_Id: 13166294331396 m_Localized: Pause m_Metadata: diff --git a/Assets/Resources/skillTree.json b/Assets/Resources/skillTree.json index 44d46ed..64ecdf6 100644 --- a/Assets/Resources/skillTree.json +++ b/Assets/Resources/skillTree.json @@ -91,36 +91,5 @@ "skillAnimation":"" } } - }, - "Druid":{ - "first":{ - "first":{ - "name":"Stab", - "baseDamage":"20", - "secondaryConsumption":"10", - "cooldown":"2", - "description":"Early skill to apply some damage.", - "skillIcon":"Skills/Thief/Stab", - "skillAnimation":"" - }, - "second":{ - "name":"SmokeScreen", - "baseDamage":"0", - "secondaryConsumption":"5", - "cooldown":"1", - "description":"Hide from the next attack", - "skillIcon":"Skills/Thief/SmokeScreen", - "skillAnimation":"" - }, - "third":{ - "name":"Heartstop", - "baseDamage":"35", - "secondaryConsumption":"30", - "cooldown":"4", - "description":"Stop the heart of your enemy. High damage.", - "skillIcon":"Skills/Thief/Heartstop", - "skillAnimation":"" - } - } } } \ No newline at end of file diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 0dec113..350b7b6 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -1522,126 +1522,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 95167369} m_CullTransparentMesh: 1 ---- !u!1 &100444979 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 100444980} - - component: {fileID: 100444982} - - component: {fileID: 100444981} - - component: {fileID: 100444983} - m_Layer: 5 - m_Name: txtNotAvailable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &100444980 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 100444979} - 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: 863577856} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &100444981 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 100444979} - 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: WIP - Work in progress ---- !u!222 &100444982 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 100444979} - m_CullTransparentMesh: 1 ---- !u!114 &100444983 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 100444979} - 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: 100444981} - 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 &101581437 GameObject: m_ObjectHideFlags: 0 @@ -1676,7 +1556,6 @@ RectTransform: - {fileID: 849425794} - {fileID: 41333118} - {fileID: 1390263973} - - {fileID: 1180432651} m_Father: {fileID: 1186792635} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.95} @@ -14465,7 +14344,6 @@ RectTransform: - {fileID: 898489897} - {fileID: 1973185062} - {fileID: 1338146633} - - {fileID: 100444980} m_Father: {fileID: 1388225951} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -17762,165 +17640,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &1061068765 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1061068766} - - component: {fileID: 1061068768} - - component: {fileID: 1061068767} - - component: {fileID: 1061068769} - - component: {fileID: 1061068770} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1061068766 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061068765} - 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: 1180432651} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1061068767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061068765} - 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: 12 - 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: Controls (Controller) ---- !u!222 &1061068768 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061068765} - m_CullTransparentMesh: 1 ---- !u!114 &1061068769 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061068765} - 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: 1061068767} - 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 &1061068770 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1061068765} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540817 - references: - version: 2 - RefIds: - - rid: 6167802955520540817 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1061068767} - m_TrackedProperties: - items: - - rid: 6167802955520540818 - m_UpdateType: 0 - - rid: 6167802955520540818 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 205735221522432 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &1061894499 GameObject: m_ObjectHideFlags: 0 @@ -19734,139 +19453,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &1180432647 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1180432651} - - component: {fileID: 1180432650} - - component: {fileID: 1180432649} - - component: {fileID: 1180432648} - m_Layer: 5 - m_Name: btnControlsController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1180432648 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1180432647} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 4 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 1662536661} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 1390263970} - m_SelectOnRight: {fileID: 1811345054} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.53333336, g: 0.8117647, b: 1, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1180432649} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1706844940} - m_TargetAssemblyTypeName: Assets.Scripts.ButtonHandler, Assembly-CSharp - m_MethodName: switchOptionView - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: controller - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1180432649 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1180432647} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.06666667, g: 0.29411766, b: 0.37254903, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1180432650 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1180432647} - m_CullTransparentMesh: 1 ---- !u!224 &1180432651 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1180432647} - 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: - - {fileID: 1061068766} - m_Father: {fileID: 101581438} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.8, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -4, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1180850462 GameObject: m_ObjectHideFlags: 0 @@ -22486,7 +22072,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerInput: {fileID: 0} - sensitivityController: {x: 0, y: 0} sensitivityMouse: {x: 0, y: 0} --- !u!114 &1368298272 MonoBehaviour: @@ -22913,7 +22498,7 @@ MonoBehaviour: m_SelectOnUp: {fileID: 1662536661} m_SelectOnDown: {fileID: 575372020} m_SelectOnLeft: {fileID: 41333115} - m_SelectOnRight: {fileID: 1180432648} + m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} @@ -24305,126 +23890,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &1474415560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1474415561} - - component: {fileID: 1474415563} - - component: {fileID: 1474415562} - - component: {fileID: 1474415564} - m_Layer: 5 - m_Name: txtNotAvailable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1474415561 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1474415560} - 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: 1593760212} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1474415562 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1474415560} - 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: WIP - Work in progress ---- !u!222 &1474415563 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1474415560} - m_CullTransparentMesh: 1 ---- !u!114 &1474415564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1474415560} - 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: 1474415562} - 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 &1481807442 GameObject: m_ObjectHideFlags: 0 @@ -25404,126 +24869,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &1523860081 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1523860082} - - component: {fileID: 1523860084} - - component: {fileID: 1523860083} - - component: {fileID: 1523860085} - m_Layer: 5 - m_Name: txtNotAvailable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1523860082 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1523860081} - 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: 1673373700} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1523860083 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1523860081} - 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: WIP - Work in progress ---- !u!222 &1523860084 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1523860081} - m_CullTransparentMesh: 1 ---- !u!114 &1523860085 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1523860081} - 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: 1523860083} - 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 &1546101235 GameObject: m_ObjectHideFlags: 0 @@ -26225,7 +25570,6 @@ RectTransform: - {fileID: 325564844} - {fileID: 131167146} - {fileID: 112598148} - - {fileID: 1474415561} m_Father: {fileID: 1388225951} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -27787,7 +27131,6 @@ RectTransform: - {fileID: 823777032} - {fileID: 982634284} - {fileID: 562210393} - - {fileID: 1523860082} m_Father: {fileID: 1388225951} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -29815,7 +29158,7 @@ MonoBehaviour: m_WrapAround: 0 m_SelectOnUp: {fileID: 1662536661} m_SelectOnDown: {fileID: 325564843} - m_SelectOnLeft: {fileID: 1180432648} + m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 849425791} m_Transition: 1 m_Colors: diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index a79cba2..7b4b889 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -2015,85 +2015,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 189535026} m_CullTransparentMesh: 1 ---- !u!1 &191530883 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 191530884} - - component: {fileID: 191530886} - - component: {fileID: 191530885} - m_Layer: 5 - m_Name: txtNotAvailable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &191530884 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 191530883} - 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: 511624018} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &191530885 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 191530883} - 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: WIP - Work in progress ---- !u!222 &191530886 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 191530883} - m_CullTransparentMesh: 1 --- !u!1 &196244594 GameObject: m_ObjectHideFlags: 0 @@ -2365,7 +2286,6 @@ RectTransform: - {fileID: 2051303419} - {fileID: 1052684314} - {fileID: 1606028808} - - {fileID: 1639408948} m_Father: {fileID: 1908443825} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4743,7 +4663,6 @@ RectTransform: - {fileID: 774232377} - {fileID: 940507679} - {fileID: 1352126355} - - {fileID: 191530884} m_Father: {fileID: 1908443825} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -6816,7 +6735,6 @@ RectTransform: - {fileID: 4879576} - {fileID: 1803985889} - {fileID: 1733743093} - - {fileID: 1198474441} m_Father: {fileID: 1908443825} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -8611,8 +8529,6 @@ MonoBehaviour: m_Image: {fileID: 0} - m_Text: Thief m_Image: {fileID: 0} - - m_Text: Druid - m_Image: {fileID: 0} m_OnValueChanged: m_PersistentCalls: m_Calls: @@ -8684,19 +8600,6 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 4575701896867610626 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 131154097316855808 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Options.m_Options.Array.data[3].m_Text - rid: 6167802955520540678 type: {class: TrackedUGuiDropdown, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: @@ -8706,7 +8609,6 @@ MonoBehaviour: - rid: 6167802955520540679 - rid: 6167802955520540680 - rid: 6167802955520540681 - - rid: 4575701896867610626 m_UpdateType: 1 - rid: 6167802955520540679 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} @@ -9285,139 +9187,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &1054569276 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1054569277} - - component: {fileID: 1054569280} - - component: {fileID: 1054569279} - - component: {fileID: 1054569278} - m_Layer: 5 - m_Name: btnControlsController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1054569277 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1054569276} - 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: - - {fileID: 2030987685} - m_Father: {fileID: 1654183377} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.8, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -4, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1054569278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1054569276} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 4 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 813310409} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 1609529338} - m_SelectOnRight: {fileID: 1607593442} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.53333336, g: 0.8117647, b: 1, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1054569279} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1945274721} - m_TargetAssemblyTypeName: Assets.Scripts.Menu.ButtonHandlerMenu, Assembly-CSharp - m_MethodName: switchOptionView - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: controller - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1054569279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1054569276} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.06666667, g: 0.29411766, b: 0.37254903, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1054569280 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1054569276} - m_CullTransparentMesh: 1 --- !u!1 &1057539240 GameObject: m_ObjectHideFlags: 0 @@ -10504,85 +10273,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194965989} m_CullTransparentMesh: 1 ---- !u!1 &1198474440 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1198474441} - - component: {fileID: 1198474443} - - component: {fileID: 1198474442} - m_Layer: 5 - m_Name: txtNotAvailable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1198474441 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1198474440} - 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: 789034260} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1198474442 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1198474440} - 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: WIP - Work in progress ---- !u!222 &1198474443 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1198474440} - m_CullTransparentMesh: 1 --- !u!1 &1222323148 GameObject: m_ObjectHideFlags: 0 @@ -14782,7 +14472,7 @@ MonoBehaviour: m_WrapAround: 0 m_SelectOnUp: {fileID: 813310409} m_SelectOnDown: {fileID: 4879575} - m_SelectOnLeft: {fileID: 1054569278} + m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 2096649045} m_Transition: 1 m_Colors: @@ -14916,7 +14606,7 @@ MonoBehaviour: m_SelectOnUp: {fileID: 813310409} m_SelectOnDown: {fileID: 180478763} m_SelectOnLeft: {fileID: 775828415} - m_SelectOnRight: {fileID: 1054569278} + m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} @@ -15339,85 +15029,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1638647848} m_CullTransparentMesh: 1 ---- !u!1 &1639408947 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1639408948} - - component: {fileID: 1639408950} - - component: {fileID: 1639408949} - m_Layer: 5 - m_Name: txtNotAvailable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1639408948 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639408947} - 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: 203031339} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1639408949 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639408947} - 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: WIP - Work in progress ---- !u!222 &1639408950 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639408947} - m_CullTransparentMesh: 1 --- !u!1 &1654183376 GameObject: m_ObjectHideFlags: 0 @@ -15452,7 +15063,6 @@ RectTransform: - {fileID: 2096649044} - {fileID: 775828414} - {fileID: 1609529337} - - {fileID: 1054569277} m_Father: {fileID: 1348951833} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.95} @@ -18865,124 +18475,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2012669913} m_CullTransparentMesh: 1 ---- !u!1 &2030987684 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2030987685} - - component: {fileID: 2030987687} - - component: {fileID: 2030987686} - - component: {fileID: 2030987688} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2030987685 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2030987684} - 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: 1054569277} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2030987686 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2030987684} - 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: 12 - 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: S ---- !u!222 &2030987687 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2030987684} - m_CullTransparentMesh: 1 ---- !u!114 &2030987688 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2030987684} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540715 - references: - version: 2 - RefIds: - - rid: 6167802955520540715 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 2030987686} - m_TrackedProperties: - items: - - rid: 6167802955520540716 - m_UpdateType: 0 - - rid: 6167802955520540716 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 203425888071680 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &2051303417 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Classes/DruidClass.cs b/Assets/Scripts/Classes/DruidClass.cs deleted file mode 100644 index 5f0a9b7..0000000 --- a/Assets/Scripts/Classes/DruidClass.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace Assets.Scripts.Classes -{ - class DruidClass : BasicClass - { - public DruidClass() : base() - { - classname = "Druid"; - dexterityBonus = 1; - intelligenceBonus = 1; - strengthBonus = -2; - healthBonus = -10; - secondaryBonus = 20; - leftHandName = "smallShield"; - rightHandName = "wand"; - } - - public override void GenerateSkills(BasicSkill[] skills) - { - //TODO - } - } -} diff --git a/Assets/Scripts/Classes/DruidClass.cs.meta b/Assets/Scripts/Classes/DruidClass.cs.meta deleted file mode 100644 index 665da48..0000000 --- a/Assets/Scripts/Classes/DruidClass.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ce055e9ff490d19b1ad6695aed3e5687 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index 8942cc3..e5d8687 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -81,10 +81,6 @@ public class Controls : MonoBehaviour { Cursor.lockState = CursorLockMode.Confined; } - GameObject.Find("txtInteract").GetComponent().text = GameObject.Find("txtInteract").GetComponent().text.Replace("[ButtonEast]", "[E]"); - GameObject.Find("txtInteraction_Tutorial").GetComponent().text = GameObject.Find("txtInteraction_Tutorial").GetComponent().text.Replace("[E]", "[ButtonEast]"); - GameObject.Find("txtTutorialGoal").GetComponent().text = GameObject.Find("txtTutorialGoal").GetComponent().text.Replace("[Start]", "[ESC]"); - } public void OnLooking(InputValue value) diff --git a/Assets/Scripts/Items/Equipment.cs b/Assets/Scripts/Items/Equipment.cs index f46e476..18d45ab 100644 --- a/Assets/Scripts/Items/Equipment.cs +++ b/Assets/Scripts/Items/Equipment.cs @@ -90,9 +90,6 @@ namespace Assets.Scripts case "Mage": replacement = "Orb"; break; - case "Druid": - replacement = "Shield"; - break; } } else if (place == ItemPlace.RIGHTHAND) @@ -108,9 +105,6 @@ namespace Assets.Scripts case "Mage": replacement = "Wand"; break; - case "Druid": - replacement = "Wand"; - break; } } if (itemName != null) diff --git a/Assets/Scripts/Menu/UIHandlerMenu.cs b/Assets/Scripts/Menu/UIHandlerMenu.cs index f8d3bb2..69ec0c3 100644 --- a/Assets/Scripts/Menu/UIHandlerMenu.cs +++ b/Assets/Scripts/Menu/UIHandlerMenu.cs @@ -61,7 +61,7 @@ namespace Assets.Scripts.Menu int role = GameObject.Find("dropClass").GetComponent().value; int race = GameObject.Find("dropRace").GetComponent().value; BasicRace playerRace = new BasicRace(); - BasicClass playerClass = new DruidClass(); + BasicClass playerClass = new ThiefClass(); switch (role) { case 0: @@ -73,9 +73,6 @@ namespace Assets.Scripts.Menu case 2: playerClass = new ThiefClass(); break; - case 3: - playerClass = new DruidClass(); - break; } switch (race) { diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index 4607509..8ac3007 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -107,7 +107,7 @@ namespace Assets.Scripts.Player public void generatePlayer() { BasicRace race = new BasicRace(); - BasicClass role = new DruidClass(); + BasicClass role = new ThiefClass(); switch (PlayerPrefs.GetInt("class")) { case 0: @@ -119,9 +119,6 @@ namespace Assets.Scripts.Player case 2: role = new ThiefClass(); break; - case 3: - role = new DruidClass(); - break; } switch (PlayerPrefs.GetInt("race")) { diff --git a/Assets/Scripts/Player/PlayerObject.cs b/Assets/Scripts/Player/PlayerObject.cs index 4035869..4d1c69a 100644 --- a/Assets/Scripts/Player/PlayerObject.cs +++ b/Assets/Scripts/Player/PlayerObject.cs @@ -109,9 +109,6 @@ namespace Assets.Scripts.Player case "Thief": role = new ThiefClass(); break; - case "Driud": - role = new DruidClass(); - break; } } diff --git a/save.json b/save.json index 828666e..63fc7bb 100644 --- a/save.json +++ b/save.json @@ -1,6 +1,6 @@ { "player": { -"playername": "", +"playername": "test", "maxHealth": 110, "maxSecondary": 10, "secondary": 10, diff --git a/settings.txt b/settings.txt index 96d5aa0..1677529 100644 --- a/settings.txt +++ b/settings.txt @@ -1,7 +1,6 @@ Resolution:1 Mode:0 -Language:en +Language:de Music:0 Effects:0 -SensitivityController:50.49999/1 SensitivityMouse:42.32454/58.06303 \ No newline at end of file