最新制作提交
This commit is contained in:
parent
038d8735fb
commit
0ed79d5866
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: be8de9e69f1474d459db0246d20b478a
|
guid: 6840726ff56cd64428c73b0828c0805d
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|||||||
BIN
Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4
Normal file
BIN
Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4
Normal file
Binary file not shown.
7
Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4.meta
Normal file
7
Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: be8de9e69f1474d459db0246d20b478a
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -306,7 +306,8 @@ namespace DongWuYiXue.DaoNiaoShu
|
|||||||
{
|
{
|
||||||
if (isTure)
|
if (isTure)
|
||||||
{
|
{
|
||||||
GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => {
|
GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) =>
|
||||||
|
{
|
||||||
GameManager.Instance.uiManager.GetUI<ScorePanel>().SetScore(s.ToString(), t.ToString());
|
GameManager.Instance.uiManager.GetUI<ScorePanel>().SetScore(s.ToString(), t.ToString());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -368,7 +369,8 @@ namespace DongWuYiXue.DaoNiaoShu
|
|||||||
{
|
{
|
||||||
if (isTrue)
|
if (isTrue)
|
||||||
{
|
{
|
||||||
GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => {
|
GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) =>
|
||||||
|
{
|
||||||
GameManager.Instance.uiManager.GetUI<ScorePanel>().SetScore(s.ToString(), t.ToString());
|
GameManager.Instance.uiManager.GetUI<ScorePanel>().SetScore(s.ToString(), t.ToString());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -385,7 +387,8 @@ namespace DongWuYiXue.DaoNiaoShu
|
|||||||
DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI<DragQuestionPanel>();
|
DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI<DragQuestionPanel>();
|
||||||
dragQuestionPanel.ShowDragQuestion(id, stepName);
|
dragQuestionPanel.ShowDragQuestion(id, stepName);
|
||||||
dragQuestionPanel.nextAction = nextFun;
|
dragQuestionPanel.nextAction = nextFun;
|
||||||
dragQuestionPanel.subAction = isTrue => {
|
dragQuestionPanel.subAction = isTrue =>
|
||||||
|
{
|
||||||
if (isTrue)
|
if (isTrue)
|
||||||
{
|
{
|
||||||
GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) =>
|
GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) =>
|
||||||
@ -395,10 +398,7 @@ namespace DongWuYiXue.DaoNiaoShu
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GameManager.Instance.kaoheManager.AddScore(0, scoreId, (s, t) =>
|
GameManager.Instance.kaoheManager.AddScore(0, scoreId, null);
|
||||||
{
|
|
||||||
GameManager.Instance.uiManager.GetUI<ScorePanel>().SetScore(s.ToString(), t.ToString());
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -140,7 +140,7 @@ namespace DongWuYiXue.DaoNiaoShu
|
|||||||
{
|
{
|
||||||
if (!drags[i].drag && drags[i].yourTarget != null)
|
if (!drags[i].drag && drags[i].yourTarget != null)
|
||||||
{
|
{
|
||||||
str += drags[i].yourTarget.dragName;
|
str += drags[i].yourTarget.dragName + "、";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (string.IsNullOrEmpty(str))
|
if (string.IsNullOrEmpty(str))
|
||||||
|
|||||||
@ -39,6 +39,7 @@ namespace DongWuYiXue.DaoNiaoShu
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
nextBtn.gameObject.SetActive(true);
|
nextBtn.gameObject.SetActive(true);
|
||||||
|
subAction?.Invoke(false);
|
||||||
Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false });
|
Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false });
|
||||||
if (MVC.GetModel<Main.GameModel>().modeType == ModeType.ShiXun)
|
if (MVC.GetModel<Main.GameModel>().modeType == ModeType.ShiXun)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -39,7 +39,7 @@ namespace DongWuYiXue.DaoNiaoShu
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//subAction?.Invoke(false);
|
subAction?.Invoke(false);
|
||||||
Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false });
|
Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false });
|
||||||
if (MVC.GetModel<Main.GameModel>().modeType == ModeType.ShiXun)
|
if (MVC.GetModel<Main.GameModel>().modeType == ModeType.ShiXun)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -33,6 +33,7 @@ namespace DongWuYiXue.DaoNiaoShu
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
subAction?.Invoke(false);
|
||||||
Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false });
|
Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false });
|
||||||
if (MVC.GetModel<Main.GameModel>().modeType == ModeType.ShiXun)
|
if (MVC.GetModel<Main.GameModel>().modeType == ModeType.ShiXun)
|
||||||
{
|
{
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user