Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

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

@@ -37,7 +37,7 @@ namespace GFGGame
                 CommonSProxy.ResetDailyData().Coroutine();
             }
 
-            if (seconds >= TimeUtil.SECOND_PER_MUNITE * 3)
+            if (seconds >= TimeUtil.SECOND_PER_MUNITE * 1)
             {
                 ViewManager.CheckDispsoe();
                 seconds = 0;

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

@@ -68,7 +68,10 @@ namespace GFGGame
                 {
                     _window = new Window();
                 }
+                ET.Log.Debug("zoya:_window:" + _window + "   contentPane: " + _window.contentPane);
                 _window.contentPane = value;
+                ET.Log.Debug("zoya:modal0:" + _window);
+                ET.Log.Debug("zoya:modal1:" + _window.modal);
                 _window.modal = modal;
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

@@ -31,6 +31,8 @@ namespace GFGGame
         }
         public override void Dispose()
         {
+            base.Dispose();
+
             m_Instance = null;
             SceneController.DestroyObjectFromView(_effectObj, _wrapper);
             if (_ui != null)
@@ -38,7 +40,6 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-            base.Dispose();
 
         }
 

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

@@ -84,7 +84,7 @@ namespace GFGGame
 
         public virtual void Dispose()
         {
-           
+
             if (viewCom != null)
             {
                 viewCom.RemoveFromParent();
@@ -225,10 +225,10 @@ namespace GFGGame
         void __removeFromStage()
         {
             OnHide();
-            if (_descFilePath == ResPathUtil.GetUIPackagePath("Login") || _descFilePath == ResPathUtil.GetUIPackagePath("Loading") || _descFilePath == ResPathUtil.GetUIPackagePath("CreateRole"))//这几个界面关闭后立即释放
-            {
-                Dispose();
-            }
+            // if (_descFilePath == ResPathUtil.GetUIPackagePath("Login") || _descFilePath == ResPathUtil.GetUIPackagePath("Loading") || _descFilePath == ResPathUtil.GetUIPackagePath("CreateRole"))//这几个界面关闭后立即释放
+            // {
+            //     Dispose();
+            // }
         }
 
     }

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

@@ -332,7 +332,7 @@ namespace GFGGame
                 // if (kv.Value.packageName == ResPathUtil.GetUIPackagePath("CommonGame") || kv.Value.packageName == ResPathUtil.GetUIPackagePath("Common") || kv.Value.packageName == ResPathUtil.GetUIPackagePath("Main")) return;//这几个包不释放
                 long currentTime = TimeHelper.ClientNowSeconds();
                 long closeTime = kv.Value.closeTime;
-                if (closeTime > 0 && currentTime - closeTime >= TimeUtil.SECOND_PER_MUNITE * 3)
+                if (closeTime > 0 && currentTime - closeTime >= TimeUtil.SECOND_PER_MUNITE * 1)
                 {
                     kv.Value.closeTime = 0;
                     kv.Value.Dispose();

GameClient/Assets/ThirdParty/FairyGUI/Scripts/UI/GObject.cs

@@ -1110,8 +1110,16 @@ namespace FairyGUI
 
             set
             {
+                Debug.Log("zoya00:" + displayObject);
+                Debug.Log("zoya11:" + displayObject.gameObject);
+                Debug.Log("zoya22:" + value);
                 if (displayObject != null && displayObject.gameObject != null)
+                {
+                    Debug.Log("zoya33:" + value);
                     displayObject.gameObject.name = value;
+                }
+
+
             }
         }