搭配赛引导部分代码提交

GameClient/Assets/Game/HotUpdate/Data/VO/MatchingCompetitionData.cs

@@ -37,9 +37,9 @@ namespace GFGGame
     //道具的位置信息
     public class TransformData
     {
-        public Vector3 position = new Vector3();
+        public Vector3 position = new Vector3(0,0,0);
         public float rotationZ = 0f;
-        public Vector3 scale = new Vector3();
+        public Vector3 scale = new Vector3(1,1,1);
     }
     //搭配赛作品信息
     public class MatchingPhotoWorksData

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceZonesUI.cs

@@ -14,6 +14,7 @@ namespace UI.InstanceZones
         public UI_ButtonModle9 m_btnStudio;
         public UI_ButtonModle9 m_btnTravel;
         public UI_ButtonModle9 m_btnPoem;
+        public GButton m_btnPoemGudie;
         public UI_ButtonModle9 m_btnField;
         public UI_ButtonModle9 m_btnArena;
         public GGraph m_eff;
@@ -74,6 +75,7 @@ namespace UI.InstanceZones
             m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
             m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
             m_btnPoem = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnPoem"));
+            m_btnPoemGudie = (GButton)comp.GetChild("btnPoemGudie");
             m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
             m_btnArena = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnArena"));
             m_eff = (GGraph)comp.GetChild("eff");
@@ -94,6 +96,7 @@ namespace UI.InstanceZones
             m_btnTravel = null;
             m_btnPoem.Dispose();
             m_btnPoem = null;
+            m_btnPoemGudie = null;
             m_btnField.Dispose();
             m_btnField = null;
             m_btnArena.Dispose();

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -52,6 +52,7 @@ namespace GFGGame
             _ui.m_btnStudio.target.onClick.Add(OnClickBtnStudio);
             _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
             _ui.m_btnPoem.target.onClick.Add(OnClickBtnPoem);
+            _ui.m_btnPoemGudie.onClick.Add(OnClickBtnPoem);
             _ui.m_btnField.target.onClick.Add(OnTimeTracingClick);
             _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
@@ -97,8 +98,10 @@ namespace GFGGame
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.POEM) <= 0
-                || GuideDataManager.IsGuideFinish("ClothingSelectView") <= 0)
-                //|| GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
+                || GuideDataManager.IsGuideFinish("ClothingSelectView") <= 0
+                || (GuideDataManager.IsGuideFinish("DAPEISAI_1") <=0 && MatchingCompetitionDataManager.Instance.MatchingState == 1 && MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason != 0)
+                || (GuideDataManager.IsGuideFinish("DAPEISAI_2") <= 0 && MatchingCompetitionDataManager.Instance.MatchingState == 2 && MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason != 0))
+            //|| GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -201,7 +204,14 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_FILING, 3, "工作室有新的任务啦。");
             //GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察，会有意想不到的收获哦。");
             GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PROPERTY, 2, "");
-            //GuideController.TryGuide(_ui.m_btnPoem.target, ConstGuideId.POEM, 1, "在“拍照”中保存的图片都会保存到这里。");
+            if(MatchingCompetitionDataManager.Instance.MatchingState == 1)
+            {
+                GuideController.TryGuide(_ui.m_btnPoemGudie, "DAPEISAI_1", 1, "进入搭配赛，进行搭配！");
+            }
+            else if(MatchingCompetitionDataManager.Instance.MatchingState == 2)
+            {
+                GuideController.TryGuide(_ui.m_btnPoemGudie, "DAPEISAI_2", 1, "进入搭配赛,进行评选！");
+            }
             GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
             GuideController.TryGuide(_ui.m_btnField.target, "TimeTracingShowView", 3, "合成副本可获得奖励和服装哦~");

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionDetailView.cs

@@ -55,7 +55,8 @@ namespace GFGGame
             //    MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
             //}
             AllIdList = this.viewData as List<int>;
-            _ui.m_dressList.visible = false;
+            _ui.m_dressList.visible = true;
+            _ui.m_nameList.visible = false;
             UpdateDress();
             UpdateView();
         }
@@ -82,7 +83,16 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            _ui.m_nameList.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 1;
+            //_ui.m_nameList.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 1;
+            AllIdList.Remove(10000);
+            AllIdList.Remove(20000);
+            AllIdList.Remove(30000);
+            AllIdList.Remove(50000);
+            AllIdList.Remove(60000);
+            AllIdList.Remove(-1);
+            AllIdList.Remove(0);
+            AllIdList.Remove(-3);
+            _ui.m_dressList.numItems = AllIdList.Count;
         }
         private void UpdateDress()
         {
@@ -175,14 +185,14 @@ namespace GFGGame
         private void ListItemType2Render(int index, GObject obj)
         {
             UI_MatchingDressItem item = UI_MatchingDressItem.Proxy(obj);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(IdList[index]);
-            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(IdList[index]);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(AllIdList[index]);
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(AllIdList[index]);
             if (itemCfg != null)
             {
                 item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res, "png");
                 item.m_txtTitle.text = itemCfg.name;
             }
-            else if (suitCfg != null)
+            if (suitCfg != null)
             {
                 item.m_icon.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
                 item.m_txtTitle.text = suitCfg.name;
@@ -238,8 +248,8 @@ namespace GFGGame
 
         private void OnClickBtn(EventContext context)
         {
-            _ui.m_nameList.visible = true;
-            _ui.m_dressList.visible = false;
+            //_ui.m_nameList.visible = true;
+            //_ui.m_dressList.visible = false;
         }
 
         private void OnClickBtnBack()

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionGatheringView.cs

@@ -69,6 +69,7 @@ namespace GFGGame
             _ui.m_suitName.text = suitCfg.name;
             UpdateView();
             Timers.inst.AddUpdate(UpdateTime);
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -81,6 +82,7 @@ namespace GFGGame
             _ui.m_suitShow.data = null;
             base.OnHide();
             Timers.inst.Remove(UpdateTime);
+            Timers.inst.Remove(CheckGuide);
         }
 
         private void UpdateView()
@@ -141,6 +143,22 @@ namespace GFGGame
         {
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, 3 });
         }
-
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish("DAPEISAI_1") <= 0 && MatchingCompetitionDataManager.Instance.MatchingState == 1)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_btnUploadWorks, "DAPEISAI_1", 2, "进行搭配！");
+            GuideController.TryCompleteGuide("DAPEISAI_1", 2);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionSelectView.cs

@@ -63,6 +63,7 @@ namespace GFGGame
             UpdatePlayer();
             //UpdateDressLeft();
             ViewManager.Hide<ModalStatusView>();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -77,6 +78,7 @@ namespace GFGGame
                 PrefabManager.Instance.Restore(_sceneObjectRight);
                 _sceneObjectRight = null;
             }
+            Timers.inst.Remove(CheckGuide);
             base.OnHide();
         }
         protected override void AddEventListener()
@@ -283,7 +285,11 @@ namespace GFGGame
         }
         private async void OnClickBtnSelect1()
         {
-            if((judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes)<=0)
+            if (GuideDataManager.IsGuideFinish("DAPEISAI_2") <= 0)
+            {
+                return;
+            }
+            if ((judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes)<=0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("评选次数不足");
                 return;
@@ -357,5 +363,23 @@ namespace GFGGame
                 }
             });
         }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish("DAPEISAI_2") <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_select1.target, "DAPEISAI_2", 3, "选择你喜欢的搭配！");
+            GuideController.TryCompleteGuide("DAPEISAI_2", 3);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionUpLoadView.cs

@@ -60,6 +60,7 @@ namespace GFGGame
             UpdateHead();
             UpdateDress();
             Timers.inst.AddUpdate(UpdateTime);
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -71,6 +72,7 @@ namespace GFGGame
             }
             Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(UpdateCountTime);
+            Timers.inst.Remove(CheckGuide);
             base.OnHide();     
         }
         protected override void AddEventListener()
@@ -233,7 +235,8 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("结算期间无法选择!");
                 return;
             }
-            if(MatchingCompetitionDataManager.Instance.MatchingRemainingTimes <= 0)
+            JudgingRoundOpenCfg judgingCfg = JudgingRoundOpenCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason);
+            if ((judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes) <= 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("评选次数不足!");
                 return;
@@ -306,5 +309,22 @@ namespace GFGGame
             MatchingCompetitionDataManager.Instance.DetailNtexture = MatchingOneDataManager.Instance.OneRoleInfo.Ntexture;
             ViewManager.Show<MatchingCompetitionDetailView>(AllIdList);
         }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish("DAPEISAI_2") <= 0 && MatchingCompetitionDataManager.Instance.MatchingState == 2)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_btnUploadWorks, "DAPEISAI_2", 2, "进行评选！");
+        }
     }
 }