Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

FGUIProject/assets/Card/components/ComSkill.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="170,170" mask="n75_rhha">
   <displayList>
-    <loader id="n78_rhha" name="loaSkill" xy="-35,-84" size="234,432" url="ui://7l6lvkaywg7t94" autoSize="true">
+    <loader id="n78_rhha" name="loaSkill" xy="-32,-61" size="234,432" url="ui://7l6lvkaywg7t94" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <image id="n75_rhha" name="n75" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="3,3">

FGUIProject/assets/Card/components/ComStarConsume.xml

@@ -7,7 +7,7 @@
     </loader>
     <image id="n33_842s" name="n33" src="842s6f" fileName="images/kp_dikuang_4.png" xy="20,146" size="135,30"/>
     <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" pkg="eg2y0ldp" xy="124,136"/>
-    <text id="n39_a713" name="txtHasCount" xy="46,144" size="34,34" group="n42_94m1" fontSize="24" color="#fdf3d7" text="12"/>
+    <text id="n39_a713" name="txtHasCount" xy="46,144" size="34,34" group="n42_94m1" fontSize="24" color="#fdf3d7" ubb="true" text="12"/>
     <text id="n41_wr9a" name="n41" xy="76,144" size="18,34" group="n42_94m1" fontSize="24" color="#fff8ea" text="/"/>
     <text id="n38_a713" name="txtNeedCount" xy="90,144" size="34,34" group="n42_94m1" fontSize="24" color="#fdf3d7" ubb="true" text="66"/>
     <group id="n42_94m1" name="n42" xy="46,144" size="78,34" advanced="true" layout="hz" colGap="-4" excludeInvisibles="true">

FGUIProject/assets/Card/components/ListSkillItem.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n74_rhha" name="n74" src="wr9a7q" fileName="images/kp_jndik_1.png" xy="0,0" size="928,181"/>
     <component id="n75_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="48,16" size="165,165" scale="0.91,0.91"/>
-    <image id="n79_rhha" name="n79" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="40,8"/>
+    <image id="n79_rhha" name="n79" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="41,9"/>
     <image id="n77_rhha" name="n77" src="wr9a7o" fileName="images/kp_dengj_1.png" xy="124,139"/>
     <component id="n76_rhha" name="btnUp" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="659,55" size="230,70">
       <Button title="升级"/>

FGUIProject/assets/CommonGame/DressUpItemTips.xml

@@ -5,7 +5,7 @@
     <text id="n1_d4iw" name="txtName" xy="298,43" size="340,64" fontSize="48" color="#9b7853" align="center" autoClearText="true" text="物品名字几个字">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n3_d4iw" name="txtOwned" xy="394,586" size="148,44" fontSize="32" color="#f29295" vars="true" autoSize="none" text="已拥有:{count=0}"/>
+    <text id="n3_d4iw" name="txtOwned" xy="403,586" pivot="0.5,0" size="130,44" fontSize="32" color="#f29295" vars="true" text="已拥有:{count=0}"/>
     <image id="n4_d4iw" name="n4" src="s2cc4h" fileName="imagesExport/zx_tsk_xian.png" xy="44,124"/>
     <text id="n5_d4iw" name="txtDesc" xy="60,167" size="815,133" fontSize="34" color="#a99881" ubb="true" autoSize="none" autoClearText="true" text="这是一个物品。"/>
     <image id="n7_d4iw" name="n7" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="94,420" size="50,50"/>

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -4,7 +4,7 @@
     <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,668"/>
     <text id="n1_s2cc" name="txtName" xy="332,74" size="186,61" fontSize="46" color="#8d754e" autoClearText="true" text="物品名字"/>
     <component id="n2_s2cc" name="goodsItem" src="j48o98" fileName="components/ComItem.xml" xy="58,58" size="216,199"/>
-    <text id="n3_s2cc" name="txtOwned" xy="338,168" size="148,46" fontSize="34" color="#a38e66" vars="true" autoSize="none" text="已拥有:{count=0}"/>
+    <text id="n3_s2cc" name="txtOwned" xy="338,168" size="136,46" fontSize="34" color="#a38e66" vars="true" text="已拥有:{count=0}"/>
     <image id="n4_s2cc" name="n4" src="s2cc4h" fileName="imagesExport/zx_tsk_xian.png" xy="44,309"/>
     <text id="n5_s2cc" name="txtDesc" xy="60,352" size="815,133" fontSize="34" color="#9f8e70" ubb="true" autoSize="height" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
   </displayList>

FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -5,6 +5,7 @@
     <loader id="n12_ehs9" name="loaIcon" xy="112,96" pivot="0.5,0.5" anchor="true" size="150,150" group="n21_qr4e" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
     <text id="n14_ehs9" name="txtName" xy="111,194" pivot="0.5,0" anchor="true" size="228,44" group="n21_qr4e" fontSize="32" color="#9b7f61" text="赵钱孙李·巴拉"/>
     <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="23,80" group="n21_qr4e"/>
+    <image id="n22_cs8j" name="imgNotGot" src="cs8jthx" fileName="images/yx_whd.png" xy="21,83" group="n21_qr4e"/>
     <text id="n17_j48o" name="txtHasCount" xy="112,243" pivot="0.5,0" anchor="true" size="105,36" group="n21_qr4e" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <loader id="n18_j48o" name="loaRarity" xy="164,0" size="44,94" group="n21_qr4e" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n19_tc53" name="loaShouTongReward" xy="32,81" size="160,40" group="n21_qr4e" url="ui://eg2y0ldptc539z" autoSize="true"/>

FGUIProject/assets/CommonGame/package.xml

@@ -196,6 +196,8 @@
     <image id="qr4etht" name="wpzs_anniu_2.png" path="/imagesExport/" exported="true"/>
     <image id="qr4ethu" name="tjtj_bjbj.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
     <image id="a97wthv" name="huoyuedu.png" path="/imagesExport/" exported="true"/>
+    <image id="cs8jthw" name="yx_wilq.png" path="/images/"/>
+    <image id="cs8jthx" name="yx_whd.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/FieldGuide/SuitPartsDetailUI.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="912,834">
+<component size="936,783">
   <displayList>
-    <loader id="n0_pjip" name="bg" xy="0,0" size="912,834" url="ui://mk0fwx0xq08x4" fill="scaleFree">
+    <loader id="n0_pjip" name="bg" xy="0,0" size="936,783" url="ui://mk0fwx0xlwri5u" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_pjip" name="n1" src="ga16f" fileName="imagesExport/zx_jq_djdikbti.png" pkg="eg2y0ldp" xy="9,8"/>
-    <text id="n2_pjip" name="txtTitle" xy="93,22" size="726,56" fontSize="42" color="#ffffff" align="center" autoSize="none" text="套装详情"/>
-    <list id="n3_pjip" name="listParts" xy="44,125" size="841,664" layout="flow_hz" overflow="scroll" colGap="22" defaultItem="ui://vqq9h9h4pjip19" autoClearItems="true">
+    <image id="n4_cs8j" name="n4" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="230,32"/>
+    <text id="n2_pjip" name="txtTitle" xy="104,36" size="726,72" fontSize="54" color="#8f6e30" align="center" autoSize="none" text="套装详情"/>
+    <list id="n3_pjip" name="listParts" xy="24,179" size="887,540" layout="flow_hz" overflow="scroll" lineGap="-30" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -15,5 +15,4 @@
       <item/>
     </list>
   </displayList>
-  <relation target="n3_pjip" sidePair="height-height"/>
 </component>

FGUIProject/assets/LuckyBox/package.xml

@@ -51,6 +51,8 @@
     <image id="qr4e27" name="wpzs_anniu_1.png" path="/images/"/>
     <image id="qr4e28" name="wpzs_bji.png" path="/images/"/>
     <image id="qr4e29" name="wpzs_yhd.png" path="/images/"/>
+    <image id="cs8j2a" name="cj_bj_6.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
+    <image id="cs8j2b" name="cj_bj_5.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml

@@ -5,33 +5,34 @@
     <image id="n0_10not" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,695"/>
     <image id="n18_iftf" name="n18" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="230,32"/>
     <text id="n1_10not" name="txtName" xy="354,31" pivot="0.5,0" size="228,74" fontSize="56" color="#8f6e30" text="礼包礼包"/>
-    <loader id="n2_10not" name="loaIcon" xy="137,273" pivot="0.5,0.5" size="50,50" autoSize="true"/>
-    <text id="n3_10not" name="txtLimit" xy="45,420" pivot="0.5,0" size="251,46" fontSize="34" color="#a3926c" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（0/1）"/>
-    <list id="n4_10not" name="list" xy="234,212" size="691,197" layout="row" overflow="hidden" colGap="10" defaultItem="ui://eg2y0ldpj48o98" align="center">
+    <loader id="n2_10not" name="loaIcon" xy="44,159" pivot="0.5,0.5" size="250,250" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
+    <text id="n3_10not" name="txtLimit" xy="100,420" pivot="0.5,0" size="132,46" fontSize="34" color="#a3926c" align="center" leading="-5" letterSpacing="-2" ubb="true" text="永久限购"/>
+    <list id="n4_10not" name="list" xy="296,212" size="632,197" layout="row" overflow="scroll" scroll="horizontal" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" align="center">
+      <item/>
       <item/>
       <item/>
     </list>
     <image id="n5_10not" name="n5" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="729,107" group="n7_10not"/>
     <text id="n6_10not" name="txtEndTime" xy="756,105" pivot="0.5,0" size="94,41" group="n7_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
     <group id="n7_10not" name="grpEndTime" xy="729,105" size="155,42" advanced="true"/>
-    <loader id="n8_10not" name="loaPriceIcon" xy="379,507" size="60,60" group="n10_10not" visible="false" url="ui://vlgobc1510not1w" fill="scale"/>
-    <text id="n9_10not" name="txtIcon" xy="379,506" size="50,61" group="n10_10not" fontSize="46" color="#a17d5f" text="￥"/>
-    <group id="n10_10not" name="grpIcon" xy="379,506" size="50,61" group="n15_10not" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n11_10not" name="txtOriginalPrice" xy="460,506" pivot="0.5,0" size="32,61" group="n13_10not" fontSize="46" color="#caa293" align="center" text="4"/>
-    <image id="n12_10not" name="n12" src="dmsi1m" fileName="images/sc_tc_xian_1.png" xy="459,539" pivot="0.5,0" size="35,2" group="n13_10not">
-      <relation target="n11_10not" sidePair="width-width"/>
-    </image>
-    <group id="n13_10not" name="grpOriginalPrice" xy="459,506" size="35,61" group="n15_10not" advanced="true"/>
-    <text id="n14_10not" name="txtPrice" xy="524,506" size="32,61" group="n15_10not" fontSize="46" color="#a17d5f" align="center" text="5"/>
-    <group id="n15_10not" name="grpPrice" xy="379,506" size="177,61" advanced="true" layout="hz" colGap="30" excludeInvisibles="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="center-center"/>
-    </group>
     <component id="n16_10not" name="btnBuy" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,566">
       <gearDisplay controller="c1" pages="0"/>
     </component>
     <text id="n17_oeuo" name="txtLock" xy="316,540" pivot="0.5,0" size="304,64" fontSize="48" color="#aa946b" text="通关2-10解锁">
       <gearDisplay controller="c1" pages="1"/>
     </text>
+    <loader id="n8_10not" name="loaPriceIcon" xy="322,507" size="60,60" group="n10_10not" visible="false" url="ui://vlgobc1510not1w" fill="scale"/>
+    <text id="n9_10not" name="txtIcon" xy="322,506" size="50,61" group="n10_10not" fontSize="46" color="#a17d5f" text="￥"/>
+    <group id="n10_10not" name="grpIcon" xy="322,506" size="50,61" group="n19_cs8j" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="n11_10not" sidePair="right-left"/>
+    </group>
+    <text id="n11_10not" name="txtOriginalPrice" xy="403,506" pivot="0.5,0" size="89,62" group="n19_cs8j" fontSize="46" color="#caa293" align="center" text="400"/>
+    <image id="n12_10not" name="n12" src="dmsi1m" fileName="images/sc_tc_xian_1.png" xy="402,539" pivot="0.5,0" size="92,2" group="n19_cs8j">
+      <relation target="n11_10not" sidePair="width-width,center-center"/>
+    </image>
+    <text id="n14_10not" name="txtPrice" xy="524,506" size="89,62" group="n19_cs8j" fontSize="46" color="#a17d5f" align="center" text="500">
+      <relation target="n11_10not" sidePair="left-right"/>
+    </text>
+    <group id="n19_cs8j" name="grpOriginalPrice" xy="322,506" size="291,62" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/RechargeStore/components/ListGiftItem.xml

@@ -4,11 +4,11 @@
   <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n22_10not" name="n22" src="dmsi1k" fileName="images/sc_kuangdikjia_2.png" xy="0,0"/>
-    <loader id="n23_10not" name="icon" xy="45,170" size="162,162" url="ui://vlgobc15d4iwl"/>
-    <text id="n27_10not" name="txtName" xy="346,135" pivot="0.5,0" anchor="true" size="85,56" fontSize="42" color="#906d4b" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
     <image id="n24_10not" name="n24" src="dmsi1j" fileName="images/sc_kuangczcz.png" xy="2,98" group="n26_10not"/>
     <text id="n25_10not" name="txtDesc" xy="31,121" size="69,81" group="n26_10not" font="ui://eg2y0ldpk1kha2" fontSize="34" color="#ffe5cf" align="center" leading="-5" letterSpacing="-2" vars="true" text="超值&#xA;{count=250}%"/>
     <group id="n26_10not" name="grpDiscount" xy="2,98" size="128,132" advanced="true"/>
+    <loader id="n23_10not" name="icon" xy="56,186" size="140,140" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
+    <text id="n27_10not" name="txtName" xy="346,135" pivot="0.5,0" anchor="true" size="85,56" fontSize="42" color="#906d4b" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
     <image id="n28_10not" name="n28" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="269,232" group="n30_10not"/>
     <text id="n29_10not" name="txtEndTime" xy="298,230" pivot="0.5,0" size="94,41" group="n30_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
     <group id="n30_10not" name="grpEndTime" xy="269,230" size="155,42" advanced="true">

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -122,9 +122,9 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在导入背景图", 1);
             ImportRes(BgSrcPaths, BgTargetPath, BgMd5FileSaveName);
 
-            //卡牌背景
-            EditorUtility.DisplayProgressBar("进度", "正在导入卡牌背景", 1);
-            ImportRes(CardBgSrcPaths, CardBgTargetPath, CardBgMd5FileSaveName);
+            // //卡牌背景
+            // EditorUtility.DisplayProgressBar("进度", "正在导入卡牌背景", 1);
+            // ImportRes(CardBgSrcPaths, CardBgTargetPath, CardBgMd5FileSaveName);
             //卡牌icon
             EditorUtility.DisplayProgressBar("进度", "正在导入卡牌图标", 1);
             ImportRes(CardIconSrcPaths, CardIconTargetPath, CardMd5FileSaveName);

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

@@ -320,6 +320,10 @@ namespace GFGEditor
                 a.AddRange(storyFightCfg.bonusBaseArr);
                 int[][] bonus = a.ToArray();
                 bool result = CheckItemInBonus(itemId, bonus);
+                if (itemId == 100095)
+                {
+                    Debug.Log("zoya");
+                }
                 if (result)
                 {
                     return true;
@@ -353,9 +357,20 @@ namespace GFGEditor
                 List<DropOutCfg> aList = manager.GetCfgs(dropId);
                 foreach (DropOutCfg dropOutCfg in aList)
                 {
-                    if (itemId == dropOutCfg.item)
+                    if (manager.GetCfgs(dropOutCfg.item).Count > 0)
+                    {
+                        int[] _dropIds = { dropOutCfg.item };
+                        if (CheckItemInDropOut(itemId, _dropIds))
+                        {
+                            return true;
+                        }
+                    }
+                    else
                     {
-                        return true;
+                        if (itemId == dropOutCfg.item)
+                        {
+                            return true;
+                        }
                     }
                 }
             }

GameClient/Assets/Editor/FileUtil.cs

@@ -365,7 +365,7 @@ namespace GFGEditor
                 foreach (var lDir in localDirs)
                 {
                     string lDirName = Path.GetFileName(lDir);
-
+                    if (lDirName == "Card") continue;
                     bool needDelete = false;
                     foreach (var sDir in souDirs)
                     {

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

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UI.Common;
 using System;
+using static GFGGame.LauncherConfig;
 
 namespace GFGGame
 {
@@ -20,10 +21,15 @@ namespace GFGGame
 
         public void Init()
         {
+
             msgDic.Add(_all, new List<string>());
             msgDic.Add(_error, new List<string>());
             msgDic.Add(_log, new List<string>());
-            this.CreatBtnLog();
+            if (LauncherConfig.netType == EnumNetType.LOCAL)
+            {
+                this.CreatBtnLog();
+            }
+
             this.AddMsgListener();
         }
         public void AddMsgListener()
@@ -63,7 +69,10 @@ namespace GFGGame
 
                     _btnLog.m_c1.selectedIndex = 1;
                     _btnLog.target.alpha = 1;
-                    this.SetBtnLogVisable(true);
+                    if (LauncherConfig.netType == EnumNetType.LOCAL)
+                    {
+                        this.SetBtnLogVisable(true);
+                    }
                     break;
                 case LogType.Log:
                     if (msgDic[_all].Count == _maxCount)

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

@@ -156,14 +156,22 @@ namespace GFGGame
                 if (StorageDataManager.Instance.GetStorageValue(ConstStorageId.FUNCTION_OPEN + cfg.index) == 1) return true;
 
                 List<int> _currentList3 = DressUpMenuSuitDataManager.GetSuitIDList();
-                if (_currentList3.Count == 0) return false;
+                if (_currentList3.Count == 0)
+                {
+                    if (showTips) PromptController.Instance.ShowFloatTextPrompt(string.Format("收集一套“天衣”套装后解锁"));
+                    return false;
+                }
                 _currentList3 = SuitUtil.SortSuitListByHighRarity(_currentList3);
                 if (SuitCfgArray.Instance.GetCfg(_currentList3[0]).rarity == ConstDressRarity.Rarity_TIANYI)
                 {
                     StorageSProxy.ReqSetClientValue(ConstStorageId.FUNCTION_OPEN + cfg.index, 1).Coroutine();
                     return true;
                 }
-                if (showTips) PromptController.Instance.ShowFloatTextPrompt(string.Format("收集一套“天衣”套装后开启"));
+                else
+                {
+                    if (showTips) PromptController.Instance.ShowFloatTextPrompt(string.Format("收集一套“天衣”套装后解锁"));
+                }
+
             }
             return false;
 

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

@@ -133,7 +133,7 @@ namespace GFGGame
             else
             {
                 int needNum = costNum - hasNum;
-                ItemExchangeCfgArray.Instance.GetMoneyIdAndNum(costId, ItemDataManager.GetItemExchangeTimes(costId), needNum, out int costItemId, out int costItemNeedNum, out int buyNum);
+                ItemExchangeCfgArray.Instance.GetMoneyIdAndNum(costId, ItemDataManager.GetItemExchangeTimes(costId), times, out int costItemId, out int costItemNeedNum, out int buyNum);
                 int costHasNum = ItemDataManager.GetItemNum(costItemId);
                 if (costHasNum >= costItemNeedNum)//购买消耗品的道具足够，提示购买
                 {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs

@@ -10,6 +10,7 @@ namespace UI.CommonGame
         public GLoader m_loaIcon;
         public GTextField m_txtName;
         public GImage m_imgGot;
+        public GImage m_imgNotGot;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
         public GLoader m_loaShouTongReward;
@@ -65,6 +66,7 @@ namespace UI.CommonGame
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_imgGot = (GImage)comp.GetChild("imgGot");
+            m_imgNotGot = (GImage)comp.GetChild("imgNotGot");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaShouTongReward = (GLoader)comp.GetChild("loaShouTongReward");
@@ -76,6 +78,7 @@ namespace UI.CommonGame
             m_loaIcon = null;
             m_txtName = null;
             m_imgGot = null;
+            m_imgNotGot = null;
             m_txtHasCount = null;
             m_loaRarity = null;
             m_loaShouTongReward = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListSuitPartsItem.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.FieldGuide
-{
-    public partial class UI_ListSuitPartsItem
-    {
-        public GComponent target;
-        public GLoader m_icon;
-        public GTextField m_txtName;
-        public GImage m_imgLockBg;
-        public GImage m_imgLock;
-        public const string URL = "ui://vqq9h9h4pjip19";
-        public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "ListSuitPartsItem";
-        private static UI_ListSuitPartsItem _proxy;
-
-        public static UI_ListSuitPartsItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListSuitPartsItem();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ListSuitPartsItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListSuitPartsItem();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_icon = null;
-            m_txtName = null;
-            m_imgLockBg = null;
-            m_imgLock = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListSuitPartsItem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0c1a8144199dcdb4a97fb8e32be1a88d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_GiftBagBuyUI.cs

@@ -15,15 +15,14 @@ namespace UI.RechargeStore
         public GList m_list;
         public GTextField m_txtEndTime;
         public GGroup m_grpEndTime;
+        public GButton m_btnBuy;
+        public GTextField m_txtLock;
         public GLoader m_loaPriceIcon;
         public GTextField m_txtIcon;
         public GGroup m_grpIcon;
         public GTextField m_txtOriginalPrice;
-        public GGroup m_grpOriginalPrice;
         public GTextField m_txtPrice;
-        public GGroup m_grpPrice;
-        public GButton m_btnBuy;
-        public GTextField m_txtLock;
+        public GGroup m_grpOriginalPrice;
         public const string URL = "ui://vlgobc1510not1v";
         public const string PACKAGE_NAME = "RechargeStore";
         public const string RES_NAME = "GiftBagBuyUI";
@@ -79,15 +78,14 @@ namespace UI.RechargeStore
             m_list = (GList)comp.GetChild("list");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
             m_grpEndTime = (GGroup)comp.GetChild("grpEndTime");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
             m_loaPriceIcon = (GLoader)comp.GetChild("loaPriceIcon");
             m_txtIcon = (GTextField)comp.GetChild("txtIcon");
             m_grpIcon = (GGroup)comp.GetChild("grpIcon");
             m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
-            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
             m_txtPrice = (GTextField)comp.GetChild("txtPrice");
-            m_grpPrice = (GGroup)comp.GetChild("grpPrice");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -99,15 +97,14 @@ namespace UI.RechargeStore
             m_list = null;
             m_txtEndTime = null;
             m_grpEndTime = null;
+            m_btnBuy = null;
+            m_txtLock = null;
             m_loaPriceIcon = null;
             m_txtIcon = null;
             m_grpIcon = null;
             m_txtOriginalPrice = null;
-            m_grpOriginalPrice = null;
             m_txtPrice = null;
-            m_grpPrice = null;
-            m_btnBuy = null;
-            m_txtLock = null;
+            m_grpOriginalPrice = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ListGiftItem.cs

@@ -9,10 +9,10 @@ namespace UI.RechargeStore
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
-        public GLoader m_icon;
-        public GTextField m_txtName;
         public GTextField m_txtDesc;
         public GGroup m_grpDiscount;
+        public GLoader m_icon;
+        public GTextField m_txtName;
         public GTextField m_txtEndTime;
         public GGroup m_grpEndTime;
         public GTextField m_txtLimit;
@@ -73,10 +73,10 @@ namespace UI.RechargeStore
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
             m_grpEndTime = (GGroup)comp.GetChild("grpEndTime");
             m_txtLimit = (GTextField)comp.GetChild("txtLimit");
@@ -93,10 +93,10 @@ namespace UI.RechargeStore
         {
             m_c1 = null;
             m_c2 = null;
-            m_icon = null;
-            m_txtName = null;
             m_txtDesc = null;
             m_grpDiscount = null;
+            m_icon = null;
+            m_txtName = null;
             m_txtEndTime = null;
             m_grpEndTime = null;
             m_txtLimit = null;

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -163,12 +163,12 @@ namespace GFGGame
                 _cardObj = null;
             }
             string resPath = ResPathUtil.GetCardAnimationPath(_cardData.resources[_cardData.resIndex]);
-            if (Versions.Contains(resPath))
-            {
-                _cardObj = DressUpUtil.AddAnimationObj(resPath);
-                SceneController.AddObjectToView(_cardObj, _wrapper, _ui.m_comCard.m_comCardHolder.m_holder, resPath, out _cardObj, out _wrapper);
+            // if (Versions.Contains(resPath))
+            // {
+            _cardObj = DressUpUtil.AddAnimationObj(resPath);
+            SceneController.AddObjectToView(_cardObj, _wrapper, _ui.m_comCard.m_comCardHolder.m_holder, resPath, out _cardObj, out _wrapper);
 
-            }
+            // }
 
             if (_cardObj != null)
             {
@@ -513,8 +513,8 @@ namespace GFGGame
 
             int needCount = cardStarCfg.materiarsArr[index][1];
             int hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
-            listItem.m_txtNeedCount.text = StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#FDF3D7" : "#D27869"); ;
-            listItem.m_txtHasCount.text = hasCount.ToString();
+            listItem.m_txtNeedCount.text = needCount.ToString();// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
+            listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); //;  hasCount.ToString();
             listItem.m_btnPlus.visible = false;
             if (listItem.m_btnPlus.data == null)
             {

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

@@ -10,6 +10,7 @@ namespace GFGGame
         private GTextField _txtCount;
         private GTextField _txtHasCount;
         private GImage _imgGot;
+        private GImage _imgNotGot;
         private GLoader _loaShouTongRewardVisble;
         private GGroup _grpCount;
 
@@ -24,6 +25,7 @@ namespace GFGGame
             _txtCount = obj.GetChild("txtCount") as GTextField;
             _txtHasCount = obj.GetChild("txtHasCount") as GTextField;
             _imgGot = obj.GetChild("imgGot") as GImage;
+            _imgNotGot = obj.GetChild("imgNotGot") as GImage;
             _loaShouTongRewardVisble = obj.GetChild("loaShouTongReward") as GLoader;
             _grpCount = obj.GetChild("grpCount") as GGroup;
             AddClickListener();
@@ -49,6 +51,7 @@ namespace GFGGame
             _loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             RarityIconController.UpdateRarityIcon(_loaRarity, _itemData.id, false);
             _imgGot.visible = false;
+            _imgNotGot.visible = false;
             _loaShouTongRewardVisble.visible = false;
             _grpCount.visible = true;
             _showTips = true;
@@ -73,6 +76,21 @@ namespace GFGGame
                 _imgGot.visible = value;
             }
         }
+        /// <summary>
+        /// “未领取”显示状态
+        /// </summary>
+        /// <value></value>
+        public bool ImgNotGotVisible
+        {
+            get
+            {
+                return _imgNotGot.visible;
+            }
+            set
+            {
+                _imgNotGot.visible = value;
+            }
+        }
 
         /// <summary>
         /// "已拥有"显示状态

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs

@@ -24,7 +24,7 @@ namespace GFGGame
             this.viewCom.Center();
 
             _ui.m_listParts.itemRenderer = ListPartsItemRenderer;
-            _ui.m_listParts.onClickItem.Add(OnClickListPartsItem);
+            // _ui.m_listParts.onClickItem.Add(OnClickListPartsItem);
         }
 
         protected override void OnShown()
@@ -44,24 +44,18 @@ namespace GFGGame
             base.OnHide();
         }
 
-        private void ListPartsItemRenderer(int index, GObject item)
+        private void ListPartsItemRenderer(int index, GObject obj)
         {
-            UI_ListSuitPartsItem listItem = UI_ListSuitPartsItem.Proxy(item);
             int itemId = _items[index];
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            listItem.m_txtName.text = ItemUtil.GetItemName(itemId);
-            listItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            ItemData reward = ItemUtil.createItemData(itemId, 1);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
+            (obj.data as ItemView).TxtHasCountVisble = false;
             bool haveItem = DressUpMenuItemDataManager.CheckHasItem(itemId);
-            listItem.m_imgLock.visible = listItem.m_imgLockBg.visible = !haveItem;
-            listItem.target.data = itemId;
-            // listItem.target.onClick.Clear();
-            // listItem.target.onClick.Add(() =>
-            // {
-            //     if (haveItem)
-            //     {
-            //         GoodsItemTipsController.ShowItemTips(itemId);
-            //     }
-            // });
+            (obj.data as ItemView).ImgNotGotVisible = !haveItem;
         }
         private void OnClickListPartsItem(EventContext context)
         {

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

@@ -23,7 +23,7 @@ namespace GFGGame
         private GoWrapper _wrapper3;
 
         private bool isActiveBoxOpen = false;
-
+        private int bgIndex = 0;
 
         public override void Dispose()
         {
@@ -79,14 +79,18 @@ namespace GFGGame
             }
 
             LuckyBoxDataManager.Instance.currentBoxId = boxId;
+            Debug.Log("zoya0:" + LuckyBoxDataManager.Instance.currentBoxId);
             isActiveBoxOpen = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1) >= 0;
+            bgIndex = 0;
 
             int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
             _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Length;
             _ui.m_listBg.ScrollToView(index);
             _ui.m_listBg.scrollPane.decelerationRate = 0.8f;
-
-            Timers.inst.Add(1, 0, CheckTime);
+            if (isActiveBoxOpen)
+            {
+                Timers.inst.Add(1, 0, CheckTime);
+            }
 
             _valueBarController.OnShown();
             _valueBarController.Controller(4);
@@ -95,20 +99,25 @@ namespace GFGGame
             // UpdateNormal();
             OnListBgScroll();
             updateBoxEffect();
+            Timers.inst.Add(8, 0, UpdateBg);
         }
 
         private void RenderListBgItem(int index, GObject obj)
         {
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(obj);
-            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxIds[index]);
-            item.m_loaBg.url = string.Format("ui://LuckyBox/{0}", cfg.res);
+            int id = LuckyBoxDataManager.Instance.luckyBoxIds[index];
+            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(id);
+            item.m_loaBg.url = string.Format("ui://LuckyBox/{0}", cfg.resArr[0]);
+            item.target.data = id;
         }
         private void CheckTime(object param = null)
         {
             if (!isActiveBoxOpen)
             {
-                //活动未开启
+                //活动未开启                           
                 LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
+                Debug.Log("zoya1:" + LuckyBoxDataManager.Instance.currentBoxId);
+
                 Timers.inst.Remove(CheckTime);
                 return;
             }
@@ -121,7 +130,9 @@ namespace GFGGame
         private void OnListBgScroll()
         {
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(_ui.m_c1.selectedIndex));
-            LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_ui.m_c1.selectedIndex];
+            LuckyBoxDataManager.Instance.currentBoxId = (int)item.target.data;// LuckyBoxDataManager.Instance.luckyBoxIds[_ui.m_c1.selectedIndex];
+            Debug.Log("zoya2:" + LuckyBoxDataManager.Instance.currentBoxId);
+
             item.m_grpTime.visible = LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
             item.m_imgTitle.visible = LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
             item.m_holder.visible = isActiveBoxOpen && LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
@@ -215,7 +226,16 @@ namespace GFGGame
             });
         }
 
-
+        private void UpdateBg(object param)
+        {
+            int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
+            UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(index));
+            int id = (int)item.target.data;
+            string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(id).resArr;
+            bgIndex++;
+            if (bgIndex == resArr.Length) bgIndex = 0;
+            item.m_loaBg.url = string.Format("ui://LuckyBox/{0}", resArr[bgIndex]);
+        }
         protected override void OnHide()
         {
             base.OnHide();
@@ -224,6 +244,7 @@ namespace GFGGame
             Timers.inst.Remove(CheckTime);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateNormal);
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateNormal);
+            Timers.inst.Remove(UpdateBg);
         }
 
         private void OnClickBtnBack()
@@ -242,6 +263,8 @@ namespace GFGGame
         private void Reset()
         {
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.BOX_ID_1;
+            Debug.Log("zoya3:" + LuckyBoxDataManager.Instance.currentBoxId);
+
         }
         protected override void UpdateToCheckGuide(object param)
         {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -248,6 +248,8 @@ namespace GFGGame
             // list.Add("StudioView");
             // list.Add("XiuFangView");
             // ViewManager.Show<FunctionOpenView>(list);
+            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
+
             ViewManager.Show<DailyLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             //     isOpen = false;
             // });
@@ -300,7 +302,6 @@ namespace GFGGame
         }
         private void OnClickBtnHaoYou()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
 
             ViewManager.Show<FriendView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
         }
@@ -311,7 +312,7 @@ namespace GFGGame
         }
         private void OnClickBtnRenWu()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
+            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
 
             ViewManager.Show<DailyTaskView>();
         }

GameClient/Assets/Game/HotUpdate/Views/MainUI/RoleInfoView.cs

@@ -10,7 +10,7 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            if(_ui != null)
+            if (_ui != null)
             {
                 _ui.Dispose();
             }
@@ -33,10 +33,7 @@ namespace GFGGame
             _ui.m_btnSound.onClick.Add(OnClickBtnSound);
             _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
             _ui.m_btnHelp.onClick.Add(OnClickBtnHelp);
-            if(LauncherConfig.netType != EnumNetType.LOCAL)
-            {
-                _ui.m_btnHelp.visible = false;
-            }
+
         }
 
         protected override void OnShown()
@@ -45,7 +42,7 @@ namespace GFGGame
             _ui.m_txtRoleName.text = RoleDataManager.roleName;
             _ui.m_txtLvl.text = "" + GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
             RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
-            if(roleLevelCfg.exp > 0)
+            if (roleLevelCfg.exp > 0)
             {
                 _ui.m_proBarExp.value = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
                 _ui.m_proBarExp.max = roleLevelCfg.exp;
@@ -68,7 +65,8 @@ namespace GFGGame
         {
             Alert.Show("确认返回登录页吗？")
                 .SetLeftButton(true)
-                .SetRightButton(true, "确认", (object data) => {
+                .SetRightButton(true, "确认", (object data) =>
+                {
                     GameController.QuitToLoginView(false);
                 });
         }
@@ -77,7 +75,8 @@ namespace GFGGame
         {
             Alert.Show("确认注销当前账号吗？")
                 .SetLeftButton(true)
-                .SetRightButton(true, "确认", (object data) => {
+                .SetRightButton(true, "确认", (object data) =>
+                {
                     GameController.QuitToLoginView(true);
                 });
         }
@@ -96,7 +95,14 @@ namespace GFGGame
 
         private void OnClickBtnHelp()
         {
-            ViewManager.Show(ViewName.GM_PANEL_VIEW);
+            if (LauncherConfig.netType == EnumNetType.LOCAL)
+            {
+                ViewManager.Show(ViewName.GM_PANEL_VIEW);
+            }
+            else
+            {
+                ViewManager.Show(ViewName.LOG_VIEW);
+            }
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             _giftId = (int)this.viewData;
             GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(_giftId);
             _ui.m_txtName.text = cfg.name;
-            _ui.m_loaIcon.url = string.Format("ui://RechargeStore/{0}", cfg.res);
+            _ui.m_loaIcon.url = ResPathUtil.GetIconPath(cfg.res, "png");//string.Format("ui://RechargeStore/{0}", cfg.res);
             _ui.m_list.numItems = cfg.itemsArr.Length;
             _ui.m_c1.selectedIndex = RechargeDataManager.Instance.GetGiftStateById(_giftId) ? 0 : 1;
             if (cfg.lockType == LockType.STORY_LV)
@@ -62,12 +62,12 @@ namespace GFGGame
             _ui.m_txtEndTime.text = RechargeDataManager.Instance.GetEndTime(cfg.id);
             _ui.m_grpEndTime.visible = cfg.endTime != "";
 
-            _ui.m_txtOriginalPrice.text = cfg.originalPrice.ToString();
+            _ui.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
             if (cfg.price > 0 && cfg.costType != CostType.FREE)
             {
                 _ui.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
                 _ui.m_grpIcon.visible = true;
-                _ui.m_txtPrice.text = cfg.price.ToString();
+                _ui.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
 
                 if (cfg.costType == CostType.RMB)
                 {

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -141,7 +141,7 @@ namespace GFGGame
             GiftBagCfg cfg = _giftCfgs[index];
 
             item.m_txtName.text = cfg.name;
-            item.m_icon.url = string.Format("ui://RechargeStore/{0}", cfg.res);
+            item.m_icon.url = ResPathUtil.GetIconPath(cfg.res, "png"); // string.Format("ui://RechargeStore/{0}", cfg.res);
 
             item.m_txtDesc.SetVar("count", cfg.desc).FlushVars(); ;
             item.m_grpDiscount.visible = cfg.desc != "";
@@ -166,12 +166,12 @@ namespace GFGGame
             item.m_c1.selectedIndex = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? 0 : 1;
             if (item.m_c1.selectedIndex == 0)
             {
-                item.m_txtOriginalPrice.text = cfg.originalPrice.ToString();
+                item.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
                 if (cfg.price > 0 && cfg.costType != CostType.FREE)
                 {
                     item.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
                     item.m_grpIcon.visible = true;
-                    item.m_txtPrice.text = cfg.price.ToString();
+                    item.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
 
                     if (cfg.costType == CostType.RMB)
                     {

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_cs8j2a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 77e208a2800b2ea40997e05b17de8c1f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_cs8j2b.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: defa7929d7a47b14bbc4ebc0884409b4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Scenes/GameLauncher.unity

@@ -277,7 +277,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 170410349}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.8125, y: -5, z: 0}
+  m_LocalPosition: {x: 2.25, y: -5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}