zhaoyang 3 роки тому
батько
коміт
157dcb4953

+ 8 - 4
FGUIProject/assets/LuckyBox/combox/ComBox_1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://drx9d1usdhoatab" designImageOffsetY="-240">
   <displayList>
-    <loader id="n25_vek8" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1useshh1f" fill="scaleMatchWidth">
+    <loader id="n25_vek8" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1useshh1f" align="center" vAlign="middle" fill="scaleMatchHeight">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n32_njmn" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="862,177" group="n36_njmn" controller="c1,0">
@@ -17,6 +17,13 @@
     <group id="n36_njmn" name="n36" xy="854,177" size="226,147" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
+    <graph id="n39_dhoa" name="holder" xy="280,950" size="100,100"/>
+    <graph id="n40_dhoa" name="holder1" xy="869,1143" size="100,100"/>
+    <image id="n41_dhoa" name="n41" src="qi041j" fileName="images/cj_zizi_2.png" xy="390,545" group="n42_dhoa"/>
+    <text id="n38_dhoa" name="txtTime" xy="641,970" size="57,208" group="n42_dhoa" fontSize="40" color="#fffbdd" align="center" autoSize="height" text="剩余80天"/>
+    <group id="n42_dhoa" name="n42" xy="390,545" size="308,707" advanced="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
     <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n31_njmn">
       <relation target="" sidePair="left-left"/>
     </component>
@@ -34,9 +41,6 @@
     <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
-    <text id="n38_dhoa" name="txtTime" xy="641,970" size="57,208" fontSize="40" color="#fffbdd" align="center" autoSize="height" text="剩余80天">
-      <relation target="" sidePair="middle-middle"/>
-    </text>
   </displayList>
   <customProperty target="loaBg" propertyId="1"/>
 </component>

+ 9 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_1.cs

@@ -11,13 +11,15 @@ namespace UI.LuckyBox
         public UI_Button3 m_btnPreview;
         public UI_Button3 m_btnExchange;
         public GTextField m_txtOwned;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GTextField m_txtTime;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
         public UI_Button1 m_btnBuyOne;
         public UI_Button2 m_btnBuyTen;
         public GImage m_imgSpecial;
         public GTextField m_txtRemainTimes;
-        public GTextField m_txtTime;
         public const string URL = "ui://drx9d1usnjmn2p";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox_1";
@@ -69,13 +71,15 @@ namespace UI.LuckyBox
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
             m_btnBuyTen = (UI_Button2)UI_Button2.Create(comp.GetChild("btnBuyTen"));
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -85,6 +89,9 @@ namespace UI.LuckyBox
             m_btnExchange.Dispose();
             m_btnExchange = null;
             m_txtOwned = null;
+            m_holder = null;
+            m_holder1 = null;
+            m_txtTime = null;
             m_comCostOne.Dispose();
             m_comCostOne = null;
             m_comCostTen.Dispose();
@@ -95,7 +102,6 @@ namespace UI.LuckyBox
             m_btnBuyTen = null;
             m_imgSpecial = null;
             m_txtRemainTimes = null;
-            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -22,6 +22,11 @@ namespace GFGGame
         private GameObject _gameObject3;
         private GoWrapper _wrapper3;
 
+        private GameObject _gameObject4;
+        private GoWrapper _wrapper4;
+        private GameObject _gameObject5;
+        private GoWrapper _wrapper5;
+
         private bool isActiveBoxOpen = false;
         private int _bgIndex = 0;
         // private int _boxId = 0;
@@ -94,7 +99,7 @@ namespace GFGGame
                     boxId = (int)this.viewData;
                 }
             }
-            // _boxId = boxId;
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) boxId = LuckyBoxDataManager.BOX_ID_2;
             LuckyBoxDataManager.Instance.currentBoxId = boxId;
 
             isActiveBoxOpen = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1) >= 0;
@@ -181,6 +186,15 @@ namespace GFGGame
                 long curTime = TimeHelper.ServerNow();
                 TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
                 (obj as GComponent).GetChild("txtTime").asTextField.text = string.Format("剩余{0}{1}", num, str);
+                GGraph holder = (obj as GComponent).GetChild("holder").asGraph;
+                GGraph holder1 = (obj as GComponent).GetChild("holder1").asGraph;
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(201013);//羲和
+                string resPath1 = ResPathUtil.GetDressUpAnimationPath(suitCfg.picRes);
+                SceneController.AddObjectToView(_gameObject4, _wrapper4, holder, resPath1, out _gameObject4, out _wrapper4);
+
+                SuitCfg suitCfg1 = SuitCfgArray.Instance.GetCfg(201006);//常曦
+                string resPath2 = ResPathUtil.GetDressUpAnimationPath(suitCfg1.picRes);
+                SceneController.AddObjectToView(_gameObject5, _wrapper5, holder1, resPath2, out _gameObject5, out _wrapper5);
             }
         }
 

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes