Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -16,11 +16,11 @@ namespace GFGGame
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         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 int _pageCount;
         private int _type;
+
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -30,20 +30,18 @@ namespace GFGGame
             EffectUIPool.Recycle(_effectUI3);
             _effectUI3 = null;
 
-            // for (int i = 0; i < _gameObjects.Count; i++)
-            // {
-            //     SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
-            // }
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -71,11 +69,13 @@ namespace GFGGame
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSkill, "ui_league", "tea_unlock");
             _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderScore, "ui_league", "tea_unlock");
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -87,7 +87,6 @@ namespace GFGGame
                 _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
                 UpdateView(false);
             });
-
         }
 
         protected override void OnHide()
@@ -101,18 +100,19 @@ namespace GFGGame
 
             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);
             }
-            _gameObjects.Clear();
-            _wrappers.Clear();
-            _items.Clear();
 
+            _effectUIs.Clear();
+            _items.Clear();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -123,6 +123,7 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(LeagueSkillUpView).FullName);
         }
+
         private void OnBtnRightClick()
         {
             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;
             _ui.m_comSkill.m_list.ScrollToView(nextPage * _ui.m_comSkill.m_list.lineCount, true);
             Debug.Log("curPage:" + nextPage);
-
         }
+
         private void OnBtnLeftClick()
         {
             int index = _ui.m_comSkill.m_list.GetFirstChildInView();
@@ -141,32 +142,37 @@ namespace GFGGame
             if (lastPage * _ui.m_comSkill.m_list.lineCount < 0) return;
             _ui.m_comSkill.m_list.ScrollToView(lastPage * _ui.m_comSkill.m_list.lineCount, true);
             Debug.Log("curPage:" + lastPage);
-
         }
+
         private void UpdateView()
         {
             UpdateView(true);
         }
+
         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);
                 }
                 else
                 {
                     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++)
                     {
-                        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;
                             break;
                         }
                     }
+
                     if (isActive)
                     {
                         _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_comSkill.m_listScore.numItems = 4;
             _ui.m_comSkill.m_list.RefreshVirtualList();
             _ui.m_txtTitle.text = "茶艺-" + LeagueSkillCountCfgArray.Instance.GetCfg(_type).name;
             double progress = LeagueDataManager.Instance.GetSkillProgressByType(_type);
             _ui.m_txtProgress.SetVar("value", progress.ToString()).FlushVars();
         }
+
         private void RenderListScoreItem(int index, GObject 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();
             UI_ListScoreItem.ProxyEnd();
         }
+
         private void RenderListItem(int index, GObject obj)
         {
             List<LeagueSkillCfg> skillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, index + 1);
@@ -199,14 +208,17 @@ namespace GFGGame
             {
                 item.m_listSkill.itemRenderer = RenderListSkillItem;
             }
+
             if (LeagueDataManager.Instance.CurLayer == index + 1)
             {
                 DestroySkillAni();
             }
+
             item.m_listSkill.data = skillCfgs;
             item.m_listSkill.numItems = skillCfgs.Count;
             UI_ListSkillLayerItem.ProxyEnd();
         }
+
         private void RenderListSkillItem(int index, GObject obj)
         {
             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_txtScore.text = "+" + skillCfgs[index].value.ToString();
             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;
             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++)
             {
-                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;
                     break;
@@ -229,19 +244,18 @@ namespace GFGGame
 
             item.m_imgSuo.visible = !canActive;
 
-            if (isLock && canActive && _gameObjects.Count <= index)
+            if (isLock && canActive && _effectUIs.Count <= index)
             {
-                EffectUI _effectUI;
                 GGraph holder = new GGraph();
                 holder.SetSize(1, 1);
                 holder.SetPosition(80, 80, 0);
                 holder.name = "holder";
                 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);
             }
