diff --git a/Assets/Data/ChampionEnum.cs b/Assets/Data/ChampionEnum.cs index 3d9b4b5..b5ce4d9 100644 --- a/Assets/Data/ChampionEnum.cs +++ b/Assets/Data/ChampionEnum.cs @@ -1,64 +1,63 @@ - -public enum ChampionsEnum +public enum ChampionsEnum { - ASHE, - BLITZCRANK, - ELISE, - JAX, - JAYCE, - LILLIA, - NOMSY, - POPPY, - SERAPHINE, - SORAKA, - TWITCH, - WARWICK, - ZIGGS, - ZOE, - AHRI, - AKALI, - CASSIOPEIA, - GALIO, - KASSADIN, - KOGMAW, - NILAH, - NUNU, - RUMBLE, - SHYVANA, - SYNDRA, - TRISTANA, - ZILEAN, - BARD, - EZREAL, - HECARIM, - HWEI, - JINX, - KATARINA, - MORDEKAISER, - NEEKO, - SHEN, - SWAIN, - VEIGAR, - VEX, - WUKONG, - FIORA, - GWEN, - KALISTA, - KARMA, - NAMI, - NASUS, - OLAF, - RAKAN, - RYZE, - TAHMKENCH, - TARIC, - VARUS, - BRIAR, - CAMILLE, - DIANA, - MILLIO, - MORGANA, - NORRA, - SMOLDER, - XERATH -} \ No newline at end of file + ASHE = 0, + BLITZCRANK = 1 << 0, + ELISE = 1 << 1, + JAX = 1 << 2, + JAYCE = 1 << 3, + LILLIA = 1 << 4, + NOMSY = 1 << 5, + POPPY = 1 << 6, + SERAPHINE = 1 << 7, + SORAKA = 1 << 8, + TWITCH = 1 << 9, + WARWICK = 1 << 10, + ZIGGS = 1 << 11, + ZOE = 1 << 12, + AHRI = 1 << 13, + AKALI = 1 << 14, + CASSIOPEIA = 1 << 15, + GALIO = 1 << 16, + KASSADIN = 1 << 17, + KOGMAW = 1 << 18, + NILAH = 1 << 19, + NUNU = 1 << 20, + RUMBLE = 1 << 21, + SHYVANA = 1 << 22, + SYNDRA = 1 << 23, + TRISTANA = 1 << 24, + ZILEAN = 1 << 25, + BARD = 1 << 26, + EZREAL = 1 << 27, + HECARIM = 1 << 28, + HWEI = 1 << 29, + JINX = 1 << 30, + KATARINA = 1 << 31, + MORDEKAISER = 1 << 32, + NEEKO = 1 << 33, + SHEN = 1 << 34, + SWAIN = 1 << 35, + VEIGAR = 1 << 36, + VEX = 1 << 37, + WUKONG = 1 << 38, + FIORA = 1 << 39, + GWEN = 1 << 40, + KALISTA = 1 << 41, + KARMA = 1 << 42, + NAMI = 1 << 43, + NASUS = 1 << 44, + OLAF = 1 << 45, + RAKAN = 1 << 46, + RYZE = 1 << 47, + TAHMKENCH = 1 << 48, + TARIC = 1 << 49, + VARUS = 1 << 50, + BRIAR = 1 << 51, + CAMILLE = 1 << 52, + DIANA = 1 << 53, + MILLIO = 1 << 54, + MORGANA = 1 << 55, + NORRA = 1 << 56, + SMOLDER = 1 << 57, + XERATH = 1 << 58, +} diff --git a/Assets/Data/TraitSelectorManager.cs b/Assets/Data/TraitSelectorManager.cs index 28ae841..aa8a952 100644 --- a/Assets/Data/TraitSelectorManager.cs +++ b/Assets/Data/TraitSelectorManager.cs @@ -24,23 +24,8 @@ public class TraitSelectorManager : MonoBehaviour emblemList = _emblemSelector.GetEmblems(); var champList = _championSelector.GetSelectedChampions(); int compositionSize = _compositionSize.text == "" ? 1 : int.Parse(_compositionSize.text); - //int i = 0; - //var allComposition = TraitsMapping.GetChampionSubsets(champList, compositionSize); var coroutine = StartCoroutine(TraitsMapping.GetChampionSubsetsAsync(champList, compositionSize,emblemList, HandleCombination)); - // foreach (var composition in allComposition) - // { - // var synergies = TraitsMapping.MergeEmblems( - // TraitsMapping.TraitCountInCompo(composition), - // emblemList - // ); - // var activeSynergies = TraitsMapping.FilterActiveTraits(synergies); - // if (activeSynergies.Count >= _traitThreshold) - // { - // var s = TraitsMapping.CompositionToString(composition, activeSynergies); - // Debug.Log(i + " : " + s); - // i++; - // } - // } + } private void HandleCombination(HashSet combination) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 4a49157..3823488 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1682,6 +1682,8 @@ RectTransform: m_Children: - {fileID: 1032725641} - {fileID: 479329096} + - {fileID: 1748395102} + - {fileID: 1985338594} m_Father: {fileID: 374169518} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1697,6 +1699,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532427843} m_CullTransparentMesh: 1 +--- !u!1 &1748395101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1748395102} + - component: {fileID: 1748395104} + - component: {fileID: 1748395103} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1748395102 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748395101} + 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: 1532427844} + 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: -544, y: 436} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1748395103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748395101} + 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: New Text + 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!222 &1748395104 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748395101} + m_CullTransparentMesh: 1 --- !u!1 &1812626013 GameObject: m_ObjectHideFlags: 0 @@ -1906,6 +2044,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1828978724} m_CullTransparentMesh: 1 +--- !u!1 &1985338593 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1985338594} + - component: {fileID: 1985338596} + - component: {fileID: 1985338595} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1985338594 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985338593} + 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: 1532427844} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 222, y: 0} + m_SizeDelta: {x: 620, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1985338595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985338593} + 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!222 &1985338596 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985338593} + m_CullTransparentMesh: 1 --- !u!1 &2080429967 GameObject: m_ObjectHideFlags: 0 @@ -2614,7 +2827,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3940269602259411472, guid: c027171600fc2d34e89847fce2ced78b, type: 3} propertyPath: m_SizeDelta.y - value: -25 + value: -131.3887 objectReference: {fileID: 0} - target: {fileID: 3940269602259411472, guid: c027171600fc2d34e89847fce2ced78b, type: 3} propertyPath: m_LocalPosition.x @@ -2650,7 +2863,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3940269602259411472, guid: c027171600fc2d34e89847fce2ced78b, type: 3} propertyPath: m_AnchoredPosition.y - value: -7.5 + value: -60.694366 objectReference: {fileID: 0} - target: {fileID: 3940269602259411472, guid: c027171600fc2d34e89847fce2ced78b, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/prefabs/Champion.prefab b/Assets/prefabs/Champion.prefab index a562716..81fd7f2 100644 --- a/Assets/prefabs/Champion.prefab +++ b/Assets/prefabs/Champion.prefab @@ -85,7 +85,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!1 &2700391889422099073 GameObject: m_ObjectHideFlags: 0 diff --git a/UserSettings/Layouts/default-2023.dwlt b/UserSettings/Layouts/default-2023.dwlt index 6cbd08e..b02637a 100644 --- a/UserSettings/Layouts/default-2023.dwlt +++ b/UserSettings/Layouts/default-2023.dwlt @@ -324,7 +324,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 + y: 19 width: 272 height: 926 m_SerializedDataModeController: @@ -395,7 +395,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000008cb200008eb20000 + m_ExpandedIDs: 000000008cb200008eb20000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -474,8 +474,8 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1572 - y: 73 + x: 1573 + y: 19 width: 347 height: 926 m_SerializedDataModeController: @@ -523,8 +523,8 @@ MonoBehaviour: m_TextWithWhitespace: "Hierarchy\u200B" m_Pos: serializedVersion: 2 - x: 1227 - y: 73 + x: 955 + y: 19 width: 343 height: 762 m_SerializedDataModeController: @@ -589,8 +589,8 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 273 - y: 73 + x: 1 + y: 19 width: 952 height: 762 m_SerializedDataModeController: @@ -1242,7 +1242,7 @@ MonoBehaviour: y: 21 width: 1167 height: 741 - m_Scale: {x: 0.6078125, y: 0.60781246} + m_Scale: {x: 0.6078125, y: 0.6078125} m_Translation: {x: 583.49994, y: 370.49997} m_MarginLeft: 0 m_MarginRight: 0 @@ -1283,8 +1283,8 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 273 - y: 856 + x: 1 + y: 802 width: 1297 height: 143 m_SerializedDataModeController: