This commit is contained in:
parent
86d9700f5e
commit
75110d7921
|
|
@ -33,11 +33,11 @@ RectTransform:
|
||||||
m_Father: {fileID: 5625638144886982000}
|
m_Father: {fileID: 5625638144886982000}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 392, y: 291}
|
m_SizeDelta: {x: 392, y: 291}
|
||||||
m_Pivot: {x: 0.5, y: 0}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2726539252916585144
|
--- !u!222 &2726539252916585144
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -93,8 +93,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 31.5
|
m_fontSize: 30
|
||||||
m_fontSizeBase: 31.5
|
m_fontSizeBase: 30
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
@ -168,11 +168,11 @@ RectTransform:
|
||||||
m_Father: {fileID: 5625638144570284794}
|
m_Father: {fileID: 5625638144570284794}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 392, y: 291}
|
m_SizeDelta: {x: 392, y: 291}
|
||||||
m_Pivot: {x: 0.5, y: 0}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7436443282282947132
|
--- !u!222 &7436443282282947132
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -228,8 +228,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 31.5
|
m_fontSize: 30
|
||||||
m_fontSizeBase: 31.5
|
m_fontSizeBase: 30
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
@ -303,11 +303,11 @@ RectTransform:
|
||||||
m_Father: {fileID: 5625638144949982616}
|
m_Father: {fileID: 5625638144949982616}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 392, y: 291}
|
m_SizeDelta: {x: 392, y: 291}
|
||||||
m_Pivot: {x: 0.5, y: 0}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7200139768427026583
|
--- !u!222 &7200139768427026583
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -363,8 +363,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 31.5
|
m_fontSize: 30
|
||||||
m_fontSizeBase: 31.5
|
m_fontSizeBase: 30
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
@ -2294,11 +2294,11 @@ RectTransform:
|
||||||
m_Father: {fileID: 5625638144801094708}
|
m_Father: {fileID: 5625638144801094708}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 392, y: 291}
|
m_SizeDelta: {x: 392, y: 291}
|
||||||
m_Pivot: {x: 0.5, y: 0}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5935834804556298687
|
--- !u!222 &5935834804556298687
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2354,8 +2354,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 31.5
|
m_fontSize: 30
|
||||||
m_fontSizeBase: 31.5
|
m_fontSizeBase: 30
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
|
||||||
|
|
@ -104,14 +104,23 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
|
||||||
break;
|
break;
|
||||||
case "Subject2":
|
case "Subject2":
|
||||||
//LoadImage("Sprite/2");
|
//LoadImage("Sprite/2");
|
||||||
|
Toggle_Subject.isOn = false;
|
||||||
|
SubjectContentText.gameObject.SetActive(false);
|
||||||
|
SubjectContentText.DOFade(0, 0.01f);
|
||||||
Debug.Log("2222");
|
Debug.Log("2222");
|
||||||
break;
|
break;
|
||||||
case "Subject3":
|
case "Subject3":
|
||||||
//LoadImage("Sprite/3");
|
//LoadImage("Sprite/3");
|
||||||
|
Toggle_Subject.isOn = false;
|
||||||
|
SubjectContentText.gameObject.SetActive(false);
|
||||||
|
SubjectContentText.DOFade(0, 0.01f);
|
||||||
Debug.Log("3333");
|
Debug.Log("3333");
|
||||||
break;
|
break;
|
||||||
case "Subject4":
|
case "Subject4":
|
||||||
// Debug.Log("4444");
|
// Debug.Log("4444");
|
||||||
|
Toggle_Subject.isOn = false;
|
||||||
|
SubjectContentText.gameObject.SetActive(false);
|
||||||
|
SubjectContentText.DOFade(0, 0.01f);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -144,7 +153,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
|
||||||
yield return new WaitForSeconds(0.01f);
|
yield return new WaitForSeconds(0.01f);
|
||||||
if (isOn)
|
if (isOn)
|
||||||
{
|
{
|
||||||
SubjectContentText.DOFade(1, 0.5f);
|
SubjectContentText.DOFade(1, 1f);
|
||||||
SubjectContentText.gameObject.SetActive(isOn);
|
SubjectContentText.gameObject.SetActive(isOn);
|
||||||
SubjectNameText.transform.DOLocalMoveY(70,0.5f);
|
SubjectNameText.transform.DOLocalMoveY(70,0.5f);
|
||||||
Toggle_Subject.transform.DOScale(1.2f, 0.1f);
|
Toggle_Subject.transform.DOScale(1.2f, 0.1f);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue