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

GameClient/Assets/Game/HotUpdate/Data/Handler/RoleDataHandler.cs

@@ -44,7 +44,7 @@ namespace GFGGame
 
             if (seconds >= TimeUtil.SECOND_PER_MUNITE * 1)
             {
-                ViewManager.CheckDispsoe();
+                ViewManager.CheckDispose();
                 seconds = 0;
             }
             seconds++;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTxtNotice.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_comTxtNotice
+    {
+        public GComponent target;
+        public GTextField m_txtNotice;
+        public const string URL = "ui://tw70qm9dgayctpj";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "comTxtNotice";
+        private static UI_comTxtNotice _proxy;
+
+        public static UI_comTxtNotice Create(GObject gObject = null)
+        {
+            var ui = new UI_comTxtNotice();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_comTxtNotice Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comTxtNotice();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtNotice = (GTextField)comp.GetChild("txtNotice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtNotice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTxtNotice.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e0c16edbf2c598c47968e76fa996083c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -66,11 +66,11 @@ namespace GFGGame
         }
         private async void OnBtnSaveClick()
         {
-            if (!Regex.IsMatch(_ui.m_txtContent.text, @"^[\u4e00-\u9fa5_0-9]+$"))
-            {
-                PromptController.Instance.ShowFloatTextPrompt("雅集公告仅允许汉字、数字、下划线");
-                return;
-            }
+            //if (!Regex.IsMatch(_ui.m_txtContent.text, @"^[\u4e00-\u9fa5_0-9]+$"))
+            //{
+            //    PromptController.Instance.ShowFloatTextPrompt("雅集公告仅允许汉字、数字、下划线");
+            //    return;
+            //}
             bool result = await LeagueSproxy.ReqChangeLeagueNotice(_ui.m_txtContent.text);
             if (result)
             {

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

@@ -149,7 +149,7 @@ namespace GFGGame
             _ui.m_txtUnionName.text = leagueData.Name;
             _ui.m_comLeagueHead.m_loaUnionIcon.url = ResPathUtil.GetLeagueIconPath(leagueData.Icon);
             _ui.m_comLeagueHead.m_txtUnionLv.text = LeagueDataManager.Instance.HallLevel.ToString();
-            _ui.m_txtNotice.text = leagueData.Notice;
+            _ui.m_comtxtNotice.m_txtNotice.text = leagueData.Notice;
             _ui.m_txtLeaderName.text = leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.roleName;
             RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headId, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headBorderId);
         }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -54,7 +54,7 @@ namespace GFGGame
             }
 
             // Clear Effect
-            for (int i = 0; i < _effectUIList.Capacity; i++)
+            for (int i = 0; i < _effectUIList.Count; i++)
             {
                 EffectUIPool.Recycle(_effectUIList[i]);
             }

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -353,7 +353,7 @@ namespace GFGGame
             //     }
             // }
         }
-        public static void CheckDispsoe()
+        public static void CheckDispose()
         {
             for (int i = _viewDic.Keys.Count - 1; i >= 0; i--)//不用foreach是因为：循环过程中可能会触发dispose，导致_viewDic.Keys变化，最终报错
             {