|
|
@@ -130,50 +130,59 @@ namespace GFGGame
|
|
|
{
|
|
|
_actionIsPic = isPic;
|
|
|
SuitCfg suitCfg = CommonDataManager.Tables.TblSuitCfg.GetOrDefault(_suitId);
|
|
|
+
|
|
|
_ui.m_txtSuitName.text = suitCfg.Name;
|
|
|
|
|
|
- if (_dressUpObjUI != null)
|
|
|
+ if (GameGlobal.ShowPainting)
|
|
|
{
|
|
|
- _dressUpObjUI.Dispose();
|
|
|
- _dressUpObjUI = null;
|
|
|
+ touchClick = true;
|
|
|
+ _ui.m_loaCard.url = ResPathUtil.GetLiHuiPath(suitCfg.Illustration);
|
|
|
}
|
|
|
-
|
|
|
- _dressUpObjUI = new DressUpObjUI("SceneDressUp");
|
|
|
-
|
|
|
- // 使用异步方式重置场景对象
|
|
|
- _dressUpObjUI.ResetSceneObjAsync(100, false, true, null, false, (sceneObj) =>
|
|
|
+ else
|
|
|
{
|
|
|
- if (sceneObj != null)
|
|
|
+ if (_dressUpObjUI != null)
|
|
|
{
|
|
|
- //_dressUpObjUI.dressUpObj.SetOnSuitPutOnCompleteCallback(() =>
|
|
|
- //{
|
|
|
- //_dressUpObjUI.UpdateWrapper(_ui.m_holder);
|
|
|
- //UpdateSuitBoxStatus();
|
|
|
- //});
|
|
|
-
|
|
|
- // 场景对象加载完成后穿上套装
|
|
|
- _dressUpObjUI.dressUpObj.PutOnSuitCfg(
|
|
|
- _suitId,
|
|
|
- isPic,
|
|
|
- new int[] { ConstDressUpItemType.BEI_JING },
|
|
|
- true,
|
|
|
- false,
|
|
|
- false,
|
|
|
- (needYooAsseetDown) =>
|
|
|
- {
|
|
|
- if(needYooAsseetDown)
|
|
|
- Timers.inst.Add(4f, 1, OnTimerUpDate);
|
|
|
- else
|
|
|
- Timers.inst.Add(0.3f, 1, OnTimerUpDate);
|
|
|
- }
|
|
|
- );
|
|
|
- UpdateSuitBoxStatus();
|
|
|
+ _dressUpObjUI.Dispose();
|
|
|
+ _dressUpObjUI = null;
|
|
|
}
|
|
|
- else
|
|
|
+
|
|
|
+ _dressUpObjUI = new DressUpObjUI("SceneDressUp");
|
|
|
+
|
|
|
+ // 使用异步方式重置场景对象
|
|
|
+ _dressUpObjUI.ResetSceneObjAsync(100, false, true, null, false, (sceneObj) =>
|
|
|
{
|
|
|
- Debug.LogError("Failed to load scene object for suit view");
|
|
|
- }
|
|
|
- });
|
|
|
+ if (sceneObj != null)
|
|
|
+ {
|
|
|
+ //_dressUpObjUI.dressUpObj.SetOnSuitPutOnCompleteCallback(() =>
|
|
|
+ //{
|
|
|
+ //_dressUpObjUI.UpdateWrapper(_ui.m_holder);
|
|
|
+ //UpdateSuitBoxStatus();
|
|
|
+ //});
|
|
|
+
|
|
|
+ // 场景对象加载完成后穿上套装
|
|
|
+ _dressUpObjUI.dressUpObj.PutOnSuitCfg(
|
|
|
+ _suitId,
|
|
|
+ isPic,
|
|
|
+ new int[] { ConstDressUpItemType.BEI_JING },
|
|
|
+ true,
|
|
|
+ false,
|
|
|
+ false,
|
|
|
+ (needYooAsseetDown) =>
|
|
|
+ {
|
|
|
+ if(needYooAsseetDown)
|
|
|
+ Timers.inst.Add(4f, 1, OnTimerUpDate);
|
|
|
+ else
|
|
|
+ Timers.inst.Add(0.3f, 1, OnTimerUpDate);
|
|
|
+ }
|
|
|
+ );
|
|
|
+ UpdateSuitBoxStatus();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Debug.LogError("Failed to load scene object for suit view");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private void UpdateArrows()
|