|
|
@@ -77,6 +77,8 @@ namespace GFGGame
|
|
|
_animObject = null;
|
|
|
}
|
|
|
|
|
|
+ SceneController.DeleteAnimObj();
|
|
|
+
|
|
|
_wordTextField = null;
|
|
|
_arrow = null;
|
|
|
_isShowLetters = false;
|
|
|
@@ -256,6 +258,8 @@ namespace GFGGame
|
|
|
_animObject = null;
|
|
|
}
|
|
|
|
|
|
+ SceneController.DeleteAnimObj();
|
|
|
+
|
|
|
EffectUIPool.Recycle(_effect);
|
|
|
_effect = null;
|
|
|
|
|
|
@@ -692,11 +696,13 @@ namespace GFGGame
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (headAniCfg != null && headAniCfg.FaceId > 0)
|
|
|
- {
|
|
|
- //表情
|
|
|
- _dressUpObj.AddOrRemove(headAniCfg.FaceId, true);
|
|
|
- Timers.inst.Add(0.1f, 1, OnTimerUpDate, storyDialogCfg);
|
|
|
+ if (!GameGlobal.ShowPainting) {
|
|
|
+ if (headAniCfg != null && headAniCfg.FaceId > 0)
|
|
|
+ {
|
|
|
+ //表情
|
|
|
+ _dressUpObj.AddOrRemove(headAniCfg.FaceId, true);
|
|
|
+ Timers.inst.Add(0.1f, 1, OnTimerUpDate, storyDialogCfg);
|
|
|
+ }
|
|
|
}
|
|
|
_ui.m_dialogHead.m_compDressUp.target.visible = true ;
|
|
|
}
|
|
|
@@ -950,7 +956,7 @@ namespace GFGGame
|
|
|
{
|
|
|
if (EmojiRes.Length > 0 && !IsTeaParty)
|
|
|
{
|
|
|
- SceneController.UpdateEmojiAni(EmojiRes, ref _animObject);
|
|
|
+ SceneController.UpdateEmojiAni(EmojiRes, _animObject);
|
|
|
}
|
|
|
}
|
|
|
|