|
@@ -142,7 +142,6 @@ namespace GFGGame
|
|
|
|
|
|
IsTeaParty = (bool)datas[4];
|
|
IsTeaParty = (bool)datas[4];
|
|
_autoPlay = _lastStartAutoPlay;
|
|
_autoPlay = _lastStartAutoPlay;
|
|
- _ui.m_btnAutoPlay.selected = _autoPlay;
|
|
|
|
|
|
|
|
if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
|
|
if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
|
|
{
|
|
{
|
|
@@ -165,12 +164,15 @@ namespace GFGGame
|
|
FightDataManager.Instance.dialogSpeed = _speedAutoPlay;
|
|
FightDataManager.Instance.dialogSpeed = _speedAutoPlay;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 茶会修改参数
|
|
if (IsTeaParty)
|
|
if (IsTeaParty)
|
|
{
|
|
{
|
|
|
|
+ _autoPlay = true;
|
|
_ui.m_c1.selectedIndex = 2;
|
|
_ui.m_c1.selectedIndex = 2;
|
|
_speedAutoPlay = 1;
|
|
_speedAutoPlay = 1;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ _ui.m_btnAutoPlay.selected = _autoPlay;
|
|
_ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
|
|
_ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
|
|
StoryDialogDataManager.Instance.Clear();
|
|
StoryDialogDataManager.Instance.Clear();
|
|
|
|
|
|
@@ -186,7 +188,11 @@ namespace GFGGame
|
|
Timers.inst.Remove(UpdateShake);
|
|
Timers.inst.Remove(UpdateShake);
|
|
Timers.inst.Remove(OnScreenEffectComplete);
|
|
Timers.inst.Remove(OnScreenEffectComplete);
|
|
ScreenBlackController.Instance.HideBlack();
|
|
ScreenBlackController.Instance.HideBlack();
|
|
- _lastStartAutoPlay = _autoPlay;
|
|
|
|
|
|
+
|
|
|
|
+ if (!IsTeaParty)
|
|
|
|
+ {
|
|
|
|
+ _lastStartAutoPlay = _autoPlay;
|
|
|
|
+ }
|
|
StopAutoPlay();
|
|
StopAutoPlay();
|
|
VoiceManager.Instance.StopVoice();
|
|
VoiceManager.Instance.StopVoice();
|
|
|
|
|