Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/ClothingShop/components/ShopListItemRender.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="250,321">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n22_hinb" name="n22" src="hinb19" fileName="images/fzd_diban_4.png" xy="9,16"/>
     <loader id="n24_hinb" name="rarity" xy="198,16" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n35_v95q" name="loaMainScore" xy="197,110" size="40,40" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n26_hinb" name="txtName" xy="25,214" size="200,49" font="ui://eg2y0ldpk1kha2" fontSize="36" color="#da8082" align="center" autoSize="none" text="名字">
+    <text id="n26_hinb" name="txtName" xy="87,214" pivot="0.5,0" size="76,49" font="ui://eg2y0ldpk1kha2" fontSize="36" color="#a88553" align="center" text="名字">
       <gearColor controller="c1" pages="0" values="#a88553,#000000" default="#da8082,#000000"/>
     </text>
     <loader id="n27_hinb" name="icon" xy="45,41" size="160,160" aspect="true" url="ui://e5hnfx8ahinb1a" fill="scale"/>
     <image id="n28_hinb" name="imgOwned" src="v95qtju" fileName="images/hc_yyy.png" pkg="eg2y0ldp" xy="5,175"/>
     <loader id="n31_ugdz" name="iconPrice" xy="18,288" size="32,32" group="n33_ugdz" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n32_ugdz" name="txtPrice" xy="61,279" size="171,46" group="n33_ugdz" fontSize="34" color="#916d35" ubb="true" autoClearText="true" text="99900099"/>
+    <text id="n32_ugdz" name="txtPrice" xy="61,279" size="159,46" group="n33_ugdz" fontSize="34" color="#916d35" ubb="true" autoClearText="true" text="99900099"/>
     <group id="n33_ugdz" name="n33" xy="18,279" size="214,46" advanced="true" layout="hz" colGap="11">
       <relation target="" sidePair="center-center"/>
     </group>

FGUIProject/assets/Launcher/LauncherUI.xml

@@ -13,18 +13,17 @@
     <text id="n9_v0op" name="txtDescRight" xy="90,1840" size="900,44" visible="false" fontSize="32" color="#ffffff" align="center" autoSize="none" strokeColor="#333333" autoClearText="true" text="1/1">
       <relation target="" sidePair=""/>
     </text>
-    <component id="n15_slyz" name="progressBar1" src="slyzt" fileName="components/ProgressBar2.xml" xy="40,1625" size="1000,26">
+    <component id="n15_slyz" name="progressBar1" src="slyzt" fileName="components/ProgressBar2.xml" xy="100,1625">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar value="100" max="100"/>
     </component>
-    <graph id="n18_slyz" name="holder" xy="-90,1622" size="10,10">
+    <graph id="n18_slyz" name="holder" xy="-52,1626" size="10,10">
       <relation target="n16_slyz" sidePair="right-right,top-top"/>
     </graph>
-    <image id="n16_slyz" name="imgAni" src="slyzp" fileName="images/dljm_chuan.png" xy="-70,1597">
+    <image id="n16_slyz" name="imgAni" src="pac9tjn" fileName="images/dljm_jdq_3.png" xy="100,1638" pivot="0.55,0.549" anchor="true">
       <relation target="n15_slyz" sidePair="bottom-bottom"/>
     </image>
-    <image id="n14_slyz" name="n14" src="slyzq" fileName="images/dljm_jdk.png" xy="210,1723" group="n17_slyz"/>
-    <text id="n3_l55o" name="txtDescLeft" xy="90,1722" size="900,44" group="n17_slyz" fontSize="25" color="#d8c584" align="center" autoSize="none" strokeColor="#333333" text="启动中...">
+    <text id="n3_l55o" name="txtDescLeft" xy="90,1722" size="900,44" group="n17_slyz" fontSize="32" color="#ffffff" align="center" autoSize="none" text="启动中...">
       <relation target="" sidePair=""/>
     </text>
     <group id="n17_slyz" name="n17" xy="90,1722" size="900,44" advanced="true">

FGUIProject/assets/Launcher/components/ProgressBar2.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1000,26" extention="ProgressBar">
+<component size="919,26" extention="ProgressBar">
   <displayList>
-    <image id="n0_slyz" name="n0" src="slyzr" fileName="images/dljm_jdq_1.png" xy="0,0" size="1000,26">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n1_slyz" name="bar" src="slyzo" fileName="images/dljm_jdq_2.png" xy="38,7" fillMethod="hz">
+    <image id="n0_slyz" name="n0" src="slyzr" fileName="images/dljm_jdq_1.png" xy="0,1"/>
+    <image id="n1_slyz" name="bar" src="slyzo" fileName="images/dljm_jdq_2.png" xy="4,4" fillMethod="hz">
       <relation target="" sidePair="width-width"/>
     </image>
+    <image id="n3_pac9" name="n3" src="pac9tjp" fileName="images/dljm_jdq_5.png" xy="-15,0"/>
+    <image id="n4_pac9" name="n4" src="pac9tjo" fileName="images/dljm_jdq_4.png" xy="-50,-80"/>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/Launcher/package.xml

@@ -6,14 +6,10 @@
     <image id="l55o4" name="p3_png.png" path="/images/"/>
     <component id="l55o5" name="ProgressBar1.xml" path="/components/"/>
     <image id="ul4p6" name="jz_tu.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
-    <image id="ul4p7" name="jz_bar_bg.png" path="/images/" scale="9grid" scale9grid="22,20,5,3"/>
-    <image id="ul4p8" name="jz_bar_r.png" path="/images/"/>
-    <image id="ul4p9" name="jz_bar.png" path="/images/" scale="9grid" scale9grid="8,4,16,8"/>
     <image id="lqt1a" name="LOGO.png" path="/imagesExport/" exported="true"/>
     <component id="k0v5b" name="LauncherAlertUI.xml" path="/" exported="true"/>
     <image id="k0v5f" name="ANNIU_1.png" path="/images/"/>
     <image id="k0v5g" name="ANNIU_2.png" path="/images/" scale="9grid" scale9grid="51,27,231,54"/>
-    <image id="k0v5h" name="di_1.png" path="/images/" scale="9grid" scale9grid="22,22,44,44" gridTile="16"/>
     <component id="k0v5i" name="Button1.xml" path="/components/"/>
     <component id="k0v5j" name="Button2.xml" path="/components/"/>
     <image id="wgy9k" name="hc_kuang_6.png" path="/images/" scale="9grid" scale9grid="49,57,16,10"/>
@@ -36,6 +32,9 @@
     <component id="dhoax" name="Button19.xml" path="/components/" exported="true"/>
     <image id="dhoay" name="anniuty.png" path="/images/" exported="true"/>
     <image id="dhoaz" name="anniuty3.png" path="/images/" exported="true"/>
+    <image id="pac9tjn" name="dljm_jdq_3.png" path="/images/"/>
+    <image id="pac9tjo" name="dljm_jdq_4.png" path="/images/"/>
+    <image id="pac9tjp" name="dljm_jdq_5.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Loading/LoadingView.xml

@@ -4,18 +4,15 @@
     <loader id="n9_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n3_hibu" name="progressBar1" src="hibu3" fileName="components/ProgressBar2.xml" xy="40,1626" size="1000,26">
+    <component id="n3_hibu" name="progressBar1" src="hibu3" fileName="components/ProgressBar2.xml" xy="100,1626">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar max="100"/>
     </component>
-    <graph id="n4_hibu" name="holder" xy="-90,1622" size="10,10">
-      <relation target="n5_hibu" sidePair="right-right,top-top"/>
-    </graph>
-    <image id="n5_hibu" name="imgAni" src="hibu6" fileName="images/dljm_chuan.png" xy="-70,1597">
+    <graph id="n4_hibu" name="holder" xy="-90,1622" size="10,10"/>
+    <image id="n10_pac9" name="imgAni" src="pac9a" fileName="images/dljm_jdq_3.png" xy="100,1638" pivot="0.55,0.549" anchor="true">
       <relation target="n3_hibu" sidePair="bottom-bottom"/>
     </image>
-    <image id="n6_hibu" name="n6" src="hibu7" fileName="images/dljm_jdk.png" xy="210,1723" group="n8_hibu"/>
-    <text id="n7_hibu" name="txtDescLeft" xy="90,1722" size="900,44" group="n8_hibu" fontSize="25" color="#d8c584" align="center" autoSize="none" text="启动中...">
+    <text id="n7_hibu" name="txtDescLeft" xy="90,1722" size="900,44" group="n8_hibu" fontSize="32" color="#585d76" align="center" autoSize="none" text="启动中...">
       <relation target="" sidePair=""/>
     </text>
     <group id="n8_hibu" name="n8" xy="90,1722" size="900,44" advanced="true">

FGUIProject/assets/Loading/components/ProgressBar2.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1000,26" extention="ProgressBar">
+<component size="919,26" extention="ProgressBar">
   <displayList>
-    <image id="n0_slyz" name="n0" src="hibu4" fileName="images/dljm_jdq_1.png" xy="0,0" size="1000,26">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n1_slyz" name="bar" src="hibu5" fileName="images/dljm_jdq_2.png" xy="38,7" fillMethod="hz">
+    <image id="n2_pac9" name="n2" src="hibu4" fileName="images/dljm_jdq_1.png" xy="0,1" group="n6_pac9"/>
+    <image id="n3_pac9" name="bar" src="hibu5" fileName="images/dljm_jdq_2.png" xy="4,4" group="n6_pac9" fillMethod="hz">
       <relation target="" sidePair="width-width"/>
     </image>
+    <image id="n4_pac9" name="n4" src="pac98" fileName="images/dljm_jdq_5.png" xy="-15,0" group="n6_pac9"/>
+    <image id="n5_pac9" name="n5" src="pac99" fileName="images/dljm_jdq_4.png" xy="-50,-80" group="n6_pac9"/>
+    <group id="n6_pac9" name="n6" xy="-50,-80" size="985,156"/>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/Loading/package.xml

@@ -7,6 +7,9 @@
     <image id="hibu5" name="dljm_jdq_2.png" path="/images/"/>
     <image id="hibu6" name="dljm_chuan.png" path="/images/"/>
     <image id="hibu7" name="dljm_jdk.png" path="/images/"/>
+    <image id="pac98" name="dljm_jdq_5.png" path="/images/"/>
+    <image id="pac99" name="dljm_jdq_4.png" path="/images/"/>
+    <image id="pac9a" name="dljm_jdq_3.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Loading" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/ChangeNameUI.xml

@@ -6,12 +6,12 @@
     <text id="n12_r9ri" name="n12" xy="387,87" size="186,61" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="修改昵称"/>
     <image id="n13_r9ri" name="n13" src="r9rix" fileName="images/xgnc_dik_2.png" xy="200,238"/>
     <text id="n10_xt5s" name="inputName" xy="217,248" size="526,56" fontSize="38" color="#ac8450" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]请输入新角色名称[/color]" maxLength="7"/>
-    <component id="n5_xt5s" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="338,490">
+    <component id="n5_xt5s" name="btnSure" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="338,490">
       <Button title="确定" titleColor="#ffffff" titleFontSize="42"/>
     </component>
-    <text id="n15_r9ri" name="txtNeed" xy="357,422" size="191,44" group="n17_v95q" fontSize="32" color="#b99f7b" text="改名卡：0/1"/>
-    <loader id="n16_r9ri" name="loaIcon" xy="561,411" size="60,60" group="n17_v95q" url="ui://eg2y0ldpkztethq" autoSize="true"/>
-    <group id="n17_v95q" name="n17" xy="357,411" size="264,60" advanced="true" layout="hz" colGap="13" excludeInvisibles="true">
+    <text id="n15_r9ri" name="txtNeed" xy="336,422" size="214,44" group="n17_v95q" fontSize="32" color="#b99f7b" text="改名消耗：0/1"/>
+    <loader id="n16_r9ri" name="loaIcon" xy="563,411" size="60,60" group="n17_v95q" url="ui://eg2y0ldpkztethq" autoSize="true"/>
+    <group id="n17_v95q" name="n17" xy="336,411" size="287,60" advanced="true" layout="hz" colGap="13" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

FGUIProject/assets/poem/componentsGallery/ListItem.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="500,900" overflow="hidden">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n15_r9ri" name="loaIcon" xy="4,2" pivot="0.5,0" size="492,820" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleMatchWidth"/>
-    <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,903">
+    <image id="n24_pac9" name="n24" src="pac9tjx" fileName="imagesGallery/hl_cjkuangdiban.png" xy="4,1" size="493,889" group="n23_pac9">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <loader id="n15_r9ri" name="loaIcon" xy="4,2" pivot="0.5,0" size="492,820" group="n23_pac9" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,903" group="n23_pac9">
       <relation target="n15_r9ri" sidePair="height-height"/>
     </image>
     <text id="n16_r9ri" name="txtName" xy="20,838" size="184,42" group="n22_r9ri" font="ui://eg2y0ldpweoktkb" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
@@ -12,9 +16,12 @@
     <component id="n20_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="386,842" size="32,33" group="n22_r9ri">
       <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
     </component>
-    <group id="n22_r9ri" name="n22" xy="20,838" size="398,42" advanced="true">
+    <group id="n22_r9ri" name="n22" xy="20,838" size="398,42" group="n23_pac9" advanced="true">
       <relation target="n15_r9ri" sidePair="top-bottom"/>
     </group>
+    <group id="n23_pac9" name="n23" xy="0,0" size="500,903" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
   </displayList>
   <relation target="n15_r9ri" sidePair="height-height"/>
 </component>

FGUIProject/assets/poem/package.xml

@@ -140,6 +140,7 @@
     <image id="ysx9tju" name="hl_hlzibt.png" path="/imagesPhoto/"/>
     <image id="ysx9tjv" name="xz_wss.png" path="/images/"/>
     <image id="weoktjw" name="xc_xqfs.png" path="/imagesPhoto/"/>
+    <image id="pac9tjx" name="hl_cjkuangdiban.png" path="/imagesGallery/" scale="9grid" scale9grid="123,177,246,354"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -14,7 +14,7 @@ namespace GFGEditor
         /// <summary>
         /// 存放临时excel表文件夹的的路径
         /// </summary>
-        public static string excelsCacheFolderPath = excelsFolderPath + "/ CacheConfig/";
+        public static string excelsCacheFolderPath = excelsFolderPath + "/CacheConfig/";
 
         /// <summary>
         /// 共享库中存放sqlite文件的的路径

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -19,7 +19,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckGiftBagApproach, CheckShopExchangeApproach, CheckClothingFosterApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckGiftBagApproach, CheckShopExchangeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             int suitPartTotalCount = 0;
             foreach (ItemCfg cfg in dataArray)
@@ -330,36 +330,6 @@ namespace GFGEditor
             return null;
         }
 
-        // /// <summary>
-        // /// 检测掉落表是否产出该物品
-        // /// </summary>
-        // /// <param name="itemId"></param>
-        // /// <returns></returns>
-        // private static bool CheckDropApproach(int itemId, int dropId)
-        // {
-        //     DropOutCfgArray manager = DropOutCfgArray.Instance;
-        //     List<DropOutCfg> dataArray = manager.GetCfgs(dropId);
-        //     for (int i = 0; i < dataArray.Count; i++)
-        //     {
-        //         if (dataArray[i].item == itemId)
-        //         {
-        //             return true;
-        //         }
-        //         if (manager.GetCfgs(dataArray[i].item).Count > 0)
-        //         {
-        //             if (dataArray[i].item == 11000003)
-        //             {
-        //                 ET.Log.Debug("");
-        //             }
-        //             if (CheckDropApproach(itemId, dataArray[i].item))
-        //             {
-        //                 return true;
-        //             }
-        //         }
-        //     }
-        //     return false;
-        // }
-
         private static bool CheckItemInBonus(int itemId, StoryLevelCfg cfg)
         {
             if (cfg.fightID.Length > 0)
@@ -509,6 +479,27 @@ namespace GFGEditor
             return null;
         }
 
+        /// <summary>
+        /// 检测每日任务是否产出该物品
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string CheckDailyTaskApproach(int itemId)
+        {
+            DailyActiveRewardCfgArray manager = DailyActiveRewardCfgArray.Instance;
+            DailyActiveRewardCfg[] dataArray = manager.dataArray;
+            for (int i = 0; i < dataArray.Length; i++)
+            {
+                for (int j = 0; j < dataArray[i].rewardsArr.Length; j++)
+                {
+                    if (dataArray[i].rewardsArr[j][0] == itemId)
+                    {
+                        return ConstFunctionId.DAILY_TASK;
+                    }
+                }
+            }
 
+            return null;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Constant/ConstFunctionId.cs

@@ -57,5 +57,10 @@ namespace GFGGame
         /// </summary>
         public const string MAIN_SECOND_VIEW = "MAIN_SECOND_VIEW";
 
+        /// <summary>
+        /// 每日任务
+        /// </summary>
+        public const string DAILY_TASK = "DAILY_TASK";
+
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListItem.cs

@@ -7,6 +7,7 @@ namespace UI.Poem
     public partial class UI_ListItem
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaIcon;
         public GTextField m_txtName;
         public GButton m_btnCollect;
@@ -58,6 +59,7 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnCollect = (GButton)comp.GetChild("btnCollect");
@@ -65,6 +67,7 @@ namespace UI.Poem
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaIcon = null;
             m_txtName = null;
             m_btnCollect = null;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs

@@ -170,7 +170,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    ViewManager.Show(ViewName.SUIT_PARTS_DETAIL_VIEW, suitId, new object[] { ViewName.SUIT_PARTS_DETAIL_VIEW, this.viewData });
+                    ViewManager.Show<SuitPartsDetailView>(suitId, new object[] { typeof(ClothingListView).FullName, this.viewData });
                 }
             });
 

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GoodsItemTipsController.cs

@@ -15,7 +15,7 @@ namespace GFGGame
             // }
             else
             {
-                // ViewManager.Show(ViewName.GOODS_ITEM_TIPS_VIEW, new object[] { id, sourceDatas });
+                //sourceDatas{物品id，gobackData，物品需求量}
                 ViewManager.Show<GoodsItemTipsView>(new object[] { id, sourceDatas });
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -56,7 +56,8 @@ namespace GFGGame
             }));
             _valueBar.m_btnTravel.onClick.Add(() =>
             {
-                GoodsItemTipsController.ShowItemTips(GlobalCfgArray.globalCfg.travelCostArr[0]);
+                object[] sourceDatas = new object[] { GlobalCfgArray.globalCfg.travelCostArr[0], new object[] { typeof(TravelView).FullName, null } };
+                GoodsItemTipsController.ShowItemTips(GlobalCfgArray.globalCfg.travelCostArr[0], sourceDatas);
             });
             _valueBar.m_btnGallery.onClick.Add(() =>
             {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -301,6 +301,9 @@ namespace GFGGame
                     // this.Hide();
                     isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
                     break;
+                case ConstFunctionId.DAILY_TASK:
+                    isJump = ViewManager.Show<DailyTaskView>(null, _fromeViewDatas);
+                    break;
             }
             if (isJump)
             {

GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

@@ -111,8 +111,8 @@ namespace GFGGame
             if (progress < oldValule)
             {
                 _ui.m_progressBar1.value = progress;
-                float posX = _ui.m_progressBar1.width * (progress / 100) - 70;
-                _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                float posX = _ui.m_progressBar1.width * (progress / 100) + _ui.m_progressBar1.x;
+                _ui.m_imgAni.x = Mathf.Min(posX, _ui.m_progressBar1.width + _ui.m_progressBar1.x);
                 callback?.Invoke();
             }
             else
@@ -120,8 +120,8 @@ namespace GFGGame
                 float duration = (float)(progress - oldValule) * SPEED;
                 GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
                 {
-                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) - 70;
-                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) + _ui.m_progressBar1.x;
+                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.m_progressBar1.width + _ui.m_progressBar1.x);
 
                 });
                 if (callback != null)

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -363,17 +363,16 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            this.Hide();
-
             Reset();
             ViewManager.GoBackFrom(ViewName.LUCKY_BOX_VIEW);
