|
@@ -46,7 +46,7 @@ namespace GFGGame
|
|
|
isfullScreen = true;
|
|
isfullScreen = true;
|
|
|
|
|
|
|
|
//_dressUpObjUI = new DressUpObjUI("SceneDressUp", onShowAction);
|
|
//_dressUpObjUI = new DressUpObjUI("SceneDressUp", onShowAction);
|
|
|
- _ui.m_loaBg.onClick.Add(OnClickBg);
|
|
|
|
|
|
|
+ _ui.m_loaCard.onClick.Add(OnClickBg);
|
|
|
_ui.m_btnShare.onClick.Add(OnClickShare);
|
|
_ui.m_btnShare.onClick.Add(OnClickShare);
|
|
|
|
|
|
|
|
EffectUIPool.CreateEffectUI(_ui.m_holderEffect, "ui_ck", "ui_ck_tz",
|
|
EffectUIPool.CreateEffectUI(_ui.m_holderEffect, "ui_ck", "ui_ck_tz",
|
|
@@ -168,44 +168,54 @@ namespace GFGGame
|
|
|
int targetY = (int)(_ui.m_item.y + _ui.m_item.height + 50);
|
|
int targetY = (int)(_ui.m_item.y + _ui.m_item.height + 50);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- bool showAction = SuitCfgArray.Instance.CheckSuitHasAction(suitId) &&
|
|
|
|
|
- DressUpMenuSuitDataManager.CheckSuitHasActionRes(suitId);
|
|
|
|
|
|
|
|
|
|
- if (_dressUpObjUI != null)
|
|
|
|
|
|
|
+ if (GameGlobal.ShowPainting)
|
|
|
{
|
|
{
|
|
|
- _dressUpObjUI.Dispose();
|
|
|
|
|
- _dressUpObjUI = null;
|
|
|
|
|
|
|
+ SuitCfg suitCfg = CommonDataManager.Tables.TblSuitCfg.GetOrDefault(suitId);
|
|
|
|
|
+ _ui.m_loaCard.url = ResPathUtil.GetLiHuiPath(suitCfg.Illustration);
|
|
|
}
|
|
}
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
|
|
|
- _dressUpObjUI = new DressUpObjUI("SceneDressUp", onShowAction);
|
|
|
|
|
|
|
+ bool showAction = SuitCfgArray.Instance.CheckSuitHasAction(suitId) &&
|
|
|
|
|
+ DressUpMenuSuitDataManager.CheckSuitHasActionRes(suitId);
|
|
|
|
|
|
|
|
- // 使用异步方式重置场景对象
|
|
|
|
|
- _dressUpObjUI.ResetSceneObjAsync(
|
|
|
|
|
- 115,
|
|
|
|
|
- false,
|
|
|
|
|
- true,
|
|
|
|
|
- null,
|
|
|
|
|
- false,
|
|
|
|
|
- (sceneObj) =>
|
|
|
|
|
|
|
+ if (_dressUpObjUI != null)
|
|
|
{
|
|
{
|
|
|
- if (sceneObj != null)
|
|
|
|
|
- {
|
|
|
|
|
- // 场景对象加载完成后穿上套装
|
|
|
|
|
- _dressUpObjUI.dressUpObj.PutOnSuitCfg(
|
|
|
|
|
- suitId,
|
|
|
|
|
- showAction,
|
|
|
|
|
- null,
|
|
|
|
|
- false,
|
|
|
|
|
- false
|
|
|
|
|
- );
|
|
|
|
|
- Timers.inst.Add(2f, 1, OnTimerUpDate);
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
|
|
+ _dressUpObjUI.Dispose();
|
|
|
|
|
+ _dressUpObjUI = null;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ _dressUpObjUI = new DressUpObjUI("SceneDressUp", onShowAction);
|
|
|
|
|
+
|
|
|
|
|
+ // 使用异步方式重置场景对象
|
|
|
|
|
+ _dressUpObjUI.ResetSceneObjAsync(
|
|
|
|
|
+ 115,
|
|
|
|
|
+ false,
|
|
|
|
|
+ true,
|
|
|
|
|
+ null,
|
|
|
|
|
+ false,
|
|
|
|
|
+ (sceneObj) =>
|
|
|
{
|
|
{
|
|
|
- Debug.LogError($"Failed to load scene object for suit: {suitId}");
|
|
|
|
|
|
|
+ if (sceneObj != null)
|
|
|
|
|
+ {
|
|
|
|
|
+ // 场景对象加载完成后穿上套装
|
|
|
|
|
+ _dressUpObjUI.dressUpObj.PutOnSuitCfg(
|
|
|
|
|
+ suitId,
|
|
|
|
|
+ showAction,
|
|
|
|
|
+ null,
|
|
|
|
|
+ false,
|
|
|
|
|
+ false
|
|
|
|
|
+ );
|
|
|
|
|
+ Timers.inst.Add(2f, 1, OnTimerUpDate);
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ Debug.LogError($"Failed to load scene object for suit: {suitId}");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- );
|
|
|
|
|
|
|
+ );
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|