|
@@ -88,9 +88,9 @@ namespace GFGGame
|
|
_ui.m_comListType1.m_listType.onClickItem.Add(OnClickListType1Item);
|
|
_ui.m_comListType1.m_listType.onClickItem.Add(OnClickListType1Item);
|
|
_ui.m_comListType2.m_listType.onClickItem.Add(OnClickListType2Item);
|
|
_ui.m_comListType2.m_listType.onClickItem.Add(OnClickListType2Item);
|
|
// _ui.m_partsList.m_list.SetVirtual();
|
|
// _ui.m_partsList.m_list.SetVirtual();
|
|
- _ui.m_partsList.m_list.onClickItem.Add(OnClickPartsListItem);
|
|
|
|
|
|
+ // _ui.m_partsList.m_list.onClickItem.Add(OnClickPartsListItem);
|
|
_ui.m_partsList2.m_list.onClickItem.Add(OnClickSuitPartsListItem);
|
|
_ui.m_partsList2.m_list.onClickItem.Add(OnClickSuitPartsListItem);
|
|
- _ui.m_partsListSearch.m_list.onClickItem.Add(OnClickPartsListItem);
|
|
|
|
|
|
+ // _ui.m_partsListSearch.m_list.onClickItem.Add(OnClickPartsListItem);
|
|
_ui.m_touchPad.onClick.Add(OnTouchPad);
|
|
_ui.m_touchPad.onClick.Add(OnTouchPad);
|
|
_ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
|
|
_ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
|
|
_ui.m_btnSave.onClick.Add(OnClickBtnSave);
|
|
_ui.m_btnSave.onClick.Add(OnClickBtnSave);
|
|
@@ -287,30 +287,13 @@ namespace GFGGame
|
|
{
|
|
{
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- UI_PartsListItem listItem = UI_PartsListItem.Proxy(context.data as GObject);// (GObject)context.data as GObject;
|
|
|
|
- int id = (int)listItem.target.data;
|
|
|
|
- bool isDress = true;
|
|
|
|
|
|
|
|
|
|
+ int id = (int)(context.sender as GObject).data;
|
|
if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
|
|
if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
|
|
{
|
|
{
|
|
- // return;//套装有icon的监听
|
|
|
|
- isDress = false;
|
|
|
|
partsListScrollingPosY = _ui.m_partsList.m_list.scrollPane.scrollingPosY;
|
|
partsListScrollingPosY = _ui.m_partsList.m_list.scrollPane.scrollingPosY;
|
|
|
|
|
|
- if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0 && GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS).id)
|
|
|
|
- {
|
|
|
|
- ShowSuitPartList(id, true);
|
|
|
|
- }
|
|
|
|
- else if (SuitCfgArray.Instance.CheckSuitHasAction(id) && DressUpMenuSuitDataManager.CheckSuitHasActionRes(id))
|
|
|
|
- {
|
|
|
|
- // listItem.m_btnAni.visible = true;
|
|
|
|
- // listItem.m_comAxtionSelect.target.visible = true;
|
|
|
|
- UI_PartsListItem.ProxyEnd();
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- ShowSuitPartList(id, false);
|
|
|
|
- }
|
|
|
|
|
|
+ OnBtnNormalClick(context);
|
|
}
|
|
}
|
|
else if (_currentMenuType == ConstDressUpItemType.DONG_ZUO)
|
|
else if (_currentMenuType == ConstDressUpItemType.DONG_ZUO)
|
|
{
|
|
{
|
|
@@ -320,12 +303,9 @@ namespace GFGGame
|
|
{
|
|
{
|
|
MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
|
|
MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
|
|
}
|
|
}
|
|
- if (isDress)
|
|
|
|
- {
|
|
|
|
- UpdateStepBtn(true, id);
|
|
|
|
- }
|
|
|
|
- // UpdateListPartsSelected(id);
|
|
|
|
- // UpdateListSuitPartsSelected();
|
|
|
|
|
|
+
|
|
|
|
+ UpdateStepBtn(true, id);
|
|
|
|
+
|
|
}
|
|
}
|
|
private void OnBtnNormalClick(EventContext context)
|
|
private void OnBtnNormalClick(EventContext context)
|
|
{
|
|
{
|
|
@@ -748,19 +728,11 @@ namespace GFGGame
|
|
// listItem.m_comAxtionSelect.m_btnNormal.icon = ResPathUtil.GetIconPath(suitCfg.res, ext);
|
|
// listItem.m_comAxtionSelect.m_btnNormal.icon = ResPathUtil.GetIconPath(suitCfg.res, ext);
|
|
// listItem.m_comAxtionSelect.m_btnAction.icon = ResPathUtil.GetIconPath(suitCfg.res, ext);
|
|
// listItem.m_comAxtionSelect.m_btnAction.icon = ResPathUtil.GetIconPath(suitCfg.res, ext);
|
|
|
|
|
|
- if (listItem.m_icon.data == null)
|
|
|
|
- {
|
|
|
|
- listItem.m_icon.onClick.Add(OnBtnNormalClick);
|
|
|
|
- }
|
|
|
|
- listItem.m_icon.data = id;
|
|
|
|
-
|
|
|
|
if (listItem.m_btnAni.data == null)
|
|
if (listItem.m_btnAni.data == null)
|
|
{
|
|
{
|
|
listItem.m_btnAni.onClick.Add(OnBtnActionClick);
|
|
listItem.m_btnAni.onClick.Add(OnBtnActionClick);
|
|
}
|
|
}
|
|
listItem.m_btnAni.data = id;
|
|
listItem.m_btnAni.data = id;
|
|
-
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
else if (_currentMenuType == (int)ConstDressUpItemType.DONG_ZUO)
|
|
else if (_currentMenuType == (int)ConstDressUpItemType.DONG_ZUO)
|
|
{
|
|
{
|
|
@@ -796,6 +768,12 @@ namespace GFGGame
|
|
ItemProxy.ReqSetItemRead(id).Coroutine();
|
|
ItemProxy.ReqSetItemRead(id).Coroutine();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if (listItem.m_icon.data == null)
|
|
|
|
+ {
|
|
|
|
+ listItem.m_icon.onClick.Add(OnClickPartsListItem);
|
|
|
|
+ }
|
|
|
|
+ listItem.m_icon.data = id;
|
|
|
|
+
|
|
if (listItem.target.data == null)
|
|
if (listItem.target.data == null)
|
|
{
|
|
{
|
|
LongPressGesture longPressGesture = new LongPressGesture(listItem.target);
|
|
LongPressGesture longPressGesture = new LongPressGesture(listItem.target);
|