Browse Source

抽卡活动池替换资源

zhaoyang 2 years ago
parent
commit
eefaec1c27

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

@@ -11,17 +11,18 @@
       <Button icon="ui://drx9d1usvek8t"/>
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     </component>
     <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
     <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="891,288" size="147,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
+    <text id="n35_njmn" name="txtOwned" xy="891,289" size="147,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
     </text>
     </text>
-    <group id="n36_njmn" name="n36" xy="854,177" size="226,147" advanced="true">
+    <group id="n36_njmn" name="n36" xy="854,177" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     </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">
+    <graph id="n39_dhoa" name="holder" xy="280,910" size="100,100"/>
+    <graph id="n40_dhoa" name="holder1" xy="869,1097" size="100,100"/>
+    <image id="n41_dhoa" name="n41" src="qi041j" fileName="images/cj_zizi_2.png" xy="390,548" group="n42_dhoa"/>
+    <image id="n43_mzf8" name="n43" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="674,703" group="n42_dhoa"/>
+    <text id="n38_dhoa" name="txtTime" xy="641,952" size="62,237" group="n42_dhoa" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
+    <group id="n42_dhoa" name="n42" xy="390,548" size="387,700" advanced="true">
       <relation target="" sidePair="middle-middle"/>
       <relation target="" sidePair="middle-middle"/>
     </group>
     </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">
     <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n31_njmn">
@@ -35,7 +36,7 @@
     <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n31_njmn">
     <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n31_njmn">
       <relation target="n29_njmn" sidePair="left-left,top-top"/>
       <relation target="n29_njmn" sidePair="left-left,top-top"/>
     </image>
     </image>
-    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="243,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" text="今日剩余次数:{v1=0}">
+    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="246,44" group="n31_njmn" font="ui://eg2y0ldpwonotj9" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数:{v1=0}">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </text>
     </text>
     <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">
     <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">

+ 2 - 2
FGUIProject/assets/LuckyBox/combox/ComBox_2.xml

@@ -11,10 +11,10 @@
       <Button icon="ui://drx9d1usvek8t"/>
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     </component>
     <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
     <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="891,288" size="147,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
+    <text id="n35_njmn" name="txtOwned" xy="891,289" size="147,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
     </text>
     </text>
-    <group id="n36_njmn" name="n36" xy="854,177" size="226,147" advanced="true">
+    <group id="n36_njmn" name="n36" xy="854,177" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     </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">
     <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n31_njmn">

+ 2 - 2
FGUIProject/assets/LuckyBox/combox/ComBox_3.xml

@@ -14,10 +14,10 @@
       <Button icon="ui://drx9d1usvek8t"/>
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     </component>
     <image id="n35_njmn" name="n35" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n37_njmn"/>
     <image id="n35_njmn" name="n35" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n37_njmn"/>
-    <text id="n36_njmn" name="txtOwned" xy="891,288" size="147,36" group="n37_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
+    <text id="n36_njmn" name="txtOwned" xy="891,289" size="147,36" group="n37_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
       <relation target="n35_njmn" sidePair="center-center,middle-middle"/>
       <relation target="n35_njmn" sidePair="center-center,middle-middle"/>
     </text>
     </text>
-    <group id="n37_njmn" name="n37" xy="854,177" size="226,147" visible="false" advanced="true">
+    <group id="n37_njmn" name="n37" xy="854,177" size="226,148" visible="false" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     </group>
     <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="301,1635" pivot="0.5,0" anchor="true" group="n31_njmn">
     <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="301,1635" pivot="0.5,0" anchor="true" group="n31_njmn">

+ 3 - 3
FGUIProject/assets/LuckyBox/components/Button3.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="94,95" extention="Button">
 <component size="94,95" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="c1" exported="true" pages="0,,1,,2,,3," selected="2"/>
