提交模块退出,ChangeOperation方法,完善内容,模块3切换任务状态机无bug
This commit is contained in:
parent
b9e784f912
commit
37d2e51dd8
File diff suppressed because one or more lines are too long
@ -15,7 +15,7 @@ namespace QFramework.Example
|
||||
Button curBtn;
|
||||
protected override void OnInit(IUIData uiData = null)
|
||||
{
|
||||
//TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuit).UnRegisterWhenGameObjectDestroyed(gameObject);
|
||||
TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuit).UnRegisterWhenGameObjectDestroyed(gameObject);
|
||||
|
||||
mData = uiData as UIChangeOperationData ?? new UIChangeOperationData();
|
||||
// please add init code here
|
||||
@ -64,9 +64,9 @@ namespace QFramework.Example
|
||||
{
|
||||
//transform.gameObject.SetActive(false);
|
||||
}
|
||||
//public void OnModuleQuit(OnModuleQuit arg)
|
||||
//{
|
||||
// Hide();
|
||||
//}
|
||||
public void OnModuleQuit(OnModuleQuit arg)
|
||||
{
|
||||
Hide();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<Action type="Var" name="完成" value="0"></Action>
|
||||
|
||||
<Action type="UIShow" value="UIOperationList" isShow="true"></Action>
|
||||
<Action type="OperationChange" name="初始化"></Action>
|
||||
<Action type="UIShow" value="UIChangeOperation" isShow="true"></Action>
|
||||
|
||||
<Action type="UIShow" value="UIHint" isShow="true"></Action>
|
||||
|
||||
@ -90,11 +90,7 @@
|
||||
|
||||
<Action type="Log" value="HintHintHintHint2222"></Action>
|
||||
|
||||
<!--<Action type="OperationChange" name="单反拍照"></Action>-->
|
||||
|
||||
<Action type="UIShow" value="UIChangeOperation" isShow="true"></Action>
|
||||
<Action type="Log" value="HintHintHintHint3333"></Action>
|
||||
|
||||
<Action type="OperationChange" name="初始化"></Action>
|
||||
</Action>
|
||||
</Enter>
|
||||
</State>
|
||||
@ -103,6 +99,7 @@
|
||||
<State name="摄像机拍摄">
|
||||
<Enter>
|
||||
<Action type="Sequence">
|
||||
<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>
|
||||
<Action type="OperationChange" name="摄像机拍摄"></Action>
|
||||
</Action>
|
||||
</Enter>
|
||||
@ -110,6 +107,7 @@
|
||||
<State name="单反摄影">
|
||||
<Enter>
|
||||
<Action type="Sequence">
|
||||
<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>
|
||||
<Action type="OperationChange" name="单反摄影"></Action>
|
||||
</Action>
|
||||
</Enter>
|
||||
@ -119,6 +117,7 @@
|
||||
<State name="单反拍照">
|
||||
<Enter>
|
||||
<Action type="Sequence">
|
||||
<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>
|
||||
<Action type="OperationChange" name="单反拍照"></Action>
|
||||
</Action>
|
||||
</Enter>
|
||||
@ -222,7 +221,7 @@
|
||||
<Start>
|
||||
<Action type="Sequence">
|
||||
|
||||
<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>
|
||||
<!--<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>-->
|
||||
|
||||
<Action type="Move" value="FlyCamera" to="1.921192,1.341881,-1.91985" time="0"></Action>
|
||||
<Action type="Rotate" value="FlyCamera" to="1.338014,327.1598,2.66877E-08" time="0"></Action>
|
||||
@ -784,7 +783,7 @@
|
||||
<Start>
|
||||
<Action type="Sequence">
|
||||
|
||||
<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>
|
||||
<!--<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>-->
|
||||
|
||||
<Action type="Move" value="FlyCamera" to="1.921192,1.341881,-1.91985" time="0"></Action>
|
||||
<Action type="Rotate" value="FlyCamera" to="1.338014,327.1598,2.66877E-08" time="0"></Action>
|
||||
@ -1486,7 +1485,7 @@
|
||||
<Start>
|
||||
<Action type="Sequence">
|
||||
|
||||
<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>
|
||||
<!--<Action type="UIShow" value="UIChangeOperation" isShow="false"></Action>-->
|
||||
|
||||
<Action type="Move" value="FlyCamera" to="1.921192,1.341881,-1.91985" time="0"></Action>
|
||||
<Action type="Rotate" value="FlyCamera" to="1.338014,327.1598,2.66877E-08" time="0"></Action>
|
||||
|
||||
@ -17,7 +17,4 @@ EditorBuildSettings:
|
||||
- enabled: 1
|
||||
path: Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity
|
||||
guid: 2192f00abfd100d44b0c12bdc8e1854e
|
||||
- enabled: 1
|
||||
path: Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe-ef0c6246.unity
|
||||
guid: 69c0f9d4ce81da6429d5bfe166514b55
|
||||
m_configObjects: {}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user