先提交合并一次,主要提交自选礼包

FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -27,4 +27,5 @@
     <component id="n30_cu9w" name="btnSub" src="cu9wtme" fileName="components/BtnSub.xml" xy="348,845" group="n27_v5no"/>
     <group id="n27_v5no" name="n27" xy="73,766" size="816,161"/>
   </displayList>
+  <transition name="t0"/>
 </component>

FGUIProject/assets/EnduringGiftBox/EnduringGiftBoxGold.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,970"/>

FGUIProject/assets/EnduringGiftBox/EnduringGiftBoxPower.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1118">
+  <displayList>
+    <image id="n0_qqhz" name="n0" src="qqhze" fileName="images/diban.png" xy="23,261" group="n7_qqhz"/>
+    <image id="n1_qqhz" name="n1" src="qqhza" fileName="images/kaikou.png" xy="37,62" group="n7_qqhz"/>
+    <image id="n3_qqhz" name="n3" src="qqhz4" fileName="images/tape.png" xy="-1,577" group="n7_qqhz"/>
+    <image id="n6_qqhz" name="n6" src="qqhzb" fileName="images/heart.png" xy="208,57" group="n7_qqhz" rotation="-0.5"/>
+    <image id="n5_qqhz" name="n5" src="qqhz5" fileName="images/small_paper.png" xy="261,405" group="n7_qqhz"/>
+    <image id="n2_qqhz" name="n2" src="qqhz6" fileName="images/paper.png" xy="30,366" group="n7_qqhz"/>
+    <image id="n8_qqhz" name="n8" src="qqhzp" fileName="images/cz_tl_juese.png" xy="23,-27" group="n7_qqhz"/>
+    <text id="n9_qqhz" name="n9" xy="481,164" size="444,154" group="n7_qqhz" fontSize="32" color="#915e15" align="center" autoSize="none" text="是否花费20粉钻购买60体力？&#xA;体力每5分钟恢复1点&#xA;（今日剩余购买次数：8/8）"/>
+    <component id="n12_qqhz" name="btnCancel" src="qqhzs" fileName="components/BtnCancel.xml" xy="362,327" group="n7_qqhz"/>
+    <component id="n14_qqhz" name="btnSub" src="qqhzu" fileName="components/BtnSub.xml" xy="648,327" group="n7_qqhz"/>
+    <text id="n15_qqhz" name="n15" xy="151,434" size="753,48" group="n7_qqhz" fontSize="28" color="#a67975" autoSize="none" text="除了上述购买体力的途径，我们还提供了更多的优惠礼包选择"/>
+    <image id="n16_qqhz" name="n16" src="qqhzg" fileName="images/cz_lb_db.png" xy="69,475" group="n7_qqhz"/>
+    <group id="n7_qqhz" name="n7" xy="-1,-27" size="1080,1105"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnCancel.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="260,75" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qqhz" name="n0" src="qqhzn" fileName="images/cz_an_blue.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="取消"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnSub.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="260,75" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qqhz" name="n0" src="qqhzl" fileName="images/cz_an_pink.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="确定"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/EnduringGiftBox/package.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="bdi1qe15">
+  <resources>
+    <component id="qqhz0" name="EnduringGiftBoxGold.xml" path="/"/>
+    <component id="qqhz1" name="EnduringGiftBoxPower.xml" path="/"/>
+    <image id="qqhz2" name="back.png" path="/images/"/>
+    <image id="qqhz3" name="tb_zk.png" path="/images/"/>
+    <image id="qqhz4" name="tape.png" path="/images/"/>
+    <image id="qqhz5" name="small_paper.png" path="/images/"/>
+    <image id="qqhz6" name="paper.png" path="/images/"/>
+    <image id="qqhz7" name="mask.png" path="/images/"/>
+    <image id="qqhz8" name="lm_dt_tsdb_2.png" path="/images/"/>
+    <image id="qqhz9" name="line.png" path="/images/"/>
+    <image id="qqhza" name="kaikou.png" path="/images/"/>
+    <image id="qqhzb" name="heart.png" path="/images/"/>
+    <image id="qqhzc" name="fw.png" path="/images/"/>
+    <image id="qqhzd" name="text_kuang.png" path="/images/"/>
+    <image id="qqhze" name="diban.png" path="/images/"/>
+    <image id="qqhzf" name="cz_lbicon_db.png" path="/images/"/>
+    <image id="qqhzg" name="cz_lb_db.png" path="/images/"/>
+    <image id="qqhzh" name="cz_jb_juese.png" path="/images/"/>
+    <image id="qqhzi" name="cz_gmjd_db.png" path="/images/"/>
+    <image id="qqhzj" name="cz_db.png" path="/images/"/>
+    <image id="qqhzk" name="cz_an_yellow.png" path="/images/"/>
+    <image id="qqhzl" name="cz_an_pink.png" path="/images/"/>
+    <image id="qqhzm" name="cz_an_grey.png" path="/images/"/>
+    <image id="qqhzn" name="cz_an_blue.png" path="/images/"/>
+    <image id="qqhzo" name="ch_db_gy.png" path="/images/"/>
+    <image id="qqhzp" name="cz_tl_juese.png" path="/images/"/>
+    <image id="qqhzq" name="zsx_flower1.png" path="/images/"/>
+    <component id="qqhzs" name="BtnCancel.xml" path="/components/"/>
+    <component id="qqhzu" name="BtnSub.xml" path="/components/"/>
+  </resources>
+  <publish name=""/>
+</packageDescription>

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -37,7 +37,7 @@ namespace GFGGame
         {
             return "ui://CommonGame/" + res;
         }
-        //===================================¡ü¡ü¡üUI·¾¶¡ü¡ü¡ü================================
+        //===================================↑↑↑UI路径↑↑↑================================
         public static string GetIconPath(string res, string extName)
         {
             return $"{TEXTURE_DIR_PATH}/Icon/{res}.{extName}";