Merge branch 'master' into LouDi_Quan
This commit is contained in:
commit
0ae1b0c26d
@ -15,6 +15,7 @@ public class ActionHelper
|
|||||||
{ "UIOperationList", typeof(UIOperationList) },
|
{ "UIOperationList", typeof(UIOperationList) },
|
||||||
{ "UIBtns", typeof(QFramework.Example.UIBtns) },
|
{ "UIBtns", typeof(QFramework.Example.UIBtns) },
|
||||||
{ "UITools", typeof(QFramework.Example.UITools) },
|
{ "UITools", typeof(QFramework.Example.UITools) },
|
||||||
|
{ "UIHint", typeof(QFramework.Example.UIHint) },
|
||||||
{ "UICameraSwitch", typeof(QFramework.Example.UICameraSwitch) },
|
{ "UICameraSwitch", typeof(QFramework.Example.UICameraSwitch) },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -184,6 +184,10 @@
|
|||||||
<Action type="NextOperation"></Action>
|
<Action type="NextOperation"></Action>
|
||||||
</Action>
|
</Action>
|
||||||
</Start>
|
</Start>
|
||||||
|
<Finished>
|
||||||
|
<Action type="Sequence">
|
||||||
|
</Action>
|
||||||
|
</Finished>
|
||||||
</Step>
|
</Step>
|
||||||
</Step>
|
</Step>
|
||||||
</Operation>
|
</Operation>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user