zhaoyang il y a 3 ans
Parent
commit
b11c61d94b

+ 8 - 8
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -129,7 +129,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel)
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel)
                 && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
                 && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
             {
             {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
+                UI.CommonGame.UI_ApproachOfItemUI listItem = UI.CommonGame.UI_ApproachOfItemUI.Proxy(list.GetChildAt(0));
                 if (listItem != null)
                 if (listItem != null)
                 {
                 {
                     ShowGuide(listItem.target, false, "这里是物品产出的所有来源,点击服装店");
                     ShowGuide(listItem.target, false, "这里是物品产出的所有来源,点击服装店");
@@ -176,7 +176,7 @@ namespace GFGGame
                 int len = _list.numChildren;
                 int len = _list.numChildren;
                 for (int i = 0; i < len; i++)
                 for (int i = 0; i < len; i++)
                 {
                 {
-                    UI_TypeItem item = UI_TypeItem.Proxy(_list.GetChildAt(i));
+                    UI_comListType item = UI_comListType.Proxy(_list.GetChildAt(i));
                     if (item != null)
                     if (item != null)
                     {
                     {
                         int menuID = (int)item.target.data;
                         int menuID = (int)item.target.data;
@@ -199,7 +199,7 @@ namespace GFGGame
             {
             {
                 if (list.numChildren > 0)
                 if (list.numChildren > 0)
                 {
                 {
-                    UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
+                    UI_PartsList listItem = UI_PartsList.Proxy(list.GetChildAt(0));
                     if (listItem != null)
                     if (listItem != null)
                     {
                     {
                         ShowGuide(listItem.target, true, guideStr);
                         ShowGuide(listItem.target, true, guideStr);
@@ -292,7 +292,7 @@ namespace GFGGame
                 list.ScrollToView(len - 1);
                 list.ScrollToView(len - 1);
                 for (int i = 0; i < len; i++)
                 for (int i = 0; i < len; i++)
                 {
                 {
-                    UI_TypeItem item = UI_TypeItem.Proxy(list.GetChildAt(i));
+                    UI_comListType item = UI_comListType.Proxy(list.GetChildAt(i));
                     if (item != null)
                     if (item != null)
                     {
                     {
                         int menuID = (int)item.target.data;
                         int menuID = (int)item.target.data;
@@ -314,7 +314,7 @@ namespace GFGGame
             {
             {
                 if (list.numChildren > 0)
                 if (list.numChildren > 0)
                 {
                 {
-                    UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
+                    UI_PartsList listItem = UI_PartsList.Proxy(list.GetChildAt(0));
                     if (listItem != null)
                     if (listItem != null)
                     {
                     {
                         ShowGuide(listItem.target, true, "点击图标,可换上整套衣服");
                         ShowGuide(listItem.target, true, "点击图标,可换上整套衣服");
@@ -391,7 +391,7 @@ namespace GFGGame
             {
             {
                 if (list.numChildren > 0)
                 if (list.numChildren > 0)
                 {
                 {
-                    UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
+                    UI_SuitListItem listItem = UI_SuitListItem.Proxy(list.GetChildAt(0));
                     if (listItem != null)
                     if (listItem != null)
                     {
                     {
                         ShowGuide(listItem.target, true, "点击套装");
                         ShowGuide(listItem.target, true, "点击套装");
@@ -438,8 +438,8 @@ namespace GFGGame
         {
         {
 
 
             if (GuideDataManager.GetGuideCount(ConstGuideId.USE_CARD_FIGHT) <= 0
             if (GuideDataManager.GetGuideCount(ConstGuideId.USE_CARD_FIGHT) <= 0
-                 && StoryDataManager.CheckLevelPass(2, 5)
-                 && !StoryDataManager.CheckLevelPass(2, 6)
+                && StoryDataManager.CheckLevelPass(2, 5)
+                && !StoryDataManager.CheckLevelPass(2, 6)
                 && StoryDataManager.currentChapter == 2 && StoryDataManager.currentLevel == 6)
                 && StoryDataManager.currentChapter == 2 && StoryDataManager.currentLevel == 6)
             {
             {
                 if (list.numChildren > 0)
                 if (list.numChildren > 0)

+ 9 - 8
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -14,14 +14,14 @@ namespace GFGGame
 
 
         public override void Dispose()
         public override void Dispose()
         {
         {
-            if(_scenePrefab != null)
+            if (_scenePrefab != null)
             {
             {
                 GameObject.Destroy(_scenePrefab);
                 GameObject.Destroy(_scenePrefab);
                 _scenePrefab = null;
                 _scenePrefab = null;
             }
             }
             base.Dispose();
             base.Dispose();
         }
         }
-        
+
         protected override void OnInit()
         protected override void OnInit()
         {
         {
             base.OnInit();
             base.OnInit();
@@ -43,16 +43,17 @@ namespace GFGGame
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            if(_sceneObject != null)
+            if (_sceneObject != null)
             {
             {
                 GameObject.Destroy(_sceneObject);
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
                 _sceneObject = null;
             }
             }
-            if(_wrapper != null)
+            if (_wrapper != null)
             {
             {
                 _wrapper.wrapTarget = null;
                 _wrapper.wrapTarget = null;
             }
             }
-            Timers.inst.CallLater((object param) => {
+            Timers.inst.CallLater((object param) =>
+            {
                 GetSuitItemController.TryShow(0);
                 GetSuitItemController.TryShow(0);
             });
             });
             GuideController.HideGuide();
             GuideController.HideGuide();
@@ -110,7 +111,7 @@ namespace GFGGame
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
                 _ui.m_txtName.text = "套装·" + suitCfg.name;
                 _ui.m_txtName.text = "套装·" + suitCfg.name;
                 int targetY = (int)(_ui.m_item.target.y + _ui.m_item.target.height + 50);
                 int targetY = (int)(_ui.m_item.target.y + _ui.m_item.target.height + 50);
-                if(count == totalCount)
+                if (count == totalCount)
                 {
                 {
                     GuideController.TryGuideByGuideId(null, ConstGuideId.GET_SUIT_ITEM_VIEW_FULL, 1, false, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续", targetY);
                     GuideController.TryGuideByGuideId(null, ConstGuideId.GET_SUIT_ITEM_VIEW_FULL, 1, false, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续", targetY);
                 }
                 }
@@ -122,7 +123,7 @@ namespace GFGGame
             _ui.m_probar.max = totalCount;
             _ui.m_probar.max = totalCount;
             _ui.m_probar.value = count;
             _ui.m_probar.value = count;
             UpdateItem(itemId);
             UpdateItem(itemId);
-            if(_sceneObject != null)
+            if (_sceneObject != null)
             {
             {
                 GameObject.Destroy(_sceneObject);
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
                 _sceneObject = null;
@@ -131,7 +132,7 @@ namespace GFGGame
             int scale = 70;
             int scale = 70;
             _sceneObject.transform.localScale = new Vector3(scale, scale, scale);
             _sceneObject.transform.localScale = new Vector3(scale, scale, scale);
             SceneController.UpdateRole(itemIds, _sceneObject);
             SceneController.UpdateRole(itemIds, _sceneObject);
-            if(_wrapper == null)
+            if (_wrapper == null)
             {
             {
                 _wrapper = new GoWrapper(_sceneObject);
                 _wrapper = new GoWrapper(_sceneObject);
                 _ui.m_holder.SetNativeObject(_wrapper);
                 _ui.m_holder.SetNativeObject(_wrapper);

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

@@ -82,7 +82,7 @@ namespace GFGGame
         }
         }
         private void OnClickListChapterItem(EventContext context)
         private void OnClickListChapterItem(EventContext context)
         {
         {
-            GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_STORY);
+            // GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_STORY);
             GObject chapterItem = context.data as GObject;
             GObject chapterItem = context.data as GObject;
             int chapterID = (int)chapterItem.data;
             int chapterID = (int)chapterItem.data;
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
@@ -155,7 +155,7 @@ namespace GFGGame
                 }
                 }
                 if (i == 0)
                 if (i == 0)
                 {
                 {
-                    GuideController.TryGuideByGuideId(listItem.m_content.target, ConstGuideId.MAIN_UI_BTN_STORY, 1, true, "点击章节图标,继续探索吧");
+                    // GuideController.TryGuideByGuideId(listItem.m_content.target, ConstGuideId.MAIN_UI_BTN_STORY, 1, true, "点击章节图标,继续探索吧");
                 }
                 }
             }
             }
         }
         }

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

@@ -222,7 +222,7 @@ namespace GFGGame
         private void SetScoreUI()
         private void SetScoreUI()
         {
         {
             EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
             EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
-            _ui.m_selfScore.m_txtScore.text = Math.Round(_score).ToString();
+            _ui.m_proScore.m_txtCount.text = Math.Round(_score).ToString();
             _ui.m_proScore.target.TweenValue(_score, 0.2f);
             _ui.m_proScore.target.TweenValue(_score, 0.2f);
 
 
         }
         }