|
@@ -192,7 +192,6 @@ namespace GFGGame
|
|
|
|
|
|
Timers.inst.Remove(UpdateShake);
|
|
|
Timers.inst.Remove(OnScreenEffectComplete);
|
|
|
- Timers.inst.Remove(DelayCheckLayerRight);
|
|
|
ScreenBlackController.Instance.HideBlack();
|
|
|
|
|
|
// 不是茶话会,则记录上一次自动播放按钮的状态
|
|
@@ -485,7 +484,6 @@ namespace GFGGame
|
|
|
yield break;
|
|
|
}
|
|
|
|
|
|
- Timers.inst.Remove(DelayCheckLayerRight);
|
|
|
if (storyDialogCfg.showChangeName == 1 && StorageDataManager.Instance.GetStorageValue(ConstStorageId.CHANGE_NAME) == 0)
|
|
|
{
|
|
|
GameController.ShowCreateRole();
|
|
@@ -554,8 +552,9 @@ namespace GFGGame
|
|
|
{
|
|
|
//换装
|
|
|
_ui.m_dialogHead.m_comphead.target.visible = false;
|
|
|
-
|
|
|
+
|
|
|
//_dressUpObjUI.ResetSceneObj(80, true, false, sceneObject.transform.Find("Scene").gameObject, false);
|
|
|
+ GRoot.inst.touchable = false;
|
|
|
_dressUpObj.setSceneObj(_dressUpSceneObj, false, false, null, false, ChangeHeadImgLayer);
|
|
|
|
|
|
if (storyDialogCfg.suitId > 0)
|
|
@@ -574,8 +573,6 @@ namespace GFGGame
|
|
|
{
|
|
|
//表情
|
|
|
_dressUpObj.AddOrRemove(headAniCfg.faceId, true);
|
|
|
- Timers.inst.Remove(DelayCheckLayerRight);
|
|
|
- Timers.inst.Add(1, 1, DelayCheckLayerRight);
|
|
|
}
|
|
|
_ui.m_dialogHead.m_compDressUp.target.visible = true;
|
|
|
}
|
|
@@ -1131,11 +1128,7 @@ namespace GFGGame
|
|
|
Transform parent = _dressUpSceneObj.transform.Find("Role");
|
|
|
// HeadImg的层级:6
|
|
|
ChangeLayer(parent, 6);
|
|
|
- }
|
|
|
-
|
|
|
- private void DelayCheckLayerRight(object param)
|
|
|
- {
|
|
|
- ChangeHeadImgLayer();
|
|
|
+ GRoot.inst.touchable = true;
|
|
|
}
|
|
|
|
|
|
private void ChangeLayer(Transform transform, int layer)
|