限时抽奖副本

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxUI.xml

@@ -5,13 +5,16 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n1_mbf1" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n12_m9ei" name="btnChapter" src="mbf1l" fileName="compoents/Button1.xml" xy="737,147" group="n8_mbf1">
+      <Button icon="ui://ubfk2kobt6j1m"/>
+    </component>
     <component id="n3_mbf1" name="btnTask" src="mbf1l" fileName="compoents/Button1.xml" xy="896,147" group="n8_mbf1">
       <Button icon="ui://ubfk2kobt6j1m"/>
     </component>
-    <component id="n7_mbf1" name="btnShop" src="mbf1l" fileName="compoents/Button1.xml" xy="998,127" size="94,95" group="n8_mbf1" visible="false">
+    <component id="n7_mbf1" name="btnShop" src="mbf1l" fileName="compoents/Button1.xml" xy="839,127" size="94,95" group="n8_mbf1" visible="false">
       <Button icon="ui://ubfk2kobmbf11"/>
     </component>
-    <group id="n8_mbf1" name="n8" xy="896,147" size="151,118" advanced="true" layout="hz" colGap="8" excludeInvisibles="true">
+    <group id="n8_mbf1" name="n8" xy="737,147" size="310,118" advanced="true" layout="hz" colGap="8" excludeInvisibles="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <image id="n6_mbf1" name="n6" src="mbf14" fileName="imagesNew/sj_dk.png" pkg="eg2y0ldp" xy="416,105" group="n9_mbf1"/>

FGUIProject/assets/Studio/StudioFilingUI.xml

@@ -11,10 +11,14 @@
     <component id="n2_rqo4" name="btnChange" src="rqo41l" fileName="components/Button1.xml" xy="0,210">
       <Button title="邢慈静"/>
     </component>
-    <image id="n23_v482" name="n23" src="v4822m" fileName="images/cyjd_di_7.png" xy="690,230" group="n24_v482"/>
+    <image id="n23_v482" name="n23" src="v4822m" fileName="images/cyjd_di_7.png" xy="690,230">
+      <relation target="n24_v482" sidePair="width-width,center-center"/>
+    </image>
     <text id="n5_rqo4" name="txtNum" xy="715,234" size="247,46" group="n24_v482" fontSize="34" color="#9b7f59" vars="true" text="今日挑战次数:{count=10}"/>
     <component id="n6_rqo4" name="btnAdd" src="rqo41o" fileName="components/Button4.xml" xy="992,235" group="n24_v482"/>
-    <group id="n24_v482" name="grpAdd" xy="690,230" size="364,58"/>
+    <group id="n24_v482" name="grpAdd" xy="715,234" size="325,49" advanced="true" layout="hz" colGap="30" excludeInvisibles="true">
+      <relation target="" sidePair="right-right"/>
+    </group>
     <list id="n14_rqo4" name="list" xy="540,998" pivot="0.5,0.5" anchor="true" size="960,1358" lineGap="20" defaultItem="ui://xz8kxrecv4822p" align="center" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="middle-middle"/>
       <item/>

FGUIProject/assets/Studio/components/ListNpcItem.xml

@@ -3,9 +3,10 @@
   <displayList>
     <image id="n4_orst" name="n4" src="orst1x" fileName="images/dndn_dik.png" xy="26,0"/>
     <component id="n2_hbio" name="ComIcon" src="pu5526" fileName="components/ComIcon.xml" xy="30,145"/>
-    <image id="n5_orst" name="n5" src="orst1y" fileName="images/dndn_mzk.png" xy="36,637"/>
-    <text id="n3_hbio" name="txtName" xy="27,671" pivot="0.5,0.5" size="70,151" fontSize="40" color="#f5eed7" align="center" vAlign="middle" leading="0" autoSize="height" strokeColor="#7d6847" strokeSize="2" text="杨贵妃"/>
     <text id="n7_wono" name="txtNone" xy="50,671" pivot="0.5,0.5" size="22,151" fontSize="40" color="#f5eed7" align="center" vAlign="middle" leading="0" autoSize="none" strokeColor="#7d6847" strokeSize="2" text="？？？"/>
+    <image id="n5_orst" name="n5" src="orst1y" fileName="images/dndn_mzk.png" xy="36,637" group="n8_m9ei"/>
+    <text id="n3_hbio" name="txtName" xy="27,671" pivot="0.5,0.5" size="70,151" group="n8_m9ei" fontSize="40" color="#f5eed7" align="center" vAlign="middle" leading="0" autoSize="height" strokeColor="#7d6847" strokeSize="2" text="杨贵妃"/>
+    <group id="n8_m9ei" name="grpName" xy="27,637" size="70,218" advanced="true"/>
     <image id="n6_orst" name="imgLock" src="orst1w" fileName="images/dndn_dih.png" xy="26,0"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/package.xml

