Signed-off-by: TRAfoer <lhf190@outlook.com>
This commit is contained in:
@@ -17,7 +17,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &224206035872607872
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -28,9 +28,9 @@ RectTransform:
|
||||
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: 224050597908199218}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@@ -58,7 +58,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 255}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@@ -105,11 +105,11 @@ RectTransform:
|
||||
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: 224206035872607872}
|
||||
- {fileID: 224738567245812642}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@@ -155,7 +155,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.13725491, g: 0.21568628, b: 0.29411766, a: 1}
|
||||
m_Color: {r: 0.13725491, g: 0.21568628, b: 0.29411766, a: 255}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@@ -244,14 +244,14 @@ RectTransform:
|
||||
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: 224050597908199218}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 20, y: 0}
|
||||
m_SizeDelta: {x: -60, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222126012613830654
|
||||
CanvasRenderer:
|
||||
@@ -292,7 +292,7 @@ MonoBehaviour:
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 255}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@@ -309,11 +309,11 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 25
|
||||
m_fontSize: 32.3
|
||||
m_fontSizeBase: 25
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 7.08
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
@@ -327,7 +327,7 @@ MonoBehaviour:
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 1
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
|
||||
@@ -18,38 +18,43 @@ MonoBehaviour:
|
||||
animatedIconColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
contextBackgroundColor: {r: 0.21568628, g: 0.29411766, b: 0.37254903, a: 1}
|
||||
buttonFont: {fileID: 11400000, guid: 84dd14695854bbc43a5faa24fcf93d0d, type: 2}
|
||||
buttonNormalColor: {r: 0.21568628, g: 0.29411766, b: 0.37254903, a: 255}
|
||||
buttonNormalColor: {r: 0.3, g: 0.3, b: 0.3, a: 1}
|
||||
buttonAccentColor: {r: 1, g: 1, b: 1, a: 255}
|
||||
buttonDisabledAlpha: 0.4
|
||||
dropdownFont: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2}
|
||||
dropdownItemFont: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2}
|
||||
dropdownBackgroundColor: {r: 0.21568628, g: 0.29411766, b: 0.37254903, a: 255}
|
||||
dropdownContentBackgroundColor: {r: 0.1764706, g: 0.25490198, b: 0.33333334, a: 255}
|
||||
dropdownBackgroundColor: {r: 0.26666668, g: 0.26666668, b: 0.26666668, a: 1}
|
||||
dropdownContentBackgroundColor: {r: 0.3, g: 0.3, b: 0.3, a: 1}
|
||||
dropdownPrimaryColor: {r: 1, g: 1, b: 1, a: 255}
|
||||
dropdownItemBackgroundColor: {r: 0.13725491, g: 0.21568628, b: 0.29411766, a: 255}
|
||||
dropdownItemBackgroundColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
|
||||
dropdownItemPrimaryColor: {r: 1, g: 1, b: 1, a: 255}
|
||||
selectorFont: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2}
|
||||
selectorColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
selectorHighlightedColor: {r: 0.1764706, g: 0.25490198, b: 0.33333334, a: 1}
|
||||
inputFieldFont: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2}
|
||||
inputFieldColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
modalWindowTitleFont: {fileID: 11400000, guid: fa328c1ae3ffb6b4583cf371153b0be6, type: 2}
|
||||
modalWindowContentFont: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2}
|
||||
modalWindowTitleFont: {fileID: 11400000, guid: fa328c1ae3ffb6b4583cf371153b0be6,
|
||||
type: 2}
|
||||
modalWindowContentFont: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f,
|
||||
type: 2}
|
||||
modalWindowTitleColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
modalWindowDescriptionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
modalWindowIconColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
modalWindowBackgroundColor: {r: 0.1764706, g: 0.25490198, b: 0.33333334, a: 1}
|
||||
modalWindowBackgroundColor: {r: 0.3, g: 0.3, b: 0.3, a: 1}
|
||||
modalWindowContentPanelColor: {r: 1, g: 1, b: 1, a: 0.039215688}
|
||||
notificationTitleFont: {fileID: 11400000, guid: fa328c1ae3ffb6b4583cf371153b0be6, type: 2}
|
||||
notificationTitleFont: {fileID: 11400000, guid: fa328c1ae3ffb6b4583cf371153b0be6,
|
||||
type: 2}
|
||||
notificationTitleFontSize: 22.5
|
||||
notificationDescriptionFont: {fileID: 11400000, guid: 2f17e8bb3967fe14093d5fec798fffd9, type: 2}
|
||||
notificationDescriptionFont: {fileID: 11400000, guid: 2f17e8bb3967fe14093d5fec798fffd9,
|
||||
type: 2}
|
||||
notificationDescriptionFontSize: 18
|
||||
notificationThemeType: 0
|
||||
notificationBackgroundColor: {r: 0.1764706, g: 0.25490198, b: 0.33333334, a: 1}
|
||||
notificationTitleColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
notificationDescriptionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
notificationIconColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
progressBarLabelFont: {fileID: 11400000, guid: 84dd14695854bbc43a5faa24fcf93d0d, type: 2}
|
||||
progressBarLabelFont: {fileID: 11400000, guid: 84dd14695854bbc43a5faa24fcf93d0d,
|
||||
type: 2}
|
||||
progressBarLabelFontSize: 25
|
||||
progressBarColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
progressBarBackgroundColor: {r: 1, g: 1, b: 1, a: 0.05882353}
|
||||
@@ -78,7 +83,9 @@ MonoBehaviour:
|
||||
tooltipFontSize: 22
|
||||
tooltipTextColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
tooltipBackgroundColor: {r: 0.1764706, g: 0.25490198, b: 0.33333334, a: 1}
|
||||
customObjPrimaryFont: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2}
|
||||
customObjSecondaryFont: {fileID: 11400000, guid: fa328c1ae3ffb6b4583cf371153b0be6, type: 2}
|
||||
customObjPrimaryFont: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f,
|
||||
type: 2}
|
||||
customObjSecondaryFont: {fileID: 11400000, guid: fa328c1ae3ffb6b4583cf371153b0be6,
|
||||
type: 2}
|
||||
customObjPrimaryColor: {r: 1, g: 1, b: 1, a: 255}
|
||||
customObjSecondaryColor: {r: 0, g: 0, b: 0, a: 255}
|
||||
|
||||
@@ -166,7 +166,7 @@ namespace Michsky.MUIP
|
||||
|
||||
if (items[i].itemIcon == null) { setItemImage.gameObject.SetActive(false); }
|
||||
else { imageHelper = items[i].itemIcon; setItemImage.sprite = imageHelper; }
|
||||
|
||||
|
||||
items[i].itemIndex = i;
|
||||
Item mainItem = items[i];
|
||||
|
||||
@@ -184,7 +184,7 @@ namespace Michsky.MUIP
|
||||
if (selectedImage != null && !enableIcon) { selectedImage.gameObject.SetActive(false); }
|
||||
else if (selectedImage != null) { selectedImage.sprite = items[selectedItemIndex].itemIcon; }
|
||||
if (selectedText != null) { selectedText.text = items[selectedItemIndex].itemName; onItemTextChanged?.Invoke(selectedText); }
|
||||
|
||||
|
||||
if (saveSelected)
|
||||
{
|
||||
if (invokeAtStart) { items[PlayerPrefs.GetInt("Dropdown_" + saveKey)].OnItemSelection.Invoke(); }
|
||||
@@ -195,8 +195,8 @@ namespace Michsky.MUIP
|
||||
|
||||
// Obsolete
|
||||
public void ChangeDropdownInfo(int itemIndex)
|
||||
{
|
||||
SetDropdownIndex(itemIndex);
|
||||
{
|
||||
SetDropdownIndex(itemIndex);
|
||||
}
|
||||
|
||||
public void SetDropdownIndex(int itemIndex)
|
||||
@@ -206,8 +206,8 @@ namespace Michsky.MUIP
|
||||
|
||||
public void SetDropdownIndex(int itemIndex, bool bypassSound = false)
|
||||
{
|
||||
if (selectedImage != null && enableIcon && items[itemIndex].itemIcon != null) { selectedImage.gameObject.SetActive(true); selectedImage.sprite = items[itemIndex].itemIcon; }
|
||||
else if (selectedImage != null && enableIcon && items[itemIndex].itemIcon == null) { selectedImage.gameObject.SetActive(false); }
|
||||
// if (selectedImage != null && enableIcon && items[itemIndex].itemIcon != null) { selectedImage.gameObject.SetActive(true); selectedImage.sprite = items[itemIndex].itemIcon; }
|
||||
// else if (selectedImage != null && enableIcon && items[itemIndex].itemIcon == null) { selectedImage.gameObject.SetActive(false); }
|
||||
if (selectedText != null) { selectedText.text = items[itemIndex].itemName; onItemTextChanged?.Invoke(selectedText); }
|
||||
if (!bypassSound && enableDropdownSounds && useClickSound) { soundSource.PlayOneShot(clickSound); }
|
||||
|
||||
@@ -240,7 +240,7 @@ namespace Michsky.MUIP
|
||||
}
|
||||
|
||||
else if (!isOn && animationType == AnimationType.Custom)
|
||||
{
|
||||
{
|
||||
dropdownAnimator.Play("Stylish In");
|
||||
isOn = true;
|
||||
}
|
||||
@@ -311,7 +311,7 @@ namespace Michsky.MUIP
|
||||
{
|
||||
if (!isInteractable) { return; }
|
||||
if (enableDropdownSounds && useClickSound) { soundSource.PlayOneShot(clickSound); }
|
||||
|
||||
|
||||
Animate();
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace Michsky.MUIP
|
||||
if (overrideColors == false)
|
||||
{
|
||||
mainText.color = new Color(UIManagerAsset.inputFieldColor.r, UIManagerAsset.inputFieldColor.g, UIManagerAsset.inputFieldColor.b, mainText.color.a);
|
||||
placeholderText.color = new Color(UIManagerAsset.inputFieldColor.r, UIManagerAsset.inputFieldColor.g, UIManagerAsset.inputFieldColor.b, placeholderText.color.a);
|
||||
if (placeholderText != null) placeholderText.color = new Color(UIManagerAsset.inputFieldColor.r, UIManagerAsset.inputFieldColor.g, UIManagerAsset.inputFieldColor.b, placeholderText.color.a);
|
||||
filledImage.color = new Color(UIManagerAsset.inputFieldColor.r, UIManagerAsset.inputFieldColor.g, UIManagerAsset.inputFieldColor.b, filledImage.color.a);
|
||||
backgroundImage.color = new Color(UIManagerAsset.inputFieldColor.r, UIManagerAsset.inputFieldColor.g, UIManagerAsset.inputFieldColor.b, backgroundImage.color.a);
|
||||
}
|
||||
@@ -50,7 +50,7 @@ namespace Michsky.MUIP
|
||||
if (overrideFonts == false)
|
||||
{
|
||||
mainText.font = UIManagerAsset.inputFieldFont;
|
||||
placeholderText.font = UIManagerAsset.inputFieldFont;
|
||||
if (placeholderText != null) placeholderText.font = UIManagerAsset.inputFieldFont;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user