diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 7a749a4a..380a3df8 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -236,6 +236,83 @@ MonoBehaviour: Response: m_PersistentCalls: m_Calls: [] +--- !u!1 &619617294214395873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8148714324620280418} + - component: {fileID: 7345213045772909178} + - component: {fileID: 8784424886013895849} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8148714324620280418 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619617294214395873} + 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: 2123981999942362668} + m_Father: {fileID: 7296629863741618491} + m_RootOrder: 0 + 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!222 &7345213045772909178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619617294214395873} + m_CullTransparentMesh: 1 +--- !u!114 &8784424886013895849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619617294214395873} + 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: 1, g: 1, b: 1, a: 0.392} + 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: 10907, 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!1 &626264582925636650 GameObject: m_ObjectHideFlags: 0 @@ -476,6 +553,73 @@ MonoBehaviour: Response: m_PersistentCalls: m_Calls: [] +--- !u!1 &2523020729323773706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2123981999942362668} + - component: {fileID: 8020656435860813308} + m_Layer: 5 + m_Name: Layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2123981999942362668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2523020729323773706} + 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: 3818900776374735421} + - {fileID: 6486262286580599512} + - {fileID: 1937322274624059534} + - {fileID: 6913262005630981626} + m_Father: {fileID: 8148714324620280418} + m_RootOrder: 0 + 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 &8020656435860813308 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2523020729323773706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3209634625877957679 GameObject: m_ObjectHideFlags: 0 @@ -2079,7 +2223,7 @@ RectTransform: - {fileID: 7475116341708744575} - {fileID: 7475116342385688832} m_Father: {fileID: 7475116342604559439} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2560,6 +2704,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7475116342091226272} + - {fileID: 7296629863741618491} - {fileID: 1083758498388601188} - {fileID: 7475116342305776693} - {fileID: 7475116342296380174} @@ -3406,6 +3551,43 @@ MonoBehaviour: onAvailableJobsUpdated: {fileID: 4629558797180514782} onJobCompleted: {fileID: 1377770798032594253} onMultiJobBonusRetrieved: {fileID: 6447492041325795891} +--- !u!1 &7962293637322388039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7296629863741618491} + m_Layer: 5 + m_Name: AbilityBinds + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7296629863741618491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7962293637322388039} + 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: 8148714324620280418} + m_Father: {fileID: 7475116342604559439} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 210, y: 85} + m_SizeDelta: {x: 370, y: 120} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8165951781357480069 GameObject: m_ObjectHideFlags: 0 @@ -3535,7 +3717,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4228710720008241671, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4228710720008241671, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.x @@ -3971,6 +4153,218 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7da05f8770c8d8d408380c9e42dc0d04, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1158443606544955870 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2123981999942362668} + m_Modifications: + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6068416968010641387, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Name + value: AbilityBindInstance (3) + objectReference: {fileID: 0} + - target: {fileID: 8427117269225081217, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: gameKey + value: + objectReference: {fileID: 11400000, guid: 448485539eeac0146bdea3687c26059d, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} +--- !u!224 &6913262005630981626 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + m_PrefabInstance: {fileID: 1158443606544955870} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1576431767577929468 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2123981999942362668} + m_Modifications: + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6068416968010641387, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Name + value: AbilityBindInstance (1) + objectReference: {fileID: 0} + - target: {fileID: 8427117269225081217, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: gameKey + value: + objectReference: {fileID: 11400000, guid: 8fa70b4cecf91e64bb8b56f58df9a018, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} +--- !u!224 &6486262286580599512 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + m_PrefabInstance: {fileID: 1576431767577929468} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3856480406335052643 PrefabInstance: m_ObjectHideFlags: 0 @@ -4112,7 +4506,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5924497174362473166, guid: a192502938b6c6e40b392778d5967de0, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 5924497174362473166, guid: a192502938b6c6e40b392778d5967de0, type: 3} propertyPath: m_LocalPosition.x @@ -4265,6 +4659,112 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5924497174362473165, guid: a192502938b6c6e40b392778d5967de0, type: 3} m_PrefabInstance: {fileID: 3856480406335052643} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6125327739316786346 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2123981999942362668} + m_Modifications: + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6068416968010641387, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Name + value: AbilityBindInstance (2) + objectReference: {fileID: 0} + - target: {fileID: 8427117269225081217, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: gameKey + value: + objectReference: {fileID: 11400000, guid: 89726de95474445429e07386fe137ed0, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} +--- !u!224 &1937322274624059534 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + m_PrefabInstance: {fileID: 6125327739316786346} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7475116340804791246 PrefabInstance: m_ObjectHideFlags: 0 @@ -4506,7 +5006,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22490916, guid: bfad9eb7536d8bb4d9de9422d5f46df0, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 22490916, guid: bfad9eb7536d8bb4d9de9422d5f46df0, type: 3} propertyPath: m_AnchorMax.x @@ -4625,7 +5125,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7545422915176773811, guid: 00f01757a3b553844ac0908a8d140ec5, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7545422915176773811, guid: 00f01757a3b553844ac0908a8d140ec5, type: 3} propertyPath: m_AnchorMax.x @@ -4788,7 +5288,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_AnchorMax.x @@ -5695,7 +6195,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22492918, guid: 369f87c2a2dd3b246b04552b05534a04, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 22492918, guid: 369f87c2a2dd3b246b04552b05534a04, type: 3} propertyPath: m_AnchorMax.x @@ -6777,7 +7277,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8188602677875481951, guid: 88bbe6812edcc4c4988a269e560879b7, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 8188602677875481951, guid: 88bbe6812edcc4c4988a269e560879b7, type: 3} propertyPath: m_LocalPosition.x @@ -6969,3 +7469,109 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &8871035175757053465 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2123981999942362668} + m_Modifications: + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6068416968010641387, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: m_Name + value: AbilityBindInstance + objectReference: {fileID: 0} + - target: {fileID: 8427117269225081217, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + propertyPath: gameKey + value: + objectReference: {fileID: 11400000, guid: 092fa402deb2cef49ad39df894f4525b, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} +--- !u!224 &3818900776374735421 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3} + m_PrefabInstance: {fileID: 8871035175757053465} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab b/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab new file mode 100644 index 00000000..61204714 --- /dev/null +++ b/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab @@ -0,0 +1,778 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &971065325636273895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4017357383651222300} + - component: {fileID: 3368423796385376342} + - component: {fileID: 3448802984986530030} + m_Layer: 5 + m_Name: PressedArrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4017357383651222300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971065325636273895} + 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: 2240116213718434170} + m_RootOrder: 0 + 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!222 &3368423796385376342 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971065325636273895} + m_CullTransparentMesh: 1 +--- !u!114 &3448802984986530030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971065325636273895} + 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, g: 0, b: 0, 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: 21300000, guid: c3c81b037aa57ed4bb6d9a6f0b83a87c, type: 3} + m_Type: 0 + 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!1 &3491813265212353229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4877649046481684198} + - component: {fileID: 2354307243871871300} + - component: {fileID: 1038116386796738479} + m_Layer: 5 + m_Name: Bind + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4877649046481684198 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491813265212353229} + 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: 5756525528600931364} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -10} + m_SizeDelta: {x: 35, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2354307243871871300 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491813265212353229} + m_CullTransparentMesh: 1 +--- !u!114 &1038116386796738479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491813265212353229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_text: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 17.9 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 30 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4444551169812095635 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2240116213718434170} + - component: {fileID: 3069222731761535210} + - component: {fileID: 821714767976799549} + m_Layer: 5 + m_Name: Pressed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2240116213718434170 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4444551169812095635} + 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: 4017357383651222300} + m_Father: {fileID: 5756525528600931364} + m_RootOrder: 4 + 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: -10} + m_SizeDelta: {x: -20, y: -40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3069222731761535210 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4444551169812095635} + m_CullTransparentMesh: 1 +--- !u!114 &821714767976799549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4444551169812095635} + 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.37554872, g: 1, b: 0, 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: 21300000, guid: e4bf43d6d1e92494f952cf4372e91e8f, type: 3} + m_Type: 0 + 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!1 &5122095429438571753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3213720952488904518} + - component: {fileID: 691607131361491219} + - component: {fileID: 7737824787099992696} + m_Layer: 5 + m_Name: NotEnoughMana + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3213720952488904518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122095429438571753} + 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: 5756525528600931364} + m_RootOrder: 3 + 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!222 &691607131361491219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122095429438571753} + m_CullTransparentMesh: 1 +--- !u!114 &7737824787099992696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122095429438571753} + 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.10980393, g: 0.6039216, b: 1, a: 0.4} + 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: 0} + m_Type: 0 + 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!1 &6068416968010641387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5756525528600931364} + - component: {fileID: 6897123258340691661} + - component: {fileID: 8473829197331167793} + - component: {fileID: 8427117269225081217} + m_Layer: 5 + m_Name: AbilityBindInstance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5756525528600931364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068416968010641387} + 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: 1279504101772050932} + - {fileID: 5964246257226705716} + - {fileID: 4877649046481684198} + - {fileID: 3213720952488904518} + - {fileID: 2240116213718434170} + - {fileID: 8015528414007822456} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6897123258340691661 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068416968010641387} + m_CullTransparentMesh: 1 +--- !u!114 &8473829197331167793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068416968010641387} + 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, g: 0, b: 0, 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: 0} + m_Type: 0 + 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!114 &8427117269225081217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068416968010641387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b025ec2091a87e4997a6e1acc5af227, type: 3} + m_Name: + m_EditorClassIdentifier: + gameKey: {fileID: 0} + onAbilityKeyBinderSpawned: {fileID: 1259299941717394299} + bind: {fileID: 1038116386796738479} + manaCost: {fileID: 155897292336221392} + icon: {fileID: 8702117578033848689} + noMana: {fileID: 5122095429438571753} + pressed: {fileID: 4444551169812095635} + abilityKeyBinder: {fileID: 0} +--- !u!1 &7629378981540427907 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1279504101772050932} + - component: {fileID: 5019482032199638702} + - component: {fileID: 8702117578033848689} + - component: {fileID: 7067610941310235806} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1279504101772050932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7629378981540427907} + 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: 5756525528600931364} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &5019482032199638702 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7629378981540427907} + m_CullTransparentMesh: 1 +--- !u!114 &8702117578033848689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7629378981540427907} + 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: 1, g: 1, b: 1, 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: 21300000, guid: 28a02df1369b7fd4eab040459b0cc450, type: 3} + m_Type: 0 + 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!114 &7067610941310235806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7629378981540427907} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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.9607843, g: 0.9607843, b: 0.9607843, 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: 0 + m_TargetGraphic: {fileID: 8702117578033848689} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8068696760208408251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5964246257226705716} + - component: {fileID: 7067172745990757532} + - component: {fileID: 155897292336221392} + m_Layer: 5 + m_Name: ManaCost + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5964246257226705716 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8068696760208408251} + 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: 5756525528600931364} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: -10} + m_SizeDelta: {x: 35, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7067172745990757532 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8068696760208408251} + m_CullTransparentMesh: 1 +--- !u!114 &155897292336221392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8068696760208408251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294941215 + m_fontColor: {r: 0.12099999, g: 0.60445017, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 17.9 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 30 + m_fontStyle: 1 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8221527127908298098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8015528414007822456} + - component: {fileID: 1259299941717394299} + m_Layer: 5 + m_Name: onAbilityKeyBinderSpawned + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8015528414007822456 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8221527127908298098} + 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: 5756525528600931364} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1259299941717394299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8221527127908298098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ded2c230ea78e429171673f95c5492, type: 3} + m_Name: + m_EditorClassIdentifier: + Event: {fileID: 11400000, guid: 9bfd488187aea4848a890711a2d587c8, type: 2} + Response: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab.meta b/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab.meta new file mode 100644 index 00000000..c6bc687d --- /dev/null +++ b/Assets/Developer/Prefabs/UI/AbilityBindInstance.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8e6107cb87ae02d43b74a0f7156a7754 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index 06d4119c..73d9827e 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -182,6 +182,7 @@ MonoBehaviour: ability: {fileID: 11400000, guid: 3b11712f0ae0c3248b755e23ce4a3dd3, type: 2} key: {fileID: 11400000, guid: 092fa402deb2cef49ad39df894f4525b, type: 2} castingStateController: {fileID: 7040887640505163424} + onAbilityKeyBinderSpawned: {fileID: 11400000, guid: 9bfd488187aea4848a890711a2d587c8, type: 2} --- !u!1 &480331571121010796 GameObject: m_ObjectHideFlags: 0 @@ -1068,6 +1069,7 @@ MonoBehaviour: ability: {fileID: 11400000, guid: e75c893bb94c00f41b9bc6bbea9872d4, type: 2} key: {fileID: 11400000, guid: 448485539eeac0146bdea3687c26059d, type: 2} castingStateController: {fileID: 7040887640505163424} + onAbilityKeyBinderSpawned: {fileID: 11400000, guid: 9bfd488187aea4848a890711a2d587c8, type: 2} --- !u!1 &6262495489912555994 GameObject: m_ObjectHideFlags: 0 @@ -1163,6 +1165,7 @@ MonoBehaviour: ability: {fileID: 11400000, guid: 24ff8efa4b2e859479400e18c23a098b, type: 2} key: {fileID: 11400000, guid: 8fa70b4cecf91e64bb8b56f58df9a018, type: 2} castingStateController: {fileID: 7040887640505163424} + onAbilityKeyBinderSpawned: {fileID: 11400000, guid: 9bfd488187aea4848a890711a2d587c8, type: 2} --- !u!1 &6842177883150729818 GameObject: m_ObjectHideFlags: 0 @@ -1378,6 +1381,7 @@ MonoBehaviour: ability: {fileID: 11400000, guid: e75c893bb94c00f41b9bc6bbea9872d4, type: 2} key: {fileID: 11400000, guid: 89726de95474445429e07386fe137ed0, type: 2} castingStateController: {fileID: 7040887640505163424} + onAbilityKeyBinderSpawned: {fileID: 11400000, guid: 9bfd488187aea4848a890711a2d587c8, type: 2} --- !u!1 &7350507655590327706 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/0-Splash.unity b/Assets/Scenes/0-Splash.unity index 40f897e4..d81459c7 100644 --- a/Assets/Scenes/0-Splash.unity +++ b/Assets/Scenes/0-Splash.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.06327515, g: 0.12657905, b: 0.132178, a: 1} + m_IndirectSpecularColor: {r: 0.063345544, g: 0.12670934, b: 0.13231301, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1348,6 +1348,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3572373654598039533, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1396,6 +1412,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4759723387849467176, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1684,6 +1716,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7227319219501551729, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset index d4c48653..782e9558 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} m_Name: 1-AxeThrow_ProjectileAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: f8a0997c30b33fd42998800317e977d3, type: 3} targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset index db55b401..e575f682 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb14923287afab34b9aa3a618fdba03c, type: 3} m_Name: 2-WhirlingAxes_AoEOverTimeAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 29ab2c61f69b13746885435d26027dbe, type: 3} targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} @@ -32,6 +33,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 2 radius: 1.8 + shouldResizeVisuals: 0 telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset index fb06b245..12be88a1 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be1ce37ab8d73574b947ba5b1903e40e, type: 3} m_Name: 3-RageStorm_ChanneledAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: e33073c12a1212141bb271ff12a51209, type: 3} targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset index ecd13d96..5ab225c8 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset @@ -12,13 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} m_Name: 1-ShieldThrow_ProjectileAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 1667955fff4e1a141a5a99428fc35767, type: 3} targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} abilityEffects: - {fileID: 11400000, guid: c06779deb6806db438e0fbeec44aad61, type: 2} - {fileID: 11400000, guid: a5cd57412dd7731448bbeab1c2485ecd, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset index f477e331..8c455e5c 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d566f7521e6e59446b99ac6d28d6f02b, type: 3} m_Name: 2-ShieldWall_AntiProjectileAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 65d211f55b476254ea778e5c4d2e5735, type: 3} targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset index 8738a6af..5829014c 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb14923287afab34b9aa3a618fdba03c, type: 3} m_Name: 3-ConsecrationAoEOverTimeAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: d0ede9f0d5392aa4a881d4b95ec7514f, type: 3} targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} @@ -32,6 +33,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 2 radius: 4 + shouldResizeVisuals: 0 telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset index 76c81ad5..67054c48 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} m_Name: 1-IceShard_ProjectileAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 50a820d3228a2bf4da98a6e769e90f12, type: 3} targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset index a6e457a7..bdd8505f 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb14923287afab34b9aa3a618fdba03c, type: 3} m_Name: 2-Blizzard_AoEOverTimeAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: eced15bb959edc54c8457ab75f9a45b5, type: 3} targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} @@ -30,6 +31,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 2 radius: 2 + shouldResizeVisuals: 0 telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset index 569b9800..9fd57ec0 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 341727b42bbd81a4491fc0b16dc445de, type: 3} m_Name: 3-GlacialBomb_AoEWithImpactEventAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 0d1dc8ade7e63d14da6ea8a209621906, type: 3} targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} @@ -32,6 +33,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 4 radius: 2.1 + shouldResizeVisuals: 0 telegraphDelay: 0 canHitSelf: 0 spawnUnderUser: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset index 641c2f51..915e01cc 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5d5cf82dd5c07f438f5809f773372e2, type: 3} m_Name: MeleeSlashAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 28a02df1369b7fd4eab040459b0cc450, type: 3} targettingTags: - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset index a3266776..ee06c7d9 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} m_Name: 1-HolyBall_ProjectileAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 2d0997ac1b1fd664e98202450e7ea2d7, type: 3} targettingTags: - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset index c94394a6..77f36f18 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0c765e9ddb90681418e5635dc93b7716, type: 3} m_Name: 2-BurstOfHope_AoEAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: dc90b2c236cbacf47b20a1294efdf59d, type: 3} targettingTags: - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} @@ -36,6 +37,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 1 radius: 2 + shouldResizeVisuals: 0 telegraphDelay: 0 canHitSelf: 1 spawnUnderUser: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset index ee30899e..deff252e 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb14923287afab34b9aa3a618fdba03c, type: 3} m_Name: 3-HolyCircleAoEOverTimeAbility m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 42f6c722ead369b4b934a116b4324a4d, type: 3} targettingTags: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} @@ -33,6 +34,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 2 radius: 4 + shouldResizeVisuals: 0 telegraphDelay: 0 canHitSelf: 1 spawnUnderUser: 1 diff --git a/Assets/Scriptables/Events/OnAbilityKeyBinderSpawned.asset b/Assets/Scriptables/Events/OnAbilityKeyBinderSpawned.asset new file mode 100644 index 00000000..330b72d7 --- /dev/null +++ b/Assets/Scriptables/Events/OnAbilityKeyBinderSpawned.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1b24bfb21240af4ba7a485c872a9479, type: 3} + m_Name: OnAbilityKeyBinderSpawned + m_EditorClassIdentifier: diff --git a/Assets/Scriptables/Events/OnAbilityKeyBinderSpawned.asset.meta b/Assets/Scriptables/Events/OnAbilityKeyBinderSpawned.asset.meta new file mode 100644 index 00000000..b8c11f43 --- /dev/null +++ b/Assets/Scriptables/Events/OnAbilityKeyBinderSpawned.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9bfd488187aea4848a890711a2d587c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs b/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs index d0dfd8cc..b9b05b47 100644 --- a/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs +++ b/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs @@ -6,6 +6,7 @@ using UnityEngine; //[CreateAssetMenu(fileName = "BaseAbility", menuName = "RiftMayhem/AbilitySystem/Abilities/Base Ability", order = 1)] public class BaseAbility : ScriptableObject { + public Sprite Icon; public List targettingTags = new List(); public List tags = new List(); public List abilityEffects = new List(); diff --git a/Assets/Scripts/Player/AbilityKeyBinder.cs b/Assets/Scripts/Player/AbilityKeyBinder.cs index ef39aeae..90d3bccf 100644 --- a/Assets/Scripts/Player/AbilityKeyBinder.cs +++ b/Assets/Scripts/Player/AbilityKeyBinder.cs @@ -9,34 +9,46 @@ public class AbilityKeyBinder : MonoBehaviour [SerializeField] private BaseAbility ability; [SerializeField] private GameKey key; [SerializeField] private CastingStateController castingStateController; + [SerializeField] private GameEvent_AbilityKeyBinder onAbilityKeyBinderSpawned; private PhotonView user; private Taggable userTag; private Mana mana; + public BaseAbility Ability => ability; + public GameKey GameKey => key; + Coroutine currentChanneling; NetworkedChanneling networkedChanneling; - + AbilityBindInstance abilityBindInstance; private void Awake() { user = GetComponentInParent(); userTag = GetComponentInParent(); mana = GetComponentInParent(); + } private void Start() { - if (!user.IsMine) this.enabled = false; + if (!user.IsMine) + { + this.enabled = false; + return; + } + + onAbilityKeyBinderSpawned.Raise(this); } // Update is called once per frame void Update() { if (Input.GetKeyDown(key.keyCode)) { + if (abilityBindInstance != null) + abilityBindInstance.pressed.SetActive(true); if (mana.EnoughMana(ability.manaCost)) { - if(ability is ChanneledAbility) { castingStateController.RequestAbilityChannel(ability, () => networkedChanneling = ((ChanneledAbility)ability).ExecuteChannel(user, userTag, ref currentChanneling)); @@ -47,6 +59,8 @@ public class AbilityKeyBinder : MonoBehaviour } if(Input.GetKeyUp(key.keyCode)) { + if (abilityBindInstance != null) + abilityBindInstance.pressed.SetActive(false); if (currentChanneling != null) { StopCoroutine(currentChanneling); @@ -61,4 +75,15 @@ public class AbilityKeyBinder : MonoBehaviour } } } + + public void SetupAbilityBindInstance(AbilityBindInstance abilityBindInstance) + { + this.abilityBindInstance = abilityBindInstance; + mana.onResourceChanged.AddListener(OnManaChanged); + } + + public void OnManaChanged(float currentMana) + { + abilityBindInstance.noMana.SetActive(!mana.EnoughMana(ability.manaCost)); + } } diff --git a/Assets/Scripts/UI/AbilityBindInstance.cs b/Assets/Scripts/UI/AbilityBindInstance.cs new file mode 100644 index 00000000..35a24a59 --- /dev/null +++ b/Assets/Scripts/UI/AbilityBindInstance.cs @@ -0,0 +1,42 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class AbilityBindInstance : MonoBehaviour +{ + public GameKey gameKey; + + [SerializeField] private GameEventListener_AbilityKeyBinder onAbilityKeyBinderSpawned; + public TMP_Text bind; + public TMP_Text manaCost; + public Image icon; + public GameObject noMana; + public GameObject pressed; + + [Header("Set by Code:")] + public AbilityKeyBinder abilityKeyBinder; + + private void Awake() + { + onAbilityKeyBinderSpawned.Response.AddListener(InitializeAbilityBindInstance); + } + + public void InitializeAbilityBindInstance(AbilityKeyBinder abilityKeyBinder) + { + if (abilityKeyBinder.GameKey != gameKey) return; + + this.abilityKeyBinder = abilityKeyBinder; + string keyName = gameKey.keyCode.ToString(); + //alpha + keyName = keyName.Remove(0, 5); + this.bind.text = keyName; + this.manaCost.text = abilityKeyBinder.Ability.manaCost.ToString(); + this.icon.sprite = abilityKeyBinder.Ability.Icon; + noMana.SetActive(false); + pressed.SetActive(false); + + abilityKeyBinder.SetupAbilityBindInstance(this); + } +} diff --git a/Assets/Scripts/UI/AbilityBindInstance.cs.meta b/Assets/Scripts/UI/AbilityBindInstance.cs.meta new file mode 100644 index 00000000..63582589 --- /dev/null +++ b/Assets/Scripts/UI/AbilityBindInstance.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8b025ec2091a87e4997a6e1acc5af227 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index 0cf11bd6..6823287d 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 7.854298 + - _Rotation: 5.06969 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Wavefunction/CustomEvents/GameRelated/GameEventListener_AbilityKeyBinder.cs b/Assets/Wavefunction/CustomEvents/GameRelated/GameEventListener_AbilityKeyBinder.cs new file mode 100644 index 00000000..22a9dc6c --- /dev/null +++ b/Assets/Wavefunction/CustomEvents/GameRelated/GameEventListener_AbilityKeyBinder.cs @@ -0,0 +1,31 @@ +using Photon.Pun; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class GameEventListener_AbilityKeyBinder : MonoBehaviour +{ + public GameEvent_AbilityKeyBinder Event; + public UnityEvent_AbilityKeyBinder Response; + + private void OnEnable() + { + Event.RegisterListener(this); + } + + private void OnDisable() + { + Event.UnRegisterListener(this); + } + + public void OnEventRaised(AbilityKeyBinder jobData) + { + Response.Invoke(jobData); + } +} + +[System.Serializable] +public class UnityEvent_AbilityKeyBinder : UnityEvent +{ +} diff --git a/Assets/Wavefunction/CustomEvents/GameRelated/GameEventListener_AbilityKeyBinder.cs.meta b/Assets/Wavefunction/CustomEvents/GameRelated/GameEventListener_AbilityKeyBinder.cs.meta new file mode 100644 index 00000000..4350f409 --- /dev/null +++ b/Assets/Wavefunction/CustomEvents/GameRelated/GameEventListener_AbilityKeyBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9ded2c230ea78e429171673f95c5492 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wavefunction/CustomEvents/GameRelated/GameEvent_AbilityKeyBinder.cs b/Assets/Wavefunction/CustomEvents/GameRelated/GameEvent_AbilityKeyBinder.cs new file mode 100644 index 00000000..4da7d355 --- /dev/null +++ b/Assets/Wavefunction/CustomEvents/GameRelated/GameEvent_AbilityKeyBinder.cs @@ -0,0 +1,28 @@ +using Photon.Pun; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "GameEvent_AbilityKeyBinder", menuName = "Wavefunction/Event/New GameEvent AbilityKeyBinder", order = 1)] +public class GameEvent_AbilityKeyBinder : ScriptableObject +{ + private List listeners = new List(); + + public void Raise(AbilityKeyBinder jobData) + { + for (int i = listeners.Count - 1; i >= 0; i--) + { + listeners[i].OnEventRaised(jobData); + } + } + + public void RegisterListener(GameEventListener_AbilityKeyBinder listener) + { + listeners.Add(listener); + } + + public void UnRegisterListener(GameEventListener_AbilityKeyBinder listener) + { + listeners.Remove(listener); + } +} diff --git a/Assets/Wavefunction/CustomEvents/GameRelated/GameEvent_AbilityKeyBinder.cs.meta b/Assets/Wavefunction/CustomEvents/GameRelated/GameEvent_AbilityKeyBinder.cs.meta new file mode 100644 index 00000000..7aba5eab --- /dev/null +++ b/Assets/Wavefunction/CustomEvents/GameRelated/GameEvent_AbilityKeyBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e1b24bfb21240af4ba7a485c872a9479 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: