zhaoyang 3 жил өмнө
parent
commit
3ca65adc79
26 өөрчлөгдсөн 200 нэмэгдсэн , 108 устгасан
  1. 5 1
      GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs
  2. 7 6
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  3. 0 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs
  4. 2 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs
  5. 4 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs
  6. 5 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  7. 3 1
      GameClient/Assets/Game/HotUpdate/Views/Common/ModalStatusView.cs
  8. 1 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/FunctionOpenView.cs
  9. 6 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs
  10. 5 1
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs
  11. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs
  12. 16 16
      GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs
  13. 2 2
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs
  14. 1 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxCardView.cs
  15. 16 9
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs
  16. 4 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  17. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/InstanceZonesController.cs
  18. 2 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs
  19. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs
  20. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  21. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs
  22. 37 30
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  23. 58 25
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  24. 4 3
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  25. 7 3
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  26. 10 0
      GameClient/Assets/Game/Launcher/Views/LauncherView.cs

+ 5 - 1
GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -388,13 +388,17 @@ namespace GFGGame
             wrapper = _wrapper;
             wrapper = _wrapper;
             gameObject = _gameObject;
             gameObject = _gameObject;
         }
         }
-        public static void DestroyObjectFromView(GameObject _gameObject)
+        public static void DestroyObjectFromView(GameObject _gameObject, GoWrapper goWrapper)
         {
         {
             if (_gameObject != null)
             if (_gameObject != null)
             {
             {
                 GameObject.Destroy(_gameObject);
                 GameObject.Destroy(_gameObject);
                 _gameObject = null;
                 _gameObject = null;
             }
             }
+            if (goWrapper != null)
+            {
+                goWrapper.Dispose();
+            }
         }
         }
     }
     }
 }
 }

+ 7 - 6
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -44,14 +44,15 @@ namespace GFGGame
         private Vector2 comCardImgResInitSize;
         private Vector2 comCardImgResInitSize;
         public override void Dispose()
         public override void Dispose()
         {
         {
-            _valueBarController.Dispose();
-            _valueBarController = null;
-            UI_ComConsume.ClearProxy();
-            if (_cardObj != null)
+            if (_valueBarController != null)
             {
             {
-                GameObject.Destroy(_cardObj);
-                _cardObj = null;
+                _valueBarController.Dispose();
+                _valueBarController = null;
             }
             }
+
+            UI_ComConsume.ClearProxy();
+
+            SceneController.DestroyObjectFromView(_cardObj, _wrapper);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -21,7 +21,6 @@ namespace GFGGame
         {
         {
             if (_valueBarController != null)
             if (_valueBarController != null)
             {
             {
-
                 _valueBarController.Dispose();
                 _valueBarController.Dispose();
                 _valueBarController = null;
                 _valueBarController = null;
             }
             }

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -40,6 +40,7 @@ namespace GFGGame
             {
             {
                 GameObject.Destroy(_sceneObject);
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
                 _sceneObject = null;
+                _wrapper.Dispose();
                 _wrapper = null;
                 _wrapper = null;
             }
             }
             if (_scenePrefab != null)
             if (_scenePrefab != null)
@@ -47,7 +48,7 @@ namespace GFGGame
                 GFGAsset.Release(ResPathUtil.GetPrefabPath("SceneSuitFoster"));
                 GFGAsset.Release(ResPathUtil.GetPrefabPath("SceneSuitFoster"));
                 _scenePrefab = null;
                 _scenePrefab = null;
             }
             }
-            SceneController.DestroyObjectFromView(_gameobject1);
+            SceneController.DestroyObjectFromView(_gameobject1,_wrapper1);
             _propertyList.Clear();
             _propertyList.Clear();
             _addPropertyList.Clear();
             _addPropertyList.Clear();
 
 

+ 4 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -54,6 +54,10 @@ namespace GFGGame
                 GFGAsset.Release(ResPathUtil.GetPrefabPath("SceneDressUp"));
                 GFGAsset.Release(ResPathUtil.GetPrefabPath("SceneDressUp"));
                 _scenePrefab = null;
                 _scenePrefab = null;
             }
             }
+            if(_wrapper!=null){
+                _wrapper.Dispose();
+                _wrapper=null;
+            }
             if (_comSelected != null)
             if (_comSelected != null)
             {
             {
                 _comSelected.RemoveFromParent();
                 _comSelected.RemoveFromParent();

+ 5 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -77,6 +77,11 @@ namespace GFGGame
                 _dressUpObjDataCache.Dispose();
                 _dressUpObjDataCache.Dispose();
                 _dressUpObjDataCache = null;
                 _dressUpObjDataCache = null;
             }
             }
+            if (_wrapper != null)
+            {
+                _wrapper.Dispose();
+                _wrapper = null;
+            }
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/ModalStatusView.cs

@@ -8,6 +8,7 @@ namespace GFGGame
     {
     {
         private UI_ModalStatusUI _ui;
         private UI_ModalStatusUI _ui;
         private GameObject _gameObject0;
         private GameObject _gameObject0;
+        private GoWrapper _wrapper0;
 
 
         protected override void OnInit()
         protected override void OnInit()
         {
         {
@@ -28,7 +29,7 @@ namespace GFGGame
             }
             }
             _ui.m_txtMessage.text = message;
             _ui.m_txtMessage.text = message;
             string resPath0 = ResPathUtil.GetViewEffectPath("ui_cxlj", "ui_cxlj_gq");
             string resPath0 = ResPathUtil.GetViewEffectPath("ui_cxlj", "ui_cxlj_gq");
-            SceneController.AddObjectToView(null, null, _ui.m_holder, resPath0, out _gameObject0, out GoWrapper _wrapper0);
+            SceneController.AddObjectToView(null, null, _ui.m_holder, resPath0, out _gameObject0, out _wrapper0);
 
 
         }
         }
 
 
@@ -38,6 +39,7 @@ namespace GFGGame
         }
         }
         public override void Dispose()
         public override void Dispose()
         {
         {
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/FunctionOpenView.cs

@@ -13,7 +13,7 @@ namespace GFGGame
         private GoWrapper _wrapper;
         private GoWrapper _wrapper;
         public override void Dispose()
         public override void Dispose()
         {
         {
-            SceneController.DestroyObjectFromView(_gameObject);
+            SceneController.DestroyObjectFromView(_gameObject, _wrapper);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -28,7 +28,12 @@ namespace GFGGame
                 GFGAsset.Release(ResPathUtil.GetPrefabPath("SceneDressUp"));
                 GFGAsset.Release(ResPathUtil.GetPrefabPath("SceneDressUp"));
                 _scenePrefab = null;
                 _scenePrefab = null;
             }
             }
-            SceneController.DestroyObjectFromView(_gameObject1);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            if (_wrapper != null)
+            {
+                _wrapper.Dispose();
+                _wrapper = null;
+            }
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 5 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs

@@ -29,7 +29,11 @@ namespace GFGGame
                 GFGAsset.Release(ResPathUtil.GetPrefabPath("SceneDressUp"));
                 GFGAsset.Release(ResPathUtil.GetPrefabPath("SceneDressUp"));
                 _scenePrefab = null;
                 _scenePrefab = null;
             }
             }
-
+            if (_wrapper != null)
+            {
+                _wrapper.Dispose();
+                _wrapper = null;
+            }
             if (_dressUpObjDataCache != null)
             if (_dressUpObjDataCache != null)
             {
             {
                 _dressUpObjDataCache.Dispose();
                 _dressUpObjDataCache.Dispose();

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -27,6 +27,7 @@ namespace GFGGame
 
 
         public override void Dispose()
         public override void Dispose()
         {
         {
+            SceneController.DestroyObjectFromView(_gameObject, _wrapper);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 16 - 16
GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

@@ -32,13 +32,14 @@ namespace GFGGame
         }
         }
         public override void Dispose()
         public override void Dispose()
         {
         {
+            m_Instance = null;
+            SceneController.DestroyObjectFromView(_effectObj, _wrapper);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();
                 _ui = null;
                 _ui = null;
             }
             }
             base.Dispose();
             base.Dispose();
-            SceneController.DestroyObjectFromView(_effectObj);
 
 
         }
         }
 
 
@@ -109,25 +110,24 @@ namespace GFGGame
             }
             }
             if (progress < oldValule)
             if (progress < oldValule)
             {
             {
-                // _ui.m_progressBar1.value = progress;
-                // float posX = _ui.m_progressBar1.width * (progress / 100) - 70;
-                // _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
-                // callback?.Invoke();
+                _ui.m_progressBar1.value = progress;
+                float posX = _ui.m_progressBar1.width * (progress / 100) - 70;
+                _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                callback?.Invoke();
             }
             }
             else
             else
             {
             {
+                float duration = (float)(progress - oldValule) * SPEED;
+                GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
+                {
+                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) - 70;
+                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
 
 
-                // float duration = (float)(progress - oldValule) * SPEED;
-                // GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
-                // {
-                //     float posX = _ui.m_progressBar1.width * (t.value.x / 100) - 70;
-                //     _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
-
-                // });
-                // if (callback != null)
-                // {
-                //     gtweener.OnComplete(callback);
-                // }
+                });
+                if (callback != null)
+                {
+                    gtweener.OnComplete(callback);
+                }
             }
             }
             callback?.Invoke();
             callback?.Invoke();
         }
         }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

@@ -21,10 +21,10 @@ namespace GFGGame
             base.Dispose();
             base.Dispose();
             for (int i = 0; i < _effects.Count; i++)
             for (int i = 0; i < _effects.Count; i++)
             {
             {
-                SceneController.DestroyObjectFromView(_effects[i]);
+                SceneController.DestroyObjectFromView(_effects[i],_wrappers[i]);
 
 
             }
             }
-            SceneController.DestroyObjectFromView(_effect);
+            SceneController.DestroyObjectFromView(_effect,_wrapper);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxCardView.cs

@@ -23,7 +23,7 @@ namespace GFGGame
         public override void Dispose()
         public override void Dispose()
         {
         {
             base.Dispose();
             base.Dispose();
-            SceneController.DestroyObjectFromView(gameObject);
+            SceneController.DestroyObjectFromView(gameObject, wrapper);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 16 - 9
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -16,11 +16,12 @@ namespace GFGGame
         private List<GObject> clickComStars = new List<GObject>();
         private List<GObject> clickComStars = new List<GObject>();
         private List<GObject> notClickComStars = new List<GObject>();
         private List<GObject> notClickComStars = new List<GObject>();
 
 
-        private List<GameObject> _gameObjects = new List<GameObject>();
-        private List<GoWrapper> _wrappers = new List<GoWrapper>();
-        private List<GameObject> _gameObjects1 = new List<GameObject>();
-        private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
+        // private List<GameObject> _gameObjects = new List<GameObject>();
+        // private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        // private List<GameObject> _gameObjects1 = new List<GameObject>();
+        // private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
         private Dictionary<int, List<GameObject>> dicGameobj = new Dictionary<int, List<GameObject>>();
         private Dictionary<int, List<GameObject>> dicGameobj = new Dictionary<int, List<GameObject>>();
+        private Dictionary<int, List<GoWrapper>> dicWraper = new Dictionary<int, List<GoWrapper>>();
 
 
         private GObject curComStar;//当前选中的星星
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置,每颗星星初始时默认为Vector2.right;
         private Vector2 lastPos;//鼠标的上一个位置,每颗星星初始时默认为Vector2.right;
@@ -44,16 +45,20 @@ namespace GFGGame
         {
         {
             int index = 0;
             int index = 0;
             GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
             GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-            notClickComStars.Clear();
-            clickComStars.Clear();
-            dicGameobj.Clear();
-            foreach (List<GameObject> value in dicGameobj.Values)
+            foreach (int key in dicGameobj.Keys)
             {
             {
+                List<GameObject> value = dicGameobj[key];
+                List<GoWrapper> wrappersValue = dicWraper[key];
                 for (int i = 0; i < value.Count; i++)
                 for (int i = 0; i < value.Count; i++)
                 {
                 {
-                    SceneController.DestroyObjectFromView(value[i]);
+                    SceneController.DestroyObjectFromView(value[i], wrappersValue[i]);
                 }
                 }
             }
             }
+            notClickComStars.Clear();
+            clickComStars.Clear();
+            dicGameobj.Clear();
+            dicWraper.Clear();
+
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(CheckGuide);
         }
         }
         protected override void OnInit()
         protected override void OnInit()
@@ -145,8 +150,10 @@ namespace GFGGame
                 if (!dicGameobj.ContainsKey(index))
                 if (!dicGameobj.ContainsKey(index))
                 {
                 {
                     dicGameobj.Add(index, new List<GameObject>());
                     dicGameobj.Add(index, new List<GameObject>());
+                    dicWraper.Add(index, new List<GoWrapper>());
                 }
                 }
                 dicGameobj[index].Add(gameObject);
                 dicGameobj[index].Add(gameObject);
+                dicWraper[index].Add(wrapper);
             }
             }
             return gcom;
             return gcom;
         }
         }

+ 4 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -32,7 +32,10 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController.Dispose();
                 _valueBarController = null;
                 _valueBarController = null;
             }
             }
-
+            SceneController.DestroyObjectFromView(_gameObject, _wrapper);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/InstanceZonesController.cs

@@ -39,7 +39,7 @@ namespace GFGGame
                     return;
                     return;
                 }
                 }
                 bool skipable = MainStoryDataManager.CheckCurrentLevelPass();
                 bool skipable = MainStoryDataManager.CheckCurrentLevelPass();
-                ViewManager.Show(ViewName.STORY_DIALOG_VIEW, new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog) }, new object[] { typeof(StoryChapterView).Name, MainStoryDataManager.currentChapterCfgId }, true);
+                ViewManager.Show(ViewName.STORY_DIALOG_VIEW, new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog) }, new object[] { typeof(StoryChapterView).FullName, MainStoryDataManager.currentChapterCfgId }, true);
             }
             }
         }
         }
 
 

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -20,7 +20,7 @@ namespace GFGGame
             base.Dispose();
             base.Dispose();
             for (int i = 0; i < _effects.Count; i++)
             for (int i = 0; i < _effects.Count; i++)
             {
             {
-                SceneController.DestroyObjectFromView(_effects[i]);
+                SceneController.DestroyObjectFromView(_effects[i], _wrappers[i]);
             }
             }
             if (_ui != null)
             if (_ui != null)
             {
             {
@@ -96,6 +96,7 @@ namespace GFGGame
                 GoWrapper wrapper0;
                 GoWrapper wrapper0;
                 SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject0, out wrapper0);
                 SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject0, out wrapper0);
                 _effects.Add(gameObject0);
                 _effects.Add(gameObject0);
+                _wrappers.Add(wrapper0);
             }
             }
             UI_ListCardItem.ProxyEnd();
             UI_ListCardItem.ProxyEnd();
             UI_ComStar.ProxyEnd();
             UI_ComStar.ProxyEnd();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -96,8 +96,8 @@ namespace GFGGame
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             if (MainStoryDataManager.CheckChapterUnlock(chapterID))
             if (MainStoryDataManager.CheckChapterUnlock(chapterID))
             {
             {
-                this.Hide();
                 ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, chapterID, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, _ui.m_listType.selectedIndex });
                 ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, chapterID, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, _ui.m_listType.selectedIndex });
+                this.Hide();
             }
             }
             else
             else
             {
             {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -24,7 +24,7 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController.Dispose();
                 _valueBarController = null;
                 _valueBarController = null;
             }
             }
-            SceneController.DestroyObjectFromView(_gameObject);
+            SceneController.DestroyObjectFromView(_gameObject, _wrapper);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -53,7 +53,7 @@ namespace GFGGame
             _wordTextField = null;
             _wordTextField = null;
             _arrow = null;
             _arrow = null;
             _isShowLetters = false;
             _isShowLetters = false;
