|
@@ -16,11 +16,11 @@ namespace GFGGame
|
|
private EffectUI _effectUI1;
|
|
private EffectUI _effectUI1;
|
|
private EffectUI _effectUI2;
|
|
private EffectUI _effectUI2;
|
|
private EffectUI _effectUI3;
|
|
private EffectUI _effectUI3;
|
|
- private List<GameObject> _gameObjects = new List<GameObject>();
|
|
|
|
- private List<GoWrapper> _wrappers = new List<GoWrapper>();
|
|
|
|
|
|
+ private List<EffectUI> _effectUIs = new List<EffectUI>();
|
|
private List<GComponent> _items = new List<GComponent>();
|
|
private List<GComponent> _items = new List<GComponent>();
|
|
private int _pageCount;
|
|
private int _pageCount;
|
|
private int _type;
|
|
private int _type;
|
|
|
|
+
|
|
public override void Dispose()
|
|
public override void Dispose()
|
|
{
|
|
{
|
|
EffectUIPool.Recycle(_effectUI1);
|
|
EffectUIPool.Recycle(_effectUI1);
|
|
@@ -30,20 +30,18 @@ namespace GFGGame
|
|
EffectUIPool.Recycle(_effectUI3);
|
|
EffectUIPool.Recycle(_effectUI3);
|
|
_effectUI3 = null;
|
|
_effectUI3 = null;
|
|
|
|
|
|
- // for (int i = 0; i < _gameObjects.Count; i++)
|
|
|
|
- // {
|
|
|
|
- // SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
|
|
|
|
- // }
|
|
|
|
if (_valueBarController != null)
|
|
if (_valueBarController != null)
|
|
{
|
|
{
|
|
_valueBarController.Dispose();
|
|
_valueBarController.Dispose();
|
|
_valueBarController = null;
|
|
_valueBarController = null;
|
|
}
|
|
}
|
|
|
|
+
|
|
if (_ui != null)
|
|
if (_ui != null)
|
|
{
|
|
{
|
|
_ui.Dispose();
|
|
_ui.Dispose();
|
|
_ui = null;
|
|
_ui = null;
|
|
}
|
|
}
|
|
|
|
+
|
|
base.Dispose();
|
|
base.Dispose();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -71,11 +69,13 @@ namespace GFGGame
|
|
_effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSkill, "ui_league", "tea_unlock");
|
|
_effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSkill, "ui_league", "tea_unlock");
|
|
_effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderScore, "ui_league", "tea_unlock");
|
|
_effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderScore, "ui_league", "tea_unlock");
|
|
}
|
|
}
|
|
|
|
+
|
|
protected override void AddEventListener()
|
|
protected override void AddEventListener()
|
|
{
|
|
{
|
|
base.AddEventListener();
|
|
base.AddEventListener();
|
|
EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
|
|
EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
|
|
}
|
|
}
|
|
|
|
+
|
|
protected override void OnShown()
|
|
protected override void OnShown()
|
|
{
|
|
{
|
|
base.OnShown();
|
|
base.OnShown();
|
|
@@ -87,7 +87,6 @@ namespace GFGGame
|
|
_ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
|
|
_ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
|
|
UpdateView(false);
|
|
UpdateView(false);
|
|
});
|
|
});
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
protected override void OnHide()
|
|
protected override void OnHide()
|
|
@@ -101,18 +100,19 @@ namespace GFGGame
|
|
|
|
|
|
DestroySkillAni();
|
|
DestroySkillAni();
|
|
}
|
|
}
|
|
|
|
+
|
|
private void DestroySkillAni()
|
|
private void DestroySkillAni()
|
|
{
|
|
{
|
|
- for (int i = 0; i < _gameObjects.Count; i++)
|
|
|
|
|
|
+ for (int i = 0; i < _effectUIs.Count; i++)
|
|
{
|
|
{
|
|
- SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
|
|
|
|
|
|
+ EffectUIPool.Recycle(_effectUIs[i]);
|
|
_items[i].RemoveChildAt(4);
|
|
_items[i].RemoveChildAt(4);
|
|
}
|
|
}
|
|
- _gameObjects.Clear();
|
|
|
|
- _wrappers.Clear();
|
|
|
|
- _items.Clear();
|
|
|
|
|
|
|
|
|
|
+ _effectUIs.Clear();
|
|
|
|
+ _items.Clear();
|
|
}
|
|
}
|
|
|
|
+
|
|
protected override void RemoveEventListener()
|
|
protected override void RemoveEventListener()
|
|
{
|
|
{
|
|
base.RemoveEventListener();
|
|
base.RemoveEventListener();
|
|
@@ -123,6 +123,7 @@ namespace GFGGame
|
|
{
|
|
{
|
|
ViewManager.GoBackFrom(typeof(LeagueSkillUpView).FullName);
|
|
ViewManager.GoBackFrom(typeof(LeagueSkillUpView).FullName);
|
|
}
|
|
}
|
|
|
|
+
|
|
private void OnBtnRightClick()
|
|
private void OnBtnRightClick()
|
|
{
|
|
{
|
|
int index = _ui.m_comSkill.m_list.GetFirstChildInView();
|
|
int index = _ui.m_comSkill.m_list.GetFirstChildInView();
|
|
@@ -131,8 +132,8 @@ namespace GFGGame
|
|
if (nextPage * _ui.m_comSkill.m_list.lineCount > _ui.m_comSkill.m_list.numItems - 1) return;
|
|
if (nextPage * _ui.m_comSkill.m_list.lineCount > _ui.m_comSkill.m_list.numItems - 1) return;
|
|
_ui.m_comSkill.m_list.ScrollToView(nextPage * _ui.m_comSkill.m_list.lineCount, true);
|
|
_ui.m_comSkill.m_list.ScrollToView(nextPage * _ui.m_comSkill.m_list.lineCount, true);
|
|
Debug.Log("curPage:" + nextPage);
|
|
Debug.Log("curPage:" + nextPage);
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
private void OnBtnLeftClick()
|
|
private void OnBtnLeftClick()
|
|
{
|
|
{
|
|
int index = _ui.m_comSkill.m_list.GetFirstChildInView();
|
|
int index = _ui.m_comSkill.m_list.GetFirstChildInView();
|
|
@@ -141,32 +142,37 @@ namespace GFGGame
|
|
if (lastPage * _ui.m_comSkill.m_list.lineCount < 0) return;
|
|
if (lastPage * _ui.m_comSkill.m_list.lineCount < 0) return;
|
|
_ui.m_comSkill.m_list.ScrollToView(lastPage * _ui.m_comSkill.m_list.lineCount, true);
|
|
_ui.m_comSkill.m_list.ScrollToView(lastPage * _ui.m_comSkill.m_list.lineCount, true);
|
|
Debug.Log("curPage:" + lastPage);
|
|
Debug.Log("curPage:" + lastPage);
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
private void UpdateView()
|
|
private void UpdateView()
|
|
{
|
|
{
|
|
UpdateView(true);
|
|
UpdateView(true);
|
|
}
|
|
}
|
|
|
|
+
|
|
private void UpdateView(bool showAni)
|
|
private void UpdateView(bool showAni)
|
|
{
|
|
{
|
|
- if (LeagueDataManager.Instance.GetSkillProgressByType(_type) < 100 && LeagueDataManager.Instance.GetSkillProgressByType(_type) > 0)
|
|
|
|
|
|
+ if (LeagueDataManager.Instance.GetSkillProgressByType(_type) < 100 &&
|
|
|
|
+ LeagueDataManager.Instance.GetSkillProgressByType(_type) > 0)
|
|
{
|
|
{
|
|
- if (LeagueDataManager.Instance.CurLayer == _ui.m_comSkill.m_list.numItems)//最后一层
|
|
|
|
|
|
+ if (LeagueDataManager.Instance.CurLayer == _ui.m_comSkill.m_list.numItems) //最后一层
|
|
{
|
|
{
|
|
_ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1, showAni);
|
|
_ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1, showAni);
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
bool isActive = true;
|
|
bool isActive = true;
|
|
- List<LeagueSkillCfg> skillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, LeagueDataManager.Instance.CurLayer);
|
|
|
|
|
|
+ List<LeagueSkillCfg> skillCfgs =
|
|
|
|
+ LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, LeagueDataManager.Instance.CurLayer);
|
|
for (int i = 0; i < skillCfgs.Count; i++)
|
|
for (int i = 0; i < skillCfgs.Count; i++)
|
|
{
|
|
{
|
|
- if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[i].id) < 0)
|
|
|
|
|
|
+ if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) ||
|
|
|
|
+ SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[i].id) < 0)
|
|
{
|
|
{
|
|
isActive = false;
|
|
isActive = false;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
if (isActive)
|
|
if (isActive)
|
|
{
|
|
{
|
|
_ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer, showAni);
|
|
_ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer, showAni);
|
|
@@ -178,12 +184,14 @@ namespace GFGGame
|
|
}
|
|
}
|
|
// _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
|
|
// _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
|
|
}
|
|
}
|
|
|
|
+
|
|
_ui.m_comSkill.m_listScore.numItems = 4;
|
|
_ui.m_comSkill.m_listScore.numItems = 4;
|
|
_ui.m_comSkill.m_list.RefreshVirtualList();
|
|
_ui.m_comSkill.m_list.RefreshVirtualList();
|
|
_ui.m_txtTitle.text = "茶艺-" + LeagueSkillCountCfgArray.Instance.GetCfg(_type).name;
|
|
_ui.m_txtTitle.text = "茶艺-" + LeagueSkillCountCfgArray.Instance.GetCfg(_type).name;
|
|
double progress = LeagueDataManager.Instance.GetSkillProgressByType(_type);
|
|
double progress = LeagueDataManager.Instance.GetSkillProgressByType(_type);
|
|
_ui.m_txtProgress.SetVar("value", progress.ToString()).FlushVars();
|
|
_ui.m_txtProgress.SetVar("value", progress.ToString()).FlushVars();
|
|
}
|
|
}
|
|
|
|
+
|
|
private void RenderListScoreItem(int index, GObject obj)
|
|
private void RenderListScoreItem(int index, GObject obj)
|
|
{
|
|
{
|
|
UI_ListScoreItem item = UI_ListScoreItem.Proxy(obj);
|
|
UI_ListScoreItem item = UI_ListScoreItem.Proxy(obj);
|
|
@@ -191,6 +199,7 @@ namespace GFGGame
|
|
item.m_txtProperty.text = LeagueDataManager.Instance.GetSkillScoreByType(_type, index + 1).ToString();
|
|
item.m_txtProperty.text = LeagueDataManager.Instance.GetSkillScoreByType(_type, index + 1).ToString();
|
|
UI_ListScoreItem.ProxyEnd();
|
|
UI_ListScoreItem.ProxyEnd();
|
|
}
|
|
}
|
|
|
|
+
|
|
private void RenderListItem(int index, GObject obj)
|
|
private void RenderListItem(int index, GObject obj)
|
|
{
|
|
{
|
|
List<LeagueSkillCfg> skillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, index + 1);
|
|
List<LeagueSkillCfg> skillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, index + 1);
|
|
@@ -199,14 +208,17 @@ namespace GFGGame
|
|
{
|
|
{
|
|
item.m_listSkill.itemRenderer = RenderListSkillItem;
|
|
item.m_listSkill.itemRenderer = RenderListSkillItem;
|
|
}
|
|
}
|
|
|
|
+
|
|
if (LeagueDataManager.Instance.CurLayer == index + 1)
|
|
if (LeagueDataManager.Instance.CurLayer == index + 1)
|
|
{
|
|
{
|
|
DestroySkillAni();
|
|
DestroySkillAni();
|
|
}
|
|
}
|
|
|
|
+
|
|
item.m_listSkill.data = skillCfgs;
|
|
item.m_listSkill.data = skillCfgs;
|
|
item.m_listSkill.numItems = skillCfgs.Count;
|
|
item.m_listSkill.numItems = skillCfgs.Count;
|
|
UI_ListSkillLayerItem.ProxyEnd();
|
|
UI_ListSkillLayerItem.ProxyEnd();
|
|
}
|
|
}
|
|
|
|
+
|
|
private void RenderListSkillItem(int index, GObject obj)
|
|
private void RenderListSkillItem(int index, GObject obj)
|
|
{
|
|
{
|
|
List<LeagueSkillCfg> skillCfgs = obj.parent.data as List<LeagueSkillCfg>;
|
|
List<LeagueSkillCfg> skillCfgs = obj.parent.data as List<LeagueSkillCfg>;
|
|
@@ -214,13 +226,16 @@ namespace GFGGame
|
|
item.m_loaScore.url = ResPathUtil.GetScorePath(skillCfgs[index].score);
|
|
item.m_loaScore.url = ResPathUtil.GetScorePath(skillCfgs[index].score);
|
|
item.m_txtScore.text = "+" + skillCfgs[index].value.ToString();
|
|
item.m_txtScore.text = "+" + skillCfgs[index].value.ToString();
|
|
item.m_loaIcon.url = string.Format("ui://League/tb_jn_{0}", _type);
|
|
item.m_loaIcon.url = string.Format("ui://League/tb_jn_{0}", _type);
|
|
- bool isLock = !SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[index].id) < 0;
|
|
|
|
|
|
+ bool isLock = !SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) ||
|
|
|
|
+ SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[index].id) < 0;
|
|
item.m_imgLock.visible = isLock;
|
|
item.m_imgLock.visible = isLock;
|
|
bool canActive = true;
|
|
bool canActive = true;
|
|
- List<LeagueSkillCfg> lastSkillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, skillCfgs[index].layer - 1);
|
|
|
|
|
|
+ List<LeagueSkillCfg> lastSkillCfgs =
|
|
|
|
+ LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, skillCfgs[index].layer - 1);
|
|
for (int i = 0; i < lastSkillCfgs.Count; i++)
|
|
for (int i = 0; i < lastSkillCfgs.Count; i++)
|
|
{
|
|
{
|
|
- if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(lastSkillCfgs[i].id) < 0)
|
|
|
|
|
|
+ if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) ||
|
|
|
|
+ SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(lastSkillCfgs[i].id) < 0)
|
|
{
|
|
{
|
|
canActive = false;
|
|
canActive = false;
|
|
break;
|
|
break;
|
|
@@ -229,19 +244,18 @@ namespace GFGGame
|
|
|
|
|
|
item.m_imgSuo.visible = !canActive;
|
|
item.m_imgSuo.visible = !canActive;
|
|
|
|
|
|
- if (isLock && canActive && _gameObjects.Count <= index)
|
|
|
|
|
|
+ if (isLock && canActive && _effectUIs.Count <= index)
|
|
{
|
|
{
|
|
- EffectUI _effectUI;
|
|
|
|
GGraph holder = new GGraph();
|
|
GGraph holder = new GGraph();
|
|
holder.SetSize(1, 1);
|
|
holder.SetSize(1, 1);
|
|
holder.SetPosition(80, 80, 0);
|
|
holder.SetPosition(80, 80, 0);
|
|
holder.name = "holder";
|
|
holder.name = "holder";
|
|
item.target.AddChildAt(holder, 4);
|
|
item.target.AddChildAt(holder, 4);
|
|
- _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_league", "tea_nolearn");
|
|
|
|
- EffectUIPool.Recycle(_effectUI);
|
|
|
|
- _effectUI = null;
|
|
|
|
|
|
+ EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_league", "tea_nolearn");
|
|
|
|
+ _effectUIs.Add(_effectUI);
|
|
_items.Add(item.target);
|
|
_items.Add(item.target);
|
|
}
|
|
}
|
|
|
|
+
|
|
GObject gObject = item.target.GetChild("holder");
|
|
GObject gObject = item.target.GetChild("holder");
|
|
if (gObject != null)
|
|
if (gObject != null)
|
|
{
|
|
{
|
|
@@ -253,27 +267,33 @@ namespace GFGGame
|
|
{
|
|
{
|
|
item.target.onClick.Add(OnActiveSkill);
|
|
item.target.onClick.Add(OnActiveSkill);
|
|
}
|
|
}
|
|
|
|
+
|
|
item.target.data = skillCfgs[index].id;
|
|
item.target.data = skillCfgs[index].id;
|
|
UI_ListSkillItem.ProxyEnd();
|
|
UI_ListSkillItem.ProxyEnd();
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
private async void OnActiveSkill(EventContext context)
|
|
private async void OnActiveSkill(EventContext context)
|
|
{
|
|
{
|
|
GObject obj = context.sender as GObject;
|
|
GObject obj = context.sender as GObject;
|
|
int skillId = (int)obj.data;
|
|
int skillId = (int)obj.data;
|
|
- if (SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) && SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillId) >= 0)
|
|
|
|
|
|
+ if (SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) &&
|
|
|
|
+ SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillId) >= 0)
|
|
{
|
|
{
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+
|
|
LeagueSkillCfg skillCfg = LeagueSkillCfgArray.Instance.GetCfg(skillId);
|
|
LeagueSkillCfg skillCfg = LeagueSkillCfgArray.Instance.GetCfg(skillId);
|
|
- List<LeagueSkillCfg> lastSkillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, skillCfg.layer - 1);
|
|
|
|
|
|
+ List<LeagueSkillCfg> lastSkillCfgs =
|
|
|
|
+ LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, skillCfg.layer - 1);
|
|
for (int i = 0; i < lastSkillCfgs.Count; i++)
|
|
for (int i = 0; i < lastSkillCfgs.Count; i++)
|
|
{
|
|
{
|
|
- if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(lastSkillCfgs[i].id) < 0)
|
|
|
|
|
|
+ if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) ||
|
|
|
|
+ SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(lastSkillCfgs[i].id) < 0)
|
|
{
|
|
{
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
long needCount = skillCfg.consumeArr[0][1];
|
|
long needCount = skillCfg.consumeArr[0][1];
|
|
long hasCount = ItemDataManager.GetItemNum(skillCfg.consumeArr[0][0]);
|
|
long hasCount = ItemDataManager.GetItemNum(skillCfg.consumeArr[0][0]);
|
|
if (hasCount < needCount)
|
|
if (hasCount < needCount)
|
|
@@ -289,7 +309,8 @@ namespace GFGGame
|
|
_ui.m_holderSkill.position = posInSkill;
|
|
_ui.m_holderSkill.position = posInSkill;
|
|
|
|
|
|
GObject scoreObj = _ui.m_comSkill.m_listScore.GetChildAt(skillCfg.score - 1);
|
|
GObject scoreObj = _ui.m_comSkill.m_listScore.GetChildAt(skillCfg.score - 1);
|
|
- Vector2 posInScore = scoreObj.TransformPoint(new Vector2(scoreObj.width / 2, scoreObj.height / 2), _ui.target);
|
|
|
|
|
|
+ Vector2 posInScore =
|
|
|
|
+ scoreObj.TransformPoint(new Vector2(scoreObj.width / 2, scoreObj.height / 2), _ui.target);
|
|
_ui.m_holderScore.position = posInScore;
|
|
_ui.m_holderScore.position = posInScore;
|
|
|
|
|
|
_ui.m_t1.Play();
|
|
_ui.m_t1.Play();
|