+  <controller name="c1" exported="true" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
   <displayList>
     <loader id="n1_vek8" name="icon" xy="0,0" size="94,95" url="ui://drx9d1usvek8v" autoSize="true"/>
     <loader id="n1_vek8" name="icon" xy="0,0" size="94,95" url="ui://drx9d1usvek8v" autoSize="true"/>
     <movieclip id="n2_jpnf" name="n2" src="jpnf1x" fileName="effect/MovieClip1.jta" xy="-53,-11">
     <movieclip id="n2_jpnf" name="n2" src="jpnf1x" fileName="effect/MovieClip1.jta" xy="-53,-11">
-      <gearDisplay controller="c1" pages="3"/>
+      <gearDisplay controller="c1" pages="1,3"/>
     </movieclip>
     </movieclip>
     <movieclip id="n3_jpnf" name="n3" src="jpnf26" fileName="effect/MovieClip2.jta" xy="-53,-10">
     <movieclip id="n3_jpnf" name="n3" src="jpnf26" fileName="effect/MovieClip2.jta" xy="-53,-10">
-      <gearDisplay controller="c1" pages="1,2"/>
+      <gearDisplay controller="c1" pages="2"/>
     </movieclip>
     </movieclip>
   </displayList>
   </displayList>
   <Button/>
   <Button/>

+ 2 - 2
FGUIProject/assets/LuckyBox/components/ComCost.xml

@@ -2,7 +2,7 @@
 <component size="180,43" pivot="0.5,0.5" anchor="true">
 <component size="180,43" pivot="0.5,0.5" anchor="true">
   <displayList>
   <displayList>
     <image id="n28_vek8" name="n28" src="fka75" fileName="images/cj_dikuangtw.png" xy="17,4" size="159,34"/>
     <image id="n28_vek8" name="n28" src="fka75" fileName="images/cj_dikuangtw.png" xy="17,4" size="159,34"/>
-    <text id="n14_ga16" name="txtCost" xy="106,19" pivot="0.5,0.5" anchor="true" size="101,36" fontSize="26" color="#ffffff" align="center" vars="true" autoSize="none" text="1"/>
-    <loader id="n29_vek8" name="loaCost" xy="0,-6" pivot="0.5,0.5" size="54,54" url="ui://eg2y0ldpq08x6" autoSize="true"/>
+    <text id="n14_ga16" name="txtCost" xy="106,20" pivot="0.5,0.5" anchor="true" size="101,44" fontSize="32" color="#fff7d4" align="center" vars="true" autoSize="none" text="1"/>
+    <loader id="n29_vek8" name="loaCost" xy="-3,-9" pivot="0.5,0.5" size="60,60" url="ui://eg2y0ldpq08x6" autoSize="true"/>
   </displayList>
   </displayList>
 </component>
 </component>

BIN
FGUIProject/assets/LuckyBox/images/cj_zizi_3.png


+ 1 - 0
FGUIProject/assets/LuckyBox/package.xml

@@ -61,6 +61,7 @@
     <image id="v95q3a" name="kp_lanshan.jpg" path="/images/"/>
     <image id="v95q3a" name="kp_lanshan.jpg" path="/images/"/>
     <image id="v95q3b" name="hdkp_dj.png" path="/images/"/>
     <image id="v95q3b" name="hdkp_dj.png" path="/images/"/>
     <image id="dhoatab" name="cj_bj_2.png" path="/images/"/>
     <image id="dhoatab" name="cj_bj_2.png" path="/images/"/>
+    <image id="mzf8tac" name="cj_zizi_3.png" path="/images/"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -21,7 +21,7 @@ namespace GFGGame
 
 
         public int[] luckyBoxIds = new int[] { 1, 2, 3 };//奖池列表
         public int[] luckyBoxIds = new int[] { 1, 2, 3 };//奖池列表
         public long startTime = 1668873600000;
         public long startTime = 1668873600000;
-        public long endTime = 1674144000000;
+        public long endTime = 1672156799000;
 
 
 
 
         public int times = 0;
         public int times = 0;

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

@@ -382,7 +382,6 @@ namespace GFGGame
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
             {
             {
                 UpdateToCheckGuide(null);
                 UpdateToCheckGuide(null);
-                GRoot.inst.touchable = true;
             }
             }
             else
             else
             {
             {

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