-            SceneController.DestroyObjectFromView(_npcHead);
+            SceneController.DestroyObjectFromView(_npcHead, _npcWrapper);
 
 
             Timers.inst.Remove(UpdateLetters);
             Timers.inst.Remove(UpdateLetters);
             if (_ui != null)
             if (_ui != null)

+ 37 - 30
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -27,15 +27,44 @@ namespace GFGGame
         private GameObject _gameObject0;
         private GameObject _gameObject0;
         private GameObject _gameObject1;
         private GameObject _gameObject1;
         private GameObject _gameObject2;
         private GameObject _gameObject2;
-        private GameObject _gameObject3;
-        private GameObject _gameObject4;
+        // private GameObject _gameObject3;
+        // private GameObject _gameObject4;
         private GameObject _gameObject5;
         private GameObject _gameObject5;
         private GameObject _gameObject6;
         private GameObject _gameObject6;
         private GameObject _gameObject7;
         private GameObject _gameObject7;
         private GameObject _gameObject8;
         private GameObject _gameObject8;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private GoWrapper _wrapper5;
         private GoWrapper _wrapper6;
         private GoWrapper _wrapper6;
         private GoWrapper _wrapper7;
         private GoWrapper _wrapper7;
+        private GoWrapper _wrapper8;
 
 
+        public override void Dispose()
+        {
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            // SceneController.DestroyObjectFromView(_gameObject3);
+            // SceneController.DestroyObjectFromView(_gameObject4);
+            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
+            SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
+            SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
+            SceneController.DestroyObjectFromView(_gameObject8, _wrapper8);
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+
+        }
         protected override void OnInit()
         protected override void OnInit()
         {
         {
             base.OnInit();
             base.OnInit();
@@ -174,7 +203,7 @@ namespace GFGGame
             // _ui.m_comClickCircle.m_t0.Stop(true, false);
             // _ui.m_comClickCircle.m_t0.Stop(true, false);
             _ui.m_comClickCircle.m_grpCircle.visible = false;
             _ui.m_comClickCircle.m_grpCircle.visible = false;
             string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", paths[clickState]);
             string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", paths[clickState]);
-            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath, out _gameObject2, out GoWrapper _wrapper2, 59);
+            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath, out _gameObject2, out _wrapper2, 59);
             _gameObject2.SetActive(true);
             _gameObject2.SetActive(true);
 
 
             _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
             _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
@@ -358,23 +387,23 @@ namespace GFGGame
         private void AddEffect()
         private void AddEffect()
         {
         {
             string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
             string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
-            SceneController.AddObjectToView(_gameObject0, null, _ui.m_holderPartScore, resPath0, out _gameObject0, out GoWrapper _wrapper0);
+            SceneController.AddObjectToView(_gameObject0, null, _ui.m_holderPartScore, resPath0, out _gameObject0, out _wrapper0);
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
-            SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out GoWrapper _wrapper1);
+            SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out _wrapper1);
             string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
             string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
-            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath2, out _gameObject2, out GoWrapper _wrapper2, 59);
+            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath2, out _gameObject2, out _wrapper2, 59);
             // string resPath3_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
             // string resPath3_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
             // SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath3_1, out _gameObject3, out GoWrapper _wrapper3, 59);
             // SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath3_1, out _gameObject3, out GoWrapper _wrapper3, 59);
             // string resPath3_2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_sb");
             // string resPath3_2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_sb");
             // SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
             // SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
-            SceneController.AddObjectToView(_gameObject5, null, _ui.m_proScore.m_comBar.m_holder1, resPath4, out _gameObject5, out GoWrapper _wrapper5);
+            SceneController.AddObjectToView(_gameObject5, null, _ui.m_proScore.m_comBar.m_holder1, resPath4, out _gameObject5, out _wrapper5);
             string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_cz");
             string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_cz");
             SceneController.AddObjectToView(_gameObject6, _wrapper6, _ui.m_comClickCircle.m_holder, resPath5, out _gameObject6, out _wrapper6);
             SceneController.AddObjectToView(_gameObject6, _wrapper6, _ui.m_comClickCircle.m_holder, resPath5, out _gameObject6, out _wrapper6);
             string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
             string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
             SceneController.AddObjectToView(_gameObject7, _wrapper7, _ui.m_comClickCircle.m_holder1, resPath6, out _gameObject7, out _wrapper7);
             SceneController.AddObjectToView(_gameObject7, _wrapper7, _ui.m_comClickCircle.m_holder1, resPath6, out _gameObject7, out _wrapper7);
             string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
             string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