+
             GObject gObject = item.target.GetChild("holder");
             if (gObject != null)
             {
@@ -253,27 +267,33 @@ namespace GFGGame
             {
                 item.target.onClick.Add(OnActiveSkill);
             }
+
             item.target.data = skillCfgs[index].id;
             UI_ListSkillItem.ProxyEnd();
-
         }
+
         private async void OnActiveSkill(EventContext context)
         {
             GObject obj = context.sender as GObject;
             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;
             }
+
             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++)
             {
-                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;
                 }
             }
+
             long needCount = skillCfg.consumeArr[0][1];
             long hasCount = ItemDataManager.GetItemNum(skillCfg.consumeArr[0][0]);
             if (hasCount < needCount)
@@ -289,7 +309,8 @@ namespace GFGGame
                 _ui.m_holderSkill.position = posInSkill;
 
                 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_t1.Play();

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs

@@ -45,7 +45,7 @@ namespace GFGGame
         {
             base.OnShown();
             this._ui.m_inputName.text = "";
-            _ui.m_txtNeed.text = string.Format("改名卡：{0}/{1}", ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]), GlobalCfgArray.globalCfg.changeNameCostArr[1]);
+            _ui.m_txtNeed.text = string.Format("鏀瑰悕鍗★細{0}/{1}", ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]), GlobalCfgArray.globalCfg.changeNameCostArr[1]);
             ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
             _ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res); 
 
@@ -58,10 +58,10 @@ namespace GFGGame
         }
         private void AddEffect()
         {
-            //邊框左上角特效
+            //閭婃�宸︿笂瑙掔壒鏁�
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderLeftTop, "ui_Activity", "Com_window_L_up");
 
-            //邊框右下角特效
+            //閭婃�鍙充笅瑙掔壒鏁�
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderRightDowm, "ui_Activity", "Com_window_R_Down");
         }
 
@@ -70,26 +70,26 @@ namespace GFGGame
             string roleName = _ui.m_inputName.text;
             if (string.IsNullOrEmpty(roleName))
             {
-                PromptController.Instance.ShowFloatTextPrompt("角色名不能为空");
+                PromptController.Instance.ShowFloatTextPrompt("瑙掕壊鍚嶄笉鑳戒负绌�");
                 return;
             }
 
             if (roleName.Length > GFGGame.GlobalConst.MaxNameLen)
             {
-                PromptController.Instance.ShowFloatTextPrompt("角色名最多七个字");
+                PromptController.Instance.ShowFloatTextPrompt("瑙掕壊鍚嶆渶澶氫竷涓�瓧");
                 return;
             }
 
-            if (!Regex.IsMatch(roleName, @"^[\u4e00-\u9fa5_0-9]+$"))//角色起名仅允许汉字、数字、底划线
+            if (!Regex.IsMatch(roleName, @"^[\u4e00-\u9fa5_0-9]+$"))//瑙掕壊璧峰悕浠呭厑璁告眽瀛椼€佹暟瀛椼€佸簳鍒掔嚎
             {
-                PromptController.Instance.ShowFloatTextPrompt("角色名仅允许汉字、数字、下划线");
+                PromptController.Instance.ShowFloatTextPrompt("瑙掕壊鍚嶄粎鍏佽�姹夊瓧銆佹暟瀛椼€佷笅鍒掔嚎");
                 return;
             }
             string costName = ItemUtil.GetItemName(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
             int count = GlobalCfgArray.globalCfg.changeNameCostArr[1];
 
-            AlertUI.Show(string.Format("是否花费{0}个{1}改名1次？", count, costName))
-                .SetLeftButton(true).SetRightButton(true, "确定", async (object data) =>
+            AlertUI.Show(string.Format("鏄�惁鑺辫垂{0}涓獅1}鏀瑰悕1娆★紵", count, costName))
+                .SetLeftButton(true).SetRightButton(true, "纭�畾", async (object data) =>
                 {
                     bool result = await RoleInfoSProxy.ReqModifyRoleName(roleName);
                     if (result)