|
|
@@ -95,32 +95,40 @@ namespace GFGGame
|
|
|
|
|
|
if (true)
|
|
|
{
|
|
|
- DressUpObjUI dressUpObjUI;
|
|
|
- if (_ui.m_showSuit.data == null)
|
|
|
+ if (GameGlobal.ShowPainting)
|
|
|
{
|
|
|
- _ui.m_showSuit.data = new DressUpObjUI("SceneSuitFoster");
|
|
|
+ SuitCfg suitCfg = CommonDataManager.Tables.TblSuitCfg.GetOrDefault(SuitID);
|
|
|
+ _ui.m_loaCard.url = ResPathUtil.GetLiHuiPath(suitCfg.Illustration);
|
|
|
}
|
|
|
-
|
|
|
- bool showAction = SuitCfgArray.Instance.CheckSuitHasAction(SuitID) &&
|
|
|
- DressUpMenuSuitDataManager.CheckSuitHasActionRes(SuitID);
|
|
|
- dressUpObjUI = _ui.m_showSuit.data as DressUpObjUI;
|
|
|
-
|
|
|
- // 改为异步加载
|
|
|
- dressUpObjUI.ResetSceneObjAsync(100, false, true, null, false, (go) =>
|
|
|
+ else
|
|
|
{
|
|
|
- if (go != null)
|
|
|
+ DressUpObjUI dressUpObjUI;
|
|
|
+ if (_ui.m_showSuit.data == null)
|
|
|
{
|
|
|
- dressUpObjUI.dressUpObj.PutOnSuitCfg(SuitID, showAction,
|
|
|
- new int[] { ConstDressUpItemType.BEI_JING }, false, false);
|
|
|
-
|
|
|
- Timers.inst.Add(1f, 1, OnTimerUpDate, dressUpObjUI);
|
|
|
- //dressUpObjUI.UpdateWrapper(_ui.m_showSuit);
|
|
|
+ _ui.m_showSuit.data = new DressUpObjUI("SceneSuitFoster");
|
|
|
}
|
|
|
- else
|
|
|
+
|
|
|
+ bool showAction = SuitCfgArray.Instance.CheckSuitHasAction(SuitID) &&
|
|
|
+ DressUpMenuSuitDataManager.CheckSuitHasActionRes(SuitID);
|
|
|
+ dressUpObjUI = _ui.m_showSuit.data as DressUpObjUI;
|
|
|
+
|
|
|
+ // 改为异步加载
|
|
|
+ dressUpObjUI.ResetSceneObjAsync(100, false, true, null, false, (go) =>
|
|
|
{
|
|
|
- Debug.LogError("场景对象加载失败");
|
|
|
- }
|
|
|
- });
|
|
|
+ if (go != null)
|
|
|
+ {
|
|
|
+ dressUpObjUI.dressUpObj.PutOnSuitCfg(SuitID, showAction,
|
|
|
+ new int[] { ConstDressUpItemType.BEI_JING }, false, false);
|
|
|
+
|
|
|
+ Timers.inst.Add(1f, 1, OnTimerUpDate, dressUpObjUI);
|
|
|
+ //dressUpObjUI.UpdateWrapper(_ui.m_showSuit);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Debug.LogError("场景对象加载失败");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|