-            SceneController.AddObjectToView(_gameObject8, null, _ui.m_comAllCircle.m_holder, resPath7, out _gameObject8, out GoWrapper _wrapper8, 70);
+            SceneController.AddObjectToView(_gameObject8, null, _ui.m_comAllCircle.m_holder, resPath7, out _gameObject8, out _wrapper8, 70);
         }
         }
         protected override void OnHide()
         protected override void OnHide()
         {
         {
@@ -394,29 +423,7 @@ namespace GFGGame
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(CheckGuide);
         }
         }
 
 
-        public override void Dispose()
-        {
-            if (_sceneObject != null)
-            {
-                GameObject.Destroy(_sceneObject);
-                _sceneObject = null;
-            }
-            SceneController.DestroyObjectFromView(_gameObject0);
-            SceneController.DestroyObjectFromView(_gameObject1);
-            SceneController.DestroyObjectFromView(_gameObject2);
-            SceneController.DestroyObjectFromView(_gameObject3);
-            SceneController.DestroyObjectFromView(_gameObject4);
-            SceneController.DestroyObjectFromView(_gameObject5);
-            SceneController.DestroyObjectFromView(_gameObject6);
-            SceneController.DestroyObjectFromView(_gameObject7);
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-            base.Dispose();
 
 
-        }
 
 
         //********************************************************************************************************//
         //********************************************************************************************************//
 
 

+ 58 - 25
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -30,31 +30,62 @@ namespace GFGGame
         private StoryLevelCfg _levelCfg;
         private StoryLevelCfg _levelCfg;
 
 
         private GameObject _gameObject0;
         private GameObject _gameObject0;
-        // private GoWrapper _wrapper0;
+        private GoWrapper _wrapper0;
         private GameObject _gameObject1;
         private GameObject _gameObject1;
-        // private GoWrapper _wrapper1;
+        private GoWrapper _wrapper1;
         private GameObject _gameObject2;
         private GameObject _gameObject2;
-        // private GoWrapper _wrapper2;
+        private GoWrapper _wrapper2;
         private GameObject _gameObject3;
         private GameObject _gameObject3;
-        // private GoWrapper _wrapper3;
+        private GoWrapper _wrapper3;
         private GameObject _gameObject4;
         private GameObject _gameObject4;
-        // private GoWrapper _wrapper4;
+        private GoWrapper _wrapper4;
         private GameObject _gameObject5;
         private GameObject _gameObject5;
+        private GoWrapper _wrapper5;
+
         private GameObject _gameObject6;
         private GameObject _gameObject6;
+        private GoWrapper _wrapper6;
+
         private GameObject _gameObject7;
         private GameObject _gameObject7;
+        private GoWrapper _wrapper7;
+
         private GameObject _gameObject8;
         private GameObject _gameObject8;
+        private GoWrapper _wrapper8;
+
         private GameObject _gameObject9;
         private GameObject _gameObject9;
+        private GoWrapper _wrapper9;
+
         private GameObject _gameObject10;
         private GameObject _gameObject10;
+        private GoWrapper _wrapper10;
+
         private GameObject _gameObject11;
         private GameObject _gameObject11;
+        private GoWrapper _wrapper11;
+
         private GameObject _gameObject12;
         private GameObject _gameObject12;
+        private GoWrapper _wrapper12;
+
         private GameObject _gameObject13;
         private GameObject _gameObject13;
+        private GoWrapper _wrapper13;
+
         private GameObject _gameObject14;
         private GameObject _gameObject14;
+        private GoWrapper _wrapper14;
+
         private GameObject _gameObject15;
         private GameObject _gameObject15;
+        private GoWrapper _wrapper15;
+
         private GameObject _gameObject16;
         private GameObject _gameObject16;
+        private GoWrapper _wrapper16;
+
         private GameObject _gameObject17;
         private GameObject _gameObject17;
+        private GoWrapper _wrapper17;
+
         private GameObject _gameObject18;
         private GameObject _gameObject18;
+        private GoWrapper _wrapper18;
+
         private GameObject _gameObject19;
         private GameObject _gameObject19;
+        private GoWrapper _wrapper19;
+
         private List<GameObject> _gameObjects = new List<GameObject>();
         private List<GameObject> _gameObjects = new List<GameObject>();
+        private List<GoWrapper> _wrappers = new List<GoWrapper>();
         // private GoWrapper _wrapper5;
         // private GoWrapper _wrapper5;
         private Dictionary<int, RoleSkillCfg> _npcSkillDic;
         private Dictionary<int, RoleSkillCfg> _npcSkillDic;
 
 
@@ -73,28 +104,28 @@ namespace GFGGame
                 _scenePrefab = null;
                 _scenePrefab = null;
             }
             }
 
 
-            SceneController.DestroyObjectFromView(_gameObject0);
-            SceneController.DestroyObjectFromView(_gameObject1);
-            SceneController.DestroyObjectFromView(_gameObject2);
-            SceneController.DestroyObjectFromView(_gameObject3);
-            SceneController.DestroyObjectFromView(_gameObject4);
-            SceneController.DestroyObjectFromView(_gameObject5);
-            SceneController.DestroyObjectFromView(_gameObject6);
-            SceneController.DestroyObjectFromView(_gameObject7);
-            SceneController.DestroyObjectFromView(_gameObject8);
-            SceneController.DestroyObjectFromView(_gameObject9);
-            SceneController.DestroyObjectFromView(_gameObject11);
-            SceneController.DestroyObjectFromView(_gameObject12);
-            SceneController.DestroyObjectFromView(_gameObject13);
-            SceneController.DestroyObjectFromView(_gameObject14);
-            SceneController.DestroyObjectFromView(_gameObject15);
-            SceneController.DestroyObjectFromView(_gameObject16);
-            SceneController.DestroyObjectFromView(_gameObject17);
-            SceneController.DestroyObjectFromView(_gameObject18);
-            SceneController.DestroyObjectFromView(_gameObject19);
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
+            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
+            SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
+            SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
+            SceneController.DestroyObjectFromView(_gameObject8, _wrapper8);
+            SceneController.DestroyObjectFromView(_gameObject9, _wrapper9);
+            SceneController.DestroyObjectFromView(_gameObject11, _wrapper11);
+            SceneController.DestroyObjectFromView(_gameObject12, _wrapper12);
+            SceneController.DestroyObjectFromView(_gameObject13, _wrapper13);
+            SceneController.DestroyObjectFromView(_gameObject14, _wrapper14);
+            SceneController.DestroyObjectFromView(_gameObject15, _wrapper15);
+            SceneController.DestroyObjectFromView(_gameObject16, _wrapper16);
+            SceneController.DestroyObjectFromView(_gameObject17, _wrapper17);
+            SceneController.DestroyObjectFromView(_gameObject18, _wrapper18);
+            SceneController.DestroyObjectFromView(_gameObject19, _wrapper19);
             for (int i = 0; i < _gameObjects.Count; i++)
             for (int i = 0; i < _gameObjects.Count; i++)
             {
             {
-                SceneController.DestroyObjectFromView(_gameObjects[i]);
+                SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
 
 
             }
             }
             if (_ui != null)
             if (_ui != null)
@@ -144,6 +175,7 @@ namespace GFGGame
                 SceneController.AddObjectToView(null, null, item.m_holder, resPath3, out GameObject _gameObject, out GoWrapper _wrapper);
                 SceneController.AddObjectToView(null, null, item.m_holder, resPath3, out GameObject _gameObject, out GoWrapper _wrapper);
                 UI_ComBtnSkill.ProxyEnd();
                 UI_ComBtnSkill.ProxyEnd();
                 _gameObjects.Add(_gameObject);
                 _gameObjects.Add(_gameObject);