@@ -95,6 +95,7 @@
     <image id="o4m73r" name="yizugongzhu.png" path="/imgExpot/" exported="true"/>
     <image id="o4m73s" name="zhangzhongjing.png" path="/imgExpot/" exported="true"/>
     <image id="o4m73t" name="zhukerou.png" path="/imgExpot/" exported="true"/>
+    <image id="m9ei3u" name="cyjd_jhsy_bg.png" path="/imgExpot/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Studio" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -209,7 +209,8 @@ namespace GFGGame
             FightDataManager.Instance.dialogSpeed = dialogSpeed <= 0 ? 1 : dialogSpeed;
 
             int filingChapterId = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STUDIO_FILING_CHAPTERID);
-            StudioDataManager.Instance.filingChapterId = filingChapterId <= 0 ? StudioDataManager.Instance.FilingDatas[0].id : filingChapterId;
+            StudioDataManager.Instance.npcFilingChapterId = filingChapterId <= 0 ? StudioDataManager.Instance.FilingDatas[0].id : filingChapterId;
+            StudioDataManager.Instance.filingChapterId = StudioDataManager.Instance.npcFilingChapterId;
             GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;
 
             bool result = await FieldSProxy.ReqFieldInstanceInfos();

GameClient/Assets/Game/HotUpdate/Data/StudioDataManager.cs

@@ -13,7 +13,9 @@ namespace GFGGame
         public int PROPERTY_SELECT_INDEX = 0;//属性类型
         public string VIEW_NAME = "";//界面名称
 
-        public int filingChapterId;//查阅建档副本Id
+        public int filingChapterId;//查阅建档当前副本Id
+        public int npcFilingChapterId;//记录查阅建档工作室入口id，为与限时活动章节做区分。
+        public int luckyBoxFilingChapterId = 31000;//查阅建档这个章节是限时抽奖活动专属，为测试能快速更新先临时写死，后边再改
 
         public int PorcelainTheme = 1;//瓷器修复当天主题
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -9,6 +9,7 @@ namespace UI.ActivityThemeLuckyBox
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
+        public GButton m_btnChapter;
         public GButton m_btnTask;
         public GButton m_btnShop;
         public GTextField m_txtTime;
@@ -62,6 +63,7 @@ namespace UI.ActivityThemeLuckyBox
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnChapter = (GButton)comp.GetChild("btnChapter");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_btnShop = (GButton)comp.GetChild("btnShop");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
@@ -71,6 +73,7 @@ namespace UI.ActivityThemeLuckyBox
         {
             m_loaBg = null;
             m_btnBack = null;
+            m_btnChapter = null;
             m_btnTask = null;
             m_btnShop = null;
             m_txtTime = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListNpcItem.cs

@@ -8,8 +8,9 @@ namespace UI.Studio
     {
         public GComponent target;
         public UI_ComIcon m_ComIcon;
-        public GTextField m_txtName;
         public GTextField m_txtNone;
+        public GTextField m_txtName;
+        public GGroup m_grpName;
         public GImage m_imgLock;
         public const string URL = "ui://xz8kxrechbio1u";
         public const string PACKAGE_NAME = "Studio";
@@ -59,16 +60,18 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_ComIcon = (UI_ComIcon)UI_ComIcon.Create(comp.GetChild("ComIcon"));
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtNone = (GTextField)comp.GetChild("txtNone");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_grpName = (GGroup)comp.GetChild("grpName");
             m_imgLock = (GImage)comp.GetChild("imgLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_ComIcon.Dispose();
             m_ComIcon = null;
-            m_txtName = null;
             m_txtNone = null;
+            m_txtName = null;
+            m_grpName = null;
             m_imgLock = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingUI.cs

@@ -13,6 +13,7 @@ namespace UI.Studio
         public GButton m_btnChange;
         public GTextField m_txtNum;
         public GButton m_btnAdd;
+        public GGroup m_grpAdd;
         public GList m_list;
         public GButton m_btnSuit;
         public GTextField m_txtSuitName;
@@ -72,6 +73,7 @@ namespace UI.Studio
             m_btnChange = (GButton)comp.GetChild("btnChange");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
+            m_grpAdd = (GGroup)comp.GetChild("grpAdd");
             m_list = (GList)comp.GetChild("list");
             m_btnSuit = (GButton)comp.GetChild("btnSuit");
             m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
@@ -87,6 +89,7 @@ namespace UI.Studio
             m_btnChange = null;
             m_txtNum = null;
             m_btnAdd = null;
+            m_grpAdd = null;
             m_list = null;
             m_btnSuit = null;
             m_txtSuitName = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/InstanceZonesSProxy.cs

@@ -48,7 +48,7 @@ namespace GFGGame
                     {
                         StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
                         SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
-                        if (suitCfg.syntheticStoryLevelId == levelCfgId)
+                        if (suitCfg.syntheticStoryLevelId == levelCfgId && levelCfgId != StudioDataManager.Instance.luckyBoxFilingChapterId)
                         {
                             PromptController.Instance.ShowFloatTextPrompt(string.Format("已解锁{0}套装制作", suitCfg.name));
                         }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -38,8 +38,10 @@ namespace GFGGame
             // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
+            _ui.m_btnChapter.onClick.Add(OnBtnChapterClick);
             _ui.m_btnLuckyBox.onClick.Add(OnBtnLuckyBoxClick);
 
+
         }
         protected override void AddEventListener()
         {
@@ -80,6 +82,10 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityThemeLuckyBoxTaskView>();
         }
+        private void OnBtnChapterClick()
+        {
+            ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.luckyBoxFilingChapterId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
+        }
         private void OnBtnLuckyBoxClick()
         {
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

@@ -55,7 +55,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_list.numItems = StudioDataManager.Instance.FilingDatas.Count;
+            _ui.m_list.numItems = StudioDataManager.Instance.FilingDatas.Count - 1;
         }
 
         protected override void OnHide()
@@ -76,9 +76,9 @@ namespace GFGGame
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
             item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(cfg.res);// isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
-            item.m_imgLock.visible = true;
+            item.m_imgLock.visible = !isPass;
             item.m_txtName.text = cfg.name;
-            item.m_txtName.visible = isPass;
+            item.m_grpName.visible = isPass;
             item.m_txtNone.visible = false;
             item.target.data = cfg;
             if (cfg.id == StudioDataManager.Instance.filingChapterId)
@@ -101,6 +101,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("通关主线{0}解锁", showId));
                 return;
             }
+            StudioDataManager.Instance.npcFilingChapterId = cfg.id;
             StudioDataManager.Instance.filingChapterId = cfg.id;
             StorageSProxy.ReqSetClientValue(ConstStorageId.STUDIO_FILING_CHAPTERID, cfg.id).Coroutine();
             EventAgent.DispatchEvent(ConstMessage.FILLING_CHANGE_CHAPTER);

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -12,6 +12,7 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private StudioCfg _studioCfg;
         private List<StoryLevelCfg> _storyLevelCfgs;
+        private int _viewData = 0;
 
         public override void Dispose()
         {
@@ -60,7 +61,11 @@ namespace GFGGame
         {
             base.OnShown();
             _valueBarController.OnShown();
-            // _valueBarController.Controller(1);
+
+            _viewData = this.viewData != null ? (int)this.viewData : 0;
+            _ui.m_btnChange.visible = _viewData != StudioDataManager.Instance.luckyBoxFilingChapterId;
+            StudioDataManager.Instance.filingChapterId = _viewData > 0 ? _viewData : StudioDataManager.Instance.npcFilingChapterId;
+
             UpdateView();
             Timers.inst.AddUpdate(CheckGuide);
         }
@@ -102,7 +107,7 @@ namespace GFGGame
             _studioCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(this._studioCfg.limit);
             var limitCfg = LimitCfgArray.Instance.GetCfg(this._studioCfg.limit);
-
+            _ui.m_btnAdd.visible = limitCfg.itemID > 0;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_studioCfg.res);
             _ui.m_btnChange.title = _studioCfg.name;
             _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitCfg.num + limitData.PlayTimesResetExtra);
@@ -208,7 +213,19 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("需通关{0}关卡解锁", cfg.name));
                 return;
             }
-            ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, new object[] { typeof(StudioFilingView).FullName, this.viewData }, true);
+            if (_viewData == StudioDataManager.Instance.luckyBoxFilingChapterId)
+            {
+                int _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+                ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+                long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+                long curTime = TimeHelper.ServerNow();
+                if (endTime < curTime) return;
+                ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(StudioFilingView).FullName, this.viewData }, true);
+            }
+            else
+            {
+                ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, new object[] { typeof(StudioFilingView).FullName, this.viewData }, true);
+            }
         }
         private void UpdateRedDot()
         {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
         private void OnClickComFilling()
         {
 
-            ViewManager.Show<StudioFilingView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.npcFilingChapterId, new object[] { typeof(StudioView).FullName, this.viewData });
         }
         private void UpdateRedDot()
         {