合计修正版本暂存
This commit is contained in:
1 parent
769b75e2e2
commit
a2b44262f7
17 files changed
+5498
-314
No files matched your search
@@ -64,7 +64,7 @@ public class MainController : BaseScene
|
||||
FinishMessage(sender);
|
||||
}
|
||||
|
||||
CanvasGroup[] msgs;
|
||||
List<CanvasGroup> msgs;
|
||||
Vector3 msgLocation;
|
||||
int msgIndex = 0;
|
||||
CanvasGroup rightMessage;
|
||||
@@ -82,9 +82,10 @@ public class MainController : BaseScene
|
||||
msg3.transform.localPosition = 1 * msgLocation;
|
||||
msg3.transform.localScale = Vector3.one;
|
||||
msg3.alpha = 0;
|
||||
msgs = new CanvasGroup[] { msg, msg2, msg3 };
|
||||
msgs = List<CanvasGroup> { msg, msg2, msg3 };
|
||||
rightMessage = transform.Find("GameObject/MessageRight").GetComponent<CanvasGroup>();
|
||||
#else
|
||||
msgLocation = new Vector3(168, -153, 0);
|
||||
var go = transform.Find("GameObject");
|
||||
go.GetComponent<RectTransform>().anchorMin = Vector2.zero;
|
||||
go.GetComponent<RectTransform>().anchorMax = Vector2.one;
|
||||
@@ -97,7 +98,18 @@ public class MainController : BaseScene
|
||||
|
||||
rightMessage.transform.SetParent(go);
|
||||
rightMessage.transform.localScale = Vector3.one;
|
||||
rightMessage.transform.localPosition = new Vector3(-112, 164, 0);
|
||||
rightMessage.transform.localPosition = 1 * msgLocation;
|
||||
msgs = new List<CanvasGroup> { rightMessage };
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
var tmpm = Instantiate<CanvasGroup>(rightMessage);
|
||||
tmpm.transform.SetParent(rightMessage.transform.parent);
|
||||
tmpm.transform.localPosition = 1 * msgLocation;
|
||||
tmpm.transform.localScale = Vector3.one;
|
||||
tmpm.alpha = 0;
|
||||
msgs.Add(tmpm);
|
||||
}
|
||||
|
||||
Debug.Log(rightMessage.GetComponent<RectTransform>().localPosition);
|
||||
//rightMessage.transform.SetParent(transform.Find("GameObject"));
|
||||
#endif
|
||||
@@ -120,7 +132,7 @@ public class MainController : BaseScene
|
||||
#else
|
||||
if (App.currentPageIsHome)
|
||||
{
|
||||
DoMessageRight(e);
|
||||
DoMessage6(e);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -156,6 +168,38 @@ public class MainController : BaseScene
|
||||
}
|
||||
msgIndex++;
|
||||
}
|
||||
private void DoMessage6(LinkedMessageEvent e)
|
||||
{
|
||||
var selectIndex = msgIndex % 6;
|
||||
var m = msgs[selectIndex];
|
||||
if (msgIndex >= 6) //
|
||||
{
|
||||
//msgIndex = 0;
|
||||
m.DOFade(0, 0.5f).onComplete = () =>
|
||||
{
|
||||
SetMessage(m, e);
|
||||
m.transform.localPosition = 1 * msgLocation;
|
||||
m.DOFade(1, 0.5f);
|
||||
foreach (var item in msgs.Where((x, i) => i != selectIndex))
|
||||
{
|
||||
item.transform.DOLocalMoveY(item.transform.localPosition.y + 38, 0.5f);
|
||||
}
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log(191);
|
||||
SetMessage(m, e);
|
||||
for (int i = 0; i < msgIndex; i++)
|
||||
{
|
||||
var rect = msgs[i].GetComponent<RectTransform>();
|
||||
rect.DOLocalMoveY(rect.localPosition.y + 38, 0.5f);
|
||||
}
|
||||
m.DOFade(1, 0.5f);
|
||||
}
|
||||
msgIndex++;
|
||||
}
|
||||
|
||||
void FinishMessage(object sender)
|
||||
{
|
||||
#if UNITY_STANDALONE_WIN
|
||||
@@ -170,7 +214,7 @@ public class MainController : BaseScene
|
||||
#else
|
||||
if (!(bool)sender)
|
||||
{
|
||||
FinishMessageRight();
|
||||
FinishMessage6();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -193,6 +237,15 @@ public class MainController : BaseScene
|
||||
msgIndex = 0;
|
||||
rightMessage.DOFade(0, 0.3f);
|
||||
}
|
||||
void FinishMessage6()
|
||||
{
|
||||
msgIndex = 0;
|
||||
foreach (var m in msgs)
|
||||
{
|
||||
m.alpha = 0;
|
||||
m.GetComponent<RectTransform>().localPosition = 1 * msgLocation;
|
||||
}
|
||||
}
|
||||
private void SetMessage(CanvasGroup m,LinkedMessageEvent e)
|
||||
{
|
||||
m.transform.Find("Avatar").GetComponent<RawImage>().texture = null;
|
||||
|
||||
Reference in new issue
Block a user