+                _wrappers.Add(_wrapper);
             }
             }
 
 
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
@@ -726,6 +758,7 @@ namespace GFGGame
             Timers.inst.Remove(CircleScoreEnd);
             Timers.inst.Remove(CircleScoreEnd);
 
 
             _gameObjects.Clear();
             _gameObjects.Clear();
+            _wrappers.Clear();
         }
         }
         private void CheckGuide(object param)
         private void CheckGuide(object param)
         {
         {

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -25,13 +25,14 @@ namespace GFGGame
         private GameObject _gameObject;
         private GameObject _gameObject;
         private GameObject _gameObject1;
         private GameObject _gameObject1;
         private GoWrapper _wrapper;
         private GoWrapper _wrapper;
+        private GoWrapper _wrapper1;
         private StoryLevelCfg _levelCfg;
         private StoryLevelCfg _levelCfg;
         private StoryFightResultData _resultData;
         private StoryFightResultData _resultData;
 
 
         public override void Dispose()
         public override void Dispose()
         {
         {
-            SceneController.DestroyObjectFromView(_gameObject);
-            SceneController.DestroyObjectFromView(_gameObject1);
+            SceneController.DestroyObjectFromView(_gameObject, _wrapper);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
 
 
             if (_sceneObject != null)
             if (_sceneObject != null)
             {
             {
@@ -70,7 +71,7 @@ namespace GFGGame
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
 
 
             string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_zdjs_jdt");
             string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_zdjs_jdt");
-            SceneController.AddObjectToView(_gameObject1, null, _ui.m_expBar.m_pbExp.m_holder, resPath, out _gameObject1, out GoWrapper wrapper);
+            SceneController.AddObjectToView(_gameObject1, null, _ui.m_expBar.m_pbExp.m_holder, resPath, out _gameObject1, out _wrapper1);
         }
         }
 
 
         protected override void OnShown()
         protected override void OnShown()

+ 7 - 3
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -55,9 +55,13 @@ namespace GFGGame
 
 
             for (int i = 0; i < _btns.Length; i++)
             for (int i = 0; i < _btns.Length; i++)
             {
             {
-                SceneController.DestroyObjectFromView(_effects[i]);
-                SceneController.DestroyObjectFromView(_effects[i]);
+                SceneController.DestroyObjectFromView(_effects[i], _wrappers[i]);
+                SceneController.DestroyObjectFromView(_effects1[i], _wrappers1[i]);
             }
             }
+            SceneController.DestroyObjectFromView(_effectObj4, _wrapper4);
+            SceneController.DestroyObjectFromView(_effectObj4_1, _wrapper4_1);
+            SceneController.DestroyObjectFromView(_effectObj5, _wrapper5);
+
             if (_sceneObject != null)
             if (_sceneObject != null)
             {
             {
                 GameObject.Destroy(_sceneObject);
                 GameObject.Destroy(_sceneObject);
@@ -188,7 +192,7 @@ namespace GFGGame
             base.RemoveEventListener();
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, OnNumericChange);
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, OnNumericChange);
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, CheckFunOpen);
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, CheckFunOpen);
-            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
 
 
         }
         }
         private void AddEffect()
         private void AddEffect()

+ 10 - 0
GameClient/Assets/Game/Launcher/Views/LauncherView.cs

@@ -42,6 +42,16 @@ namespace GFGGame
         #region private
         #region private
         private void Dispose()
         private void Dispose()
         {
         {
+            if (_gameObject != null)
+            {
+                GameObject.Destroy(_gameObject);
+                _gameObject = null;
+            }
+            if (_wrapper != null)
+            {
+                _wrapper.Dispose();
+                _wrapper = null;
+            }
             UIPackage.RemovePackage("UI/" + _packageName);
             UIPackage.RemovePackage("UI/" + _packageName);
             _ui.Dispose(true);
             _ui.Dispose(true);
             _ui = null;
             _ui = null;