动画名称兼容和逻辑bug
This commit is contained in:
parent
7c79fa182e
commit
03157a9b3a
|
@ -16,6 +16,14 @@ public class Film : MonoBehaviour
|
||||||
if (mAni == null)
|
if (mAni == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mAni.Play(pSceneCode);
|
if (!mAni.HasState(0, Animator.StringToHash(pSceneCode)))//兼容1-1-2这种
|
||||||
|
{
|
||||||
|
string tNewCode = pSceneCode.Replace("_", "-");
|
||||||
|
mAni.Play(tNewCode);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mAni.Play(pSceneCode);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -68,7 +68,8 @@ public class GameLogic : MonoBehaviour
|
||||||
if (tEndingID >= 0)
|
if (tEndingID >= 0)
|
||||||
{
|
{
|
||||||
bool tHasNew = PlayerData.Instance.AddEnding(PlayerData.Instance.CurrentLevelID, tEndingID);
|
bool tHasNew = PlayerData.Instance.AddEnding(PlayerData.Instance.CurrentLevelID, tEndingID);
|
||||||
|
tHasComplete = PlayerData.Instance.EndingCountOfLevel(PlayerData.Instance.CurrentLevelID) == tLvData.Endings.Count;
|
||||||
|
|
||||||
EndingData tEdData = tLvData.Endings[tEndingID];
|
EndingData tEdData = tLvData.Endings[tEndingID];
|
||||||
if (tEdData.IsGoodEnding)
|
if (tEdData.IsGoodEnding)
|
||||||
{
|
{
|
||||||
|
|
|
@ -455,7 +455,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 2, y: 2}
|
m_SizeDelta: {x: 1, y: 1}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!1 &1467285441891278
|
--- !u!1 &1467285441891278
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
|
@ -59,7 +59,7 @@ MonoBehaviour:
|
||||||
_profilerAlignment: 2
|
_profilerAlignment: 2
|
||||||
_optionsAlignment: 3
|
_optionsAlignment: 3
|
||||||
_consoleAlignment: 0
|
_consoleAlignment: 0
|
||||||
_triggerPosition: 1
|
_triggerPosition: 5
|
||||||
_maximumConsoleEntries: 1500
|
_maximumConsoleEntries: 1500
|
||||||
_enableEventSystemCreation: 0
|
_enableEventSystemCreation: 0
|
||||||
_automaticShowCursor: 1
|
_automaticShowCursor: 1
|
||||||
|
|
Loading…
Reference in New Issue