+
         }
 
         private void OnClickBtnHome()
         {
             GameController.GoBackToMainView();
-            // Reset();
         }
+
         private void Reset()
         {
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -122,6 +122,7 @@ namespace GFGGame
 
             EventAgent.AddEventListener(ConstMessage.GALLERY_DATA_CHANGE, UpdateGalleryList);
             EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH_ONE, UpdateGalleryList);
+            EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH_ONE, UpdateGalleryRankList);
         }
 
         protected override async void OnShown()
@@ -137,6 +138,7 @@ namespace GFGGame
 
                 UpdateList();
                 UpdateGalleryList();
+                UpdateGalleryRankList();
                 if (_tabIndex == TabType.RECOVER)
                 {
                     _ui.m_comNormal.m_c1.selectedIndex = _subtabIndex;
@@ -202,6 +204,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.GALLERY_DATA_CHANGE, UpdateGalleryList);
             EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH_ONE, UpdateGalleryList);
+            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH_ONE, UpdateGalleryRankList);
         }
 
         private void OnBtnBackClick()
@@ -330,7 +333,7 @@ namespace GFGGame
                 }
                 else if (_subtabIndex == RecommendType.RANK)
                 {
-                    _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
+                    _galleryDatas = PoemGalleryDataManager.Instance.RankDatas;
                 }
                 _list = _ui.m_comNormal.m_comScroll.m_listRecommend;
                 _list1 = _ui.m_comNormal.m_comScroll.m_listRecommend1;
@@ -440,6 +443,7 @@ namespace GFGGame
         }
         private void UpdateGalleryRankList()
         {
+            if (_tabIndex != TabType.RECOVER || _subtabIndex != RecommendType.RANK) return;
             _ui.m_comNormal.m_listRank.numItems = _galleryDatas.Count;
             UpdateView();
         }
@@ -478,7 +482,9 @@ namespace GFGGame
         {
             PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
             UI_ListItem item = UI_ListItem.Proxy(obj);
+            item.m_c1.selectedIndex = 0;
             if (data.Ntexture == null) return;
+            item.m_c1.selectedIndex = 1;
             item.m_loaIcon.texture = data.Ntexture;
             item.m_loaIcon.height = item.m_loaIcon.width * item.m_loaIcon.texture.height / item.m_loaIcon.texture.width;
             item.m_txtName.text = data.AuthorName;

GameClient/Assets/Game/Launcher/Views/LauncherView.cs

@@ -25,7 +25,7 @@ namespace GFGGame
         private UI_LauncherUI _ui;
         private GameObject _gameObject;
         private GoWrapper _wrapper;
-
+        private string[] resNames = { "11", "33" };
         /// <summary>
         /// 每1%耗时，单位秒
         /// </summary>
@@ -80,7 +80,6 @@ namespace GFGGame
             _gameObject.transform.localScale = new Vector3(100, 100, 100);
             _wrapper = new GoWrapper(_gameObject);
             _ui.m_holder.SetNativeObject(_wrapper);
-
         }
 
         /// <summary>
@@ -136,8 +135,8 @@ namespace GFGGame
             if (progress < oldValule)
             {
                 _ui.m_progressBar1.value = progress;
-                float posX = _ui.m_progressBar1.width * (progress / 100) - 70;
-                _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                float posX = _ui.m_progressBar1.width * (progress / 100) + _ui.m_progressBar1.x;
+                _ui.m_imgAni.x = Mathf.Min(posX, _ui.m_progressBar1.width + _ui.m_progressBar1.x);
                 callback?.Invoke();
             }
             else
@@ -146,8 +145,8 @@ namespace GFGGame
                 float duration = (float)(progress - oldValule) * SPEED;
                 GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
                 {
-                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) - 70;
-                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) + _ui.m_progressBar1.x;
+                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.m_progressBar1.width + _ui.m_progressBar1.x);
 
                 });
                 if (callback != null)