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

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

FGUIProject/assets/FieldGuide/SuitPartsDetailUI.xml → FGUIProject/assets/CommonGame/SuitPartsDetailUI.xml

@@ -4,7 +4,7 @@
     <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="n4_cs8j" name="n4" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="230,32"/>
+    <image id="n4_cs8j" name="n4" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" 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/>
@@ -13,6 +13,9 @@
       <item/>
       <item/>
       <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -18,11 +18,11 @@
     <image id="d4iw54" name="zx_bq_shuxing_2.png" path="/imagesExport/" exported="true"/>
     <component id="d4iw55" name="DressUpItemTips.xml" path="/" exported="true"/>
     <image id="d4iw57" name="zx_ditutips_1.png" path="/imagesExport/" exported="true"/>
-    <image id="q08x3" name="jinbi.png" path="/imagesExport/" exported="true"/>
+    <image id="q08x3" name="jinbi.png" path="/imgItemIcon/" exported="true"/>
     <image id="q08x1" name="zjm_jiahao.png" path="/imagesExport/" exported="true"/>
-    <image id="q08x4" name="tili.png" path="/imagesExport/" exported="true"/>
-    <image id="q08x5" name="zhuans_1.png" path="/imagesExport/" exported="true"/>
-    <image id="q08x6" name="zhuans_2.png" path="/imagesExport/" exported="true"/>
+    <image id="q08x4" name="tili.png" path="/imgItemIcon/" exported="true"/>
+    <image id="q08x5" name="zhuans_1.png" path="/imgItemIcon/" exported="true"/>
+    <image id="q08x6" name="zhuans_2.png" path="/imgItemIcon/" exported="true"/>
     <image id="q08x8" name="zjm_gnkuang.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="37,14,28,28"/>
     <component id="ki9637" name="ButtonPlus1.xml" path="/components/" exported="true"/>
     <component id="v3541v" name="ComponentValueBar.xml" path="/components/" exported="true"/>
@@ -97,16 +97,16 @@
     <image id="wr9a7p" name="kp_jnanniu_1.png" path="/images/" scale="9grid" scale9grid="58,17,116,34"/>
     <image id="lc718g" name="kp_cp_di_2.png" path="/images/" exported="true" scale="9grid" scale9grid="16,37,32,74"/>
     <image id="j539p" name="hc_btkuang.png" path="/images/"/>
-    <image id="vek88h" name="hongzuan.png" path="/imagesExport/" exported="true"/>
-    <image id="vek88i" name="zizuan.png" path="/imagesExport/" exported="true"/>
+    <image id="vek88h" name="hongzuan.png" path="/imgItemIcon/" exported="true"/>
+    <image id="vek88i" name="zizuan.png" path="/imgItemIcon/" exported="true"/>
     <component id="vek88j" name="btnMinus.xml" path="/components/" exported="true"/>
     <component id="wr9a83" name="btnPlus.xml" path="/components/" exported="true"/>
     <image id="vek88k" name="kp_anniu_7.png" path="/images/" exported="true"/>
     <image id="vek88l" name="kp_anniu_8.png" path="/images/" exported="true"/>
-    <image id="ly9g8m" name="xingxie.png" path="/imagesExport/" exported="true"/>
+    <image id="ly9g8m" name="xingxie.png" path="/imgItemIcon/" exported="true"/>
     <image id="ly9g8n" name="luoxings.png" path="/imagesExport/" exported="true"/>
-    <image id="iakb8o" name="hd_hdicon_1.png" path="/imagesExport/" exported="true"/>
-    <image id="iakb8p" name="hd_hdicon_2.png" path="/imagesExport/" exported="true"/>
+    <image id="iakb8o" name="hd_hdicon_1.png" path="/imgItemIcon/" exported="true"/>
+    <image id="iakb8p" name="hd_hdicon_2.png" path="/imgItemIcon/" exported="true"/>
     <component id="m9wm8q" name="RewardUI.xml" path="/" exported="true"/>
     <image id="m9wm8r" name="gxhd_btbt.png" path="/images/"/>
     <image id="m9wm8s" name="gxhd_gd_dik.png" path="/images/"/>
@@ -114,7 +114,7 @@
     <component id="m9wm8u" name="ListRewardItem.xml" path="/components/" exported="true"/>
     <image id="m9wm8v" name="ts_canghaiym.png" path="/imagesExport/" exported="true"/>
     <image id="m9wm8w" name="ts_jiyuet.png" path="/images/"/>
-    <image id="ighs8x" name="hd_suanc.png" path="/imagesExport/" exported="true"/>
+    <image id="ighs8x" name="hd_suanc.png" path="/imgItemIcon/" exported="true"/>
     <image id="9cth8y" name="tctc_xiant_1.png" path="/imagesExport/" exported="true"/>
     <image id="9cth8z" name="cj_hd_kdi.png" path="/imagesExport/"/>
     <image id="9cth90" name="cj_hd_zik.png" path="/imagesExport/"/>
@@ -150,7 +150,7 @@
     <image id="uo1t9o" name="tctc_anniu_2.png" path="/images/"/>
     <component id="ojlzh" name="ComStar.xml" path="/components/" exported="true"/>
     <image id="pzq19p" name="cj_hd_xin.png" path="/imagesExport/"/>
-    <image id="g3nf9q" name="jinbi_1.png" path="/imagesExport/"/>
+    <image id="g3nf9q" name="jinbi_1.png" path="/imgItemIcon/"/>
     <component id="g3nf9r" name="FunctionOpenUI.xml" path="/" exported="true"/>
     <image id="g3nf9t" name="js_icon_.png" path="/imgFunIcon/" exported="true"/>
     <component id="eiwu9v" name="ComFunctionOpen.xml" path="/components/"/>
@@ -183,17 +183,19 @@
     <image id="wet2taf" name="mrqd_bjbj.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
     <movieclip id="wet2td7" name="MovieClip2.jta" path="/effect/" atlas="alone_npot"/>
     <component id="kztethp" name="ComListReward.xml" path="/"/>
-    <image id="kztethq" name="test.png" path="/imagesExport/" exported="true"/>
+    <image id="kztethq" name="test.png" path="/imgItemIcon/" exported="true"/>
     <image id="kztethr" name="hyhy_btbt_1.png" path="/imagesExport/" exported="true"/>
     <image id="kzteths" name="gxhd_scjlscjl.png" path="/images/"/>
     <component id="hspqf4" name="ComRedDot.xml" path="/components/" exported="true"/>
     <image id="kjq37" name="gg_gg_hdhdgth.png" path="/imagesExport/" exported="true"/>
     <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="a97wthv" name="huoyuedu.png" path="/imgItemIcon/" exported="true"/>
     <image id="cs8jthw" name="yx_wilq.png" path="/images/"/>
     <image id="cs8jthx" name="yx_whd.png" path="/images/"/>
     <image id="slyzthy" name="yx_yihd.png" path="/images/"/>
+    <image id="hibuthz" name="fb_gongzuos.png" path="/imgItemIcon/" exported="true"/>
+    <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/FieldGuide/SuitGuideUI.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n2_pjip" name="n2" src="m9wm8t" fileName="bgimg/gxhd_bjbj.png" pkg="eg2y0ldp" xy="0,-240">
+    <image id="n2_pjip" name="n2" src="m9wm8t" fileName="bgimg/gxhd_bjbj.png" xy="0,-240" pkg="eg2y0ldp">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n0_pjip" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
-    <component id="n1_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n0_pjip" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" xy="159,90" pkg="eg2y0ldp"/>
+    <component id="n1_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" xy="35,80" pkg="eg2y0ldp"/>
     <component id="n5_pjip" name="comBoxSort" src="pjipy" fileName="components/ComboBox1.xml" xy="494,262">
       <ComboBox title="默认排序" visibleItemCount="10" autoClearItems="true">
         <item title="1"/>

FGUIProject/assets/FieldGuide/package.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="vqq9h9h4">
   <resources>
-    <component id="z3os0" name="SuitGuideUI.xml" path="/" exported="true"/>
     <component id="pjip1" name="FieldGuideUI.xml" path="/" exported="true"/>
     <image id="pjip2" name="tujian_qiehuan_2.png" path="/images/"/>
     <image id="pjip3" name="tujian_sjdu.png" path="/images/"/>
@@ -37,7 +36,6 @@
     <component id="pjip12" name="ButtonSuitType.xml" path="/components/" exported="true"/>
     <component id="pjip13" name="ProgressBar1.xml" path="/components/"/>
     <component id="pjip14" name="CompSuitItem.xml" path="/components/"/>
-    <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
     <image id="pjip16" name="tujian_yhuod.png" path="/images/"/>
     <image id="pjip17" name="zx_jq_tbdi_1.png" path="/images/"/>
     <image id="pjip18" name="tujian_mbmb.png" path="/images/"/>
@@ -53,6 +51,7 @@
     <image id="pjip1l" name="zhuxian_shuoto.png" path="/images/"/>
     <image id="u6p31m" name="tujian_tup_1.jpg" path="/imagesExport/" exported="true"/>
     <image id="qr4e1n" name="tujian_tztub_4.png" path="/images/"/>
+    <component id="z3os0" name="SuitGuideUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Launcher/LauncherUI.xml

@@ -20,7 +20,7 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar value="100" max="100"/>
     </component>
-    <graph id="n18_slyz" name="holder" xy="-70,1620" size="10,10">
+    <graph id="n18_slyz" name="holder" xy="-140,1620" 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="-120,1595">

FGUIProject/assets/Loading/LoadingView.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n0_hibu" name="loaBg" xy="0,-240" size="1080,2400" url="ui://dw2lsl19hibu1" autoSize="true">
+      <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">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+      <ProgressBar max="100"/>
+    </component>
+    <graph id="n4_hibu" name="holder" xy="-108,1621" 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="-88,1596">
+      <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" strokeColor="#333333" text="启动中...">
+      <relation target="" sidePair=""/>
+    </text>
+    <group id="n8_hibu" name="n8" xy="90,1722" size="900,44" advanced="true">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </group>
+  </displayList>
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1"/>
+</component>

FGUIProject/assets/Loading/components/ProgressBar2.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1000,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">
+      <relation target="" sidePair="width-width"/>
+    </image>
+  </displayList>
+  <ProgressBar/>
+</component>

FGUIProject/assets/Loading/package.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="dw2lsl19">
+  <resources>
+    <image id="hibu0" name="33.jpg" path="/images/" exported="true" atlas="alone_npot"/>
+    <image id="hibu1" name="11.jpg" path="/images/" exported="true" atlas="alone_npot"/>
+    <component id="hibu2" name="LoadingView.xml" path="/" exported="true"/>
+    <component id="hibu3" name="ProgressBar2.xml" path="/components/"/>
+    <image id="hibu4" name="dljm_jdq_1.png" path="/images/"/>
+    <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/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Loading" packageCount="2" genCode="true"/>
+</packageDescription>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -64,5 +64,8 @@
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>
     </group>
+    <movieclip id="n49_hibu" name="effEnd" src="hibu2m" fileName="effect/MovieClip3.jta" xy="0,0" size="1080,1920" visible="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </movieclip>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/package.xml

@@ -53,6 +53,7 @@
     <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"/>
+    <movieclip id="hibu2m" name="MovieClip3.jta" path="/effect/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -26,8 +26,8 @@
     <loader id="n16_t8o1" name="loaderHead" xy="210,2" pivot="0.5,0" anchor="true" size="332,558" url="ui://mfvz4q8kj48o96" autoSize="true" clearOnPublish="true"/>
     <loader id="n47_m1l9" name="loaCost" xy="812,1101" size="60,60" visible="false" url="ui://eg2y0ldpq08x4" autoSize="true"/>
     <text id="n18_t8o1" name="txtPowerDesc" xy="806,1110" size="161,39" fontSize="28" color="#b19270" align="center" vAlign="middle" vars="true" autoSize="none" text="消耗体力：{power=5}"/>
-    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="32,184"/>
-    <text id="n21_t8o1" name="txtTargetName" xy="43,209" pivot="0.5,0" size="32,212" fontSize="32" color="#dcc7b3" align="center" autoSize="height" text="挑战对手">
+    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="17,152" size="54,426"/>
+    <text id="n21_t8o1" name="txtTargetName" xy="26,167" pivot="0.5,0" size="32,395" fontSize="32" color="#dcc7b3" align="center" leading="0" autoSize="height" text="挑战对手·巴拉巴拉">
       <relation target="n34_pal5" sidePair="top-top"/>
     </text>
     <component id="n19_t8o1" name="btnFightOnce" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="50,934" group="n23_t8o1">

FGUIProject/assets/Main/components/ComAllCircle.xml

@@ -11,7 +11,7 @@
     <group id="n39_qgxy" name="n39" xy="64,-308" size="234,162" advanced="true"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.2,1.2" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.5,1.5" endValue="1,1" duration="18" ease="Linear"/>
     <item time="0" type="Visible" target="n31_cn27" value="true"/>
     <item time="0" type="Visible" target="n32_cn27" value="true"/>
     <item time="0" type="Visible" target="n33_cn27" value="true"/>

FGUIProject/assets/Main/package.xml

@@ -220,7 +220,7 @@
     <image id="j48o92" name="zx_anniutz_1.png" path="/images/"/>
     <image id="j48o94" name="zx_jq_dituditu.png" path="/images/"/>
     <image id="j48o95" name="zx_jq_djtubiao_1.png" path="/imagesExport/" exported="true"/>
-    <image id="j48o97" name="zx_jq_rwbszik.png" path="/images/"/>
+    <image id="j48o97" name="zx_jq_rwbszik.png" path="/images/" scale="9grid" scale9grid="12,94,26,56"/>
     <image id="srnc98" name="zd_btzi_1.png" path="/images/"/>
     <image id="oq7r99" name="zx_gka_baoxiang_1.png" path="/imagesStory/"/>
     <image id="oq7r9a" name="zx_gka_baoxiang_2.png" path="/imagesStory/"/>

FGUIProject/assets/Studio/StudioBuyNumUI.xml

@@ -9,8 +9,8 @@
     <component id="n7_hinb" name="btnExchange" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,420">
       <Button title="兑换"/>
     </component>
-    <component id="n27_n3xh" name="comCostItem" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="100,364"/>
-    <component id="n28_n3xh" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="540,364"/>
+    <component id="n27_n3xh" name="comCostItem" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="100,364"/>
+    <component id="n28_n3xh" name="comCostCurrent" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="540,364"/>
     <text id="n30_n3xh" name="txtTitle" xy="425,30" pivot="0.5,0" size="100,64" fontSize="48" color="#9b7853" text="提示"/>
     <text id="n29_n3xh" name="txtTips" xy="297,150" pivot="0.5,0" size="342,51" fontSize="38" color="#917961" text="请选择获取次数方式"/>
     <text id="n31_n3xh" name="txtNum" xy="337,220" pivot="0.5,0" size="294,44" fontSize="32" color="#917961" text="(今日已兑换0/10次)"/>

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

@@ -1,7 +1,7 @@
 using FairyGUI;
 using UnityEngine;
 using ET;
-using LitJson;
+using static GFGGame.LauncherConfig;
 
 namespace GFGGame
 {
@@ -101,7 +101,7 @@ namespace GFGGame
 
             int skipGuide = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_SKIP_GUIDE);
 
-            if (skipGuide <= 0)
+            if (skipGuide <= 0 && LauncherConfig.netType == EnumNetType.LOCAL)
             {
                 Alert.Show("是否跳过引导？如果您是第一次体验，建议不要跳过引导！")
                            .SetLeftButton(true, "不用", (obj) =>
@@ -118,7 +118,7 @@ namespace GFGGame
             }
             else
             {
-                if (skipGuide == 2) GameGlobal.skipGuide = true;
+                if (skipGuide == 2 && LauncherConfig.netType == EnumNetType.LOCAL) GameGlobal.skipGuide = true;
                 EnterGame();
 
             }
@@ -173,7 +173,9 @@ namespace GFGGame
 
         private static void EnterGame()
         {
-            LauncherView.Instance.Close();
+            ViewManager.Hide<LoadingView>();
+            // LoadingView.Instance.Close();
+
             GameGlobal.isEnterGame = true;
             if (MainStoryDataManager.CheckOpenMainUI() || GameGlobal.skipGuide)
             {

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

@@ -214,9 +214,10 @@ namespace GFGGame
         public static async ETTask ReqEnterGame()
         {
             ViewManager.Hide<LoginView>();
-            LauncherView.Instance.Open();
-            LauncherView.Instance.SetDesc("进入游戏");
-            LauncherView.Instance.SetProgress(100);
+            ViewManager.Show<LoadingView>();
+            // LoadingView.Instance.Open();
+            LoadingView.Instance.SetProgress(100);
+            // LoadingView.Instance.SetDesc("游戏加载中");
             LogServerHelperHttp.SendNodeLog((int)LogNode.StartEnterGame);
             int errorCode = await LoginHelper.GetRealmKey(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitPartsDetailUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitPartsDetailUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.FieldGuide
+namespace UI.CommonGame
 {
     public partial class UI_SuitPartsDetailUI
     {
@@ -10,8 +10,8 @@ namespace UI.FieldGuide
         public GLoader m_bg;
         public GTextField m_txtTitle;
         public GList m_listParts;
-        public const string URL = "ui://vqq9h9h4pjip15";
-        public const string PACKAGE_NAME = "FieldGuide";
+        public const string URL = "ui://eg2y0ldppjip15";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "SuitPartsDetailUI";
         private static UI_SuitPartsDetailUI _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitPartsDetailUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitPartsDetailUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 28c9596b503b15c499a4a3bcaddde29a
+guid: c8e41fc9a8599cf419269cdc3af82871
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/ResIn/UI/RoleLvUp_fui.bytes.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Loading.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 186d062c421d7e84c99d28ec25615308
-TextScriptImporter:
+guid: bd6c134d5da559045b9225d006e38e53
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Loading/UI_LoadingView.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Loading
+{
+    public partial class UI_LoadingView
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GProgressBar m_progressBar1;
+        public GGraph m_holder;
+        public GImage m_imgAni;
+        public GTextField m_txtDescLeft;
+        public Transition m_t0;
+        public const string URL = "ui://dw2lsl19hibu2";
+        public const string PACKAGE_NAME = "Loading";
+        public const string RES_NAME = "LoadingView";
+        private static UI_LoadingView _proxy;
+
+        public static UI_LoadingView Create(GObject gObject = null)
+        {
+            var ui = new UI_LoadingView();
+            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_LoadingView Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LoadingView();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_progressBar1 = (GProgressBar)comp.GetChild("progressBar1");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_imgAni = (GImage)comp.GetChild("imgAni");
+            m_txtDescLeft = (GTextField)comp.GetChild("txtDescLeft");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_progressBar1 = null;
+            m_holder = null;
+            m_imgAni = null;
+            m_txtDescLeft = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Loading/UI_LoadingView.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -43,6 +43,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_2_7;
         public UI_ComStar m_comStar1_2_8;
         public GGroup m_grpComStar2;
+        public GMovieClip m_effEnd;
         public const string URL = "ui://drx9d1usl5nzm";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxStarUI";
@@ -126,6 +127,7 @@ namespace UI.LuckyBox
             m_comStar1_2_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_7"));
             m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
+            m_effEnd = (GMovieClip)comp.GetChild("effEnd");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -194,6 +196,7 @@ namespace UI.LuckyBox
             m_comStar1_2_8.Dispose();
             m_comStar1_2_8 = null;
             m_grpComStar2 = null;
+            m_effEnd = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,7 +1,9 @@
 using ET;
+using FairyGUI;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using UI.CommonGame;
 using UnityEngine;
 
 namespace GFGGame
@@ -218,5 +220,26 @@ namespace GFGGame
             }
             return "png";
         }
+
+        public static void SetItemNumAndNeedNum(GObject obj, int itemId, int needNum, string color = "#D27869")
+        {
+            UI_ComCostCurrencyWithHas com = UI_ComCostCurrencyWithHas.Proxy(obj);
+            int hasNum = ItemDataManager.GetItemNum(itemId);
+            com.m_txtHas.text = StringUtil.GetColorText(NumberUtil.ChangeNumberUnit(hasNum), hasNum < needNum ? color : "#FFFFFF"); hasNum.ToString();
+            com.m_txtNeed.text = needNum.ToString();
+
+            ItemCfg cfg1 = ItemCfgArray.Instance.GetCfg(itemId);
+            com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg1.res);
+
+        }
+        public static void SetItemNeedNum(GObject obj, int itemId, int needNum, string color = "#D27869")
+        {
+            UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(obj);
+            com.m_txtNeed.text = needNum.ToString();
+
+            ItemCfg cfg1 = ItemCfgArray.Instance.GetCfg(itemId);
+            com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg1.res);
+
+        }
     }
 }

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

@@ -2,15 +2,20 @@ namespace GFGGame
 {
     public class GoodsItemTipsController
     {
-        public static void ShowItemTips(int itemID)
+        public static void ShowItemTips(int id)
         {
-            if(ItemUtilCS.IsDressUpItem(itemID))
+            if (SuitCfgArray.Instance.GetCfg(id) != null)
             {
-                ViewManager.Show(ViewName.DRESS_UP_ITEM_TIPS_VIEW, itemID);
+                ViewManager.Show<SuitPartsDetailView>(id);
+
+            }
+            else if (ItemUtilCS.IsDressUpItem(id))
+            {
+                ViewManager.Show(ViewName.DRESS_UP_ITEM_TIPS_VIEW, id);
             }
             else
             {
-                ViewManager.Show(ViewName.GOODS_ITEM_TIPS_VIEW, itemID);
+                ViewManager.Show(ViewName.GOODS_ITEM_TIPS_VIEW, id);
             }
         }
     }

GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs

@@ -41,7 +41,7 @@ namespace GFGGame
             _cfgs = DailyLoginCfgArray.Instance.GetCfgs("1");
             _ui.m_list.numItems = _cfgs.Count;
             _ui.m_loaIcon.url = "ui://DailyLogin/yzhd_dyt_7";
-            _ui.m_loaIcon.data = _cfgs[_cfgs.Count - 1];
+            _ui.m_loaIcon.data = DailyLoginCfgArray.Instance.GetCfgs("2")[0];
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -132,8 +132,10 @@ namespace GFGGame
         {
             UI_ListBoxRewardItem item = UI_ListBoxRewardItem.Proxy(obj);
             DailyActiveRewardCfg cfg = _rewardCfgs[index];
-            item.m_c1.selectedIndex = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
+            int state = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
+            item.m_c1.selectedIndex = state;
             item.m_txtNum.text = cfg.count.ToString();
+            RedDotController.Instance.SetComRedDot(item.target, state == ConstBonusStatus.CAN_GET, "", 0, 20, 0, 8);
 
             item.target.data = _rewardCfgs[index];
             UI_ListBoxRewardItem.ClearProxy();

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

@@ -1,4 +1,4 @@
-using UI.FieldGuide;
+using UI.CommonGame;
 using FairyGUI;
 
 namespace GFGGame
@@ -17,7 +17,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_SuitGuideUI.PACKAGE_NAME;
+            packageName = UI_SuitPartsDetailUI.PACKAGE_NAME;
             _ui = UI_SuitPartsDetailUI.Create();
             this.viewCom = _ui.target;
             this.modal = true;
@@ -34,8 +34,8 @@ namespace GFGGame
             int suitId = (int)this.viewData;
             _items = SuitCfgManager.Instance.GetSuitItems(suitId);
             _ui.m_listParts.numItems = _items.Length;
-
-            _ui.m_listParts.ResizeToFit();
+            _ui.m_listParts.ScrollToView(0);
+            // _ui.m_listParts.ResizeToFit();
             _ui.target.Center();
         }
 

GameClient/Assets/ResIn/UI/Studio_fui.bytes.meta → GameClient/Assets/Game/HotUpdate/Views/Loading.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 9aacff8ec55afa3418d7898fc30b83e6
-TextScriptImporter:
+guid: 0f46b1009c0a6f1428c31fa88b0f97ee
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

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

@@ -0,0 +1,102 @@
+using FairyGUI;
+using UI.Loading;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LoadingView : BaseWindow
+    {
+
+        private UI_LoadingView _ui;
+
+        private const float SPEED = 0.01f;
+        private string[] resNames = { "11", "33" };
+
+        private GameObject _effectObj;
+        private GoWrapper _wrapper;
+
+        private static LoadingView m_Instance = null;
+
+        public static LoadingView Instance
+        {
+            get
+            {
+                if (m_Instance == null)
+                {
+                    // m_Instance = new LauncherView();
+                    m_Instance = ViewManager.GetUIView(typeof(LoadingView).Name) as LoadingView;
+                }
+                return m_Instance;
+            }
+        }
+        public override void Dispose()
+        {
+            base.Dispose();
+            SceneController.DestroyObjectFromView(_effectObj);
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LoadingView.PACKAGE_NAME;
+            _ui = UI_LoadingView.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_dljm", "ui_dljm_jdt_tw");
+            SceneController.AddObjectToView(null, null, _ui.m_holder, resPath1, out _effectObj, out _wrapper);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();//1;//
+            int index = Random.Range(0, resNames.Length);
+            _ui.m_loaBg.url = string.Format("ui://Loading/{0}", resNames[index]);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        /// <summary>
+        /// 设置进度0-100
+        /// </summary>
+        /// <param name="progress"></param>
+        /// <param name="callback"></param>
+        public void SetProgress(long progress, GTweenCallback callback = null)
+        {
+            if (!ViewManager.isViewOpen(typeof(LoadingView).Name))
+            {
+                return;
+            }
+            GTweener twener = GTween.GetTween(_ui.m_progressBar1, TweenPropType.Progress);
+            if (twener != null)
+            {
+                twener.Kill(true);
+            }
+            if (progress < _ui.m_progressBar1.value)
+            {
+                _ui.m_progressBar1.value = progress;
+                _ui.m_imgAni.x = _ui.m_progressBar1.width * (progress / 100) - 120;
+                callback?.Invoke();
+            }
+            else
+            {
+                float duration = (float)(progress - _ui.m_progressBar1.value) * SPEED;
+
+                GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
+                {
+                    _ui.m_imgAni.x = _ui.m_progressBar1.width * (t.value.x / 100) - 120;
+
+                });
+                if (callback != null)
+                {
+                    gtweener.OnComplete(callback);
+                }
+            }
+        }
+
+
+    }
+}

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

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

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

@@ -13,8 +13,8 @@ namespace GFGGame
         private List<GameObject> _effects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
 
-        private GameObject _effect = new GameObject();
-        private GoWrapper _wrapper = new GoWrapper();
+        private GameObject _effect;
+        private GoWrapper _wrapper;
         public override void Dispose()
         {
             base.Dispose();
@@ -48,7 +48,8 @@ namespace GFGGame
                 SceneController.AddObjectToView(null, null, holder, resPath, out gameObject0, out wrapper0);
                 _effects.Add(gameObject0);
             }
-            SceneController.AddObjectToView(_effect, _wrapper, _ui.m_itemOne.GetChild("holder").asGraph, resPath, out _effect, out _wrapper);
+            GGraph holder1 = _ui.target.GetChild("itemOne").asCom.GetChild("holder").asGraph;
+            SceneController.AddObjectToView(null, null, holder1, resPath, out _effect, out _wrapper);
 
         }
 
@@ -132,7 +133,8 @@ namespace GFGGame
         {
             HideAllItem();
             _ui.m_itemOne.visible = true;
-            UpdateItem(UI_LuckyBoxBonusItem.Proxy(_ui.m_itemOne), itemData);
+            UI_LuckyBoxBonusItem itemUI = UI_LuckyBoxBonusItem.Proxy(_ui.m_itemOne);
+            UpdateItem(itemUI, itemData);
             _ui.m_bg.touchable = true;
         }
 

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

@@ -13,16 +13,14 @@ namespace GFGGame
     {
         private UI_LuckyBoxStarUI _ui;
         private List<GObject> comStars = new List<GObject>();
+        private List<GObject> clickComStars = new List<GObject>();
+        private List<GObject> notClickComStars = new List<GObject>();
 
         private List<GameObject> _gameObjects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
         private List<GameObject> _gameObjects1 = new List<GameObject>();
         private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
         private Dictionary<int, List<GameObject>> dicGameobj = new Dictionary<int, List<GameObject>>();
-        private Dictionary<int, List<GoWrapper>> dicWrappers = new Dictionary<int, List<GoWrapper>>();
-        private Dictionary<int, List<GameObject>> dicGameobj1 = new Dictionary<int, List<GameObject>>();
-        private Dictionary<int, List<GoWrapper>> dicWrappers1 = new Dictionary<int, List<GoWrapper>>();
-
 
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置，每颗星星初始时默认为Vector2.right;
@@ -43,14 +41,16 @@ namespace GFGGame
         {
             int index = 0;
             GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-
-            // while (star != null && star.visible == true)
-            // {
-            //     UI_ComStar comStar = UI_ComStar.Proxy(star);
-            //     if (comStar.target.numChildren > 1) comStar.target.RemoveChildAt(1);
-            //     if (comStar.target.numChildren > 1) comStar.target.RemoveChildAt(1);
-            //     index++;
-            // }
+            notClickComStars.Clear();
+            clickComStars.Clear();
+            dicGameobj.Clear();
+            foreach (List<GameObject> value in dicGameobj.Values)
+            {
+                for (int i = 0; i < value.Count; i++)
+                {
+                    SceneController.DestroyObjectFromView(value[i]);
+                }
+            }
         }
         protected override void OnInit()
         {
@@ -70,7 +70,7 @@ namespace GFGGame
             _ui.target.onTouchBegin.Add(OnClickUIBegin);
             _ui.target.onTouchMove.Add(OnClickUIMove);
             _ui.target.onTouchEnd.Add(OnClickUIEnd);
-
+            _ui.m_effEnd.visible = false;
             _rewardList = LuckyBoxDataManager.Instance.RewardList;
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
             _ui.m_ctrlRewardsType.selectedIndex = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
@@ -91,37 +91,28 @@ namespace GFGGame
             while (star != null && star.visible == true)
             {
                 UI_ComStar comStar = UI_ComStar.Proxy(star);
+                comStar.m_imgLine.visible = true;
+
                 comStar.m_c1.selectedIndex = 0;
                 comStar.m_imgLine.width = imgLineWidth;
                 comStar.m_imgLine.rotation = 0;
-                GComponent gcom;
-                if (comStar.target.numChildren > 1)
-                {
-                    gcom = comStar.target.GetChildAt(1).asCom;
-                }
-                else
-                {
-                    gcom = UIPackage.CreateObject("LuckyBox", "ComHolder").asCom;
-                    string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck");
-                    SceneController.AddObjectToView(null, null, gcom.GetChild("holder").asGraph, resPath, out GameObject gameObject, out GoWrapper wrapper);
-                }
+
+                GComponent gcom = CreateEffect(comStar, 1, "ui_ck"); ;
                 gcom.visible = true;
                 comStar.target.AddChildAt(gcom, 1);
 
-                GComponent gcom1;
-                if (comStar.target.numChildren > 2)
-                {
-                    gcom1 = comStar.target.GetChildAt(2).asCom;
-                }
-                else
-                {
-                    gcom1 = UIPackage.CreateObject("LuckyBox", "ComHolder").asCom;
-                    string resPath1 = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_dj");
-                    SceneController.AddObjectToView(null, null, gcom1.GetChild("holder").asGraph, resPath1, out GameObject gameObject1, out GoWrapper wrapper1);
-                }
+                GComponent gcom1 = CreateEffect(comStar, 2, "ui_ck_dj");
                 gcom1.visible = false;
                 comStar.target.AddChildAt(gcom1, 2);
 
+                GComponent gcom2 = CreateEffect(comStar, 3, "ui_ck_xs");
+                gcom2.visible = false;
+                comStar.target.AddChildAt(gcom2, 3);
+
+                GComponent gcom3 = CreateEffect(comStar, 4, "ui_ck_dj_2");
+                gcom3.visible = false;
+                comStar.target.AddChildAt(gcom3, 4);
+
 
 
                 star.data = new Vector2(comStar.target.x, comStar.target.y);
@@ -132,6 +123,26 @@ namespace GFGGame
             }
 
         }
+        private GComponent CreateEffect(UI_ComStar comStar, int index, string name)
+        {
+            GComponent gcom;
+            if (comStar.target.numChildren > index)
+            {
+                gcom = comStar.target.GetChildAt(index).asCom;
+            }
+            else
+            {
+                gcom = UIPackage.CreateObject("LuckyBox", "ComHolder").asCom;
+                string resPath = ResPathUtil.GetViewEffectPath("ui_ck", name);
+                SceneController.AddObjectToView(null, null, gcom.GetChild("holder").asGraph, resPath, out GameObject gameObject, out GoWrapper wrapper);
+                if (!dicGameobj.ContainsKey(index))
+                {
+                    dicGameobj.Add(index, new List<GameObject>());
+                }
+                dicGameobj[index].Add(gameObject);
+            }
+            return gcom;
+        }
         private void OnClickUIBegin(EventContext context)
         {
             context.CaptureTouch();
@@ -171,6 +182,7 @@ namespace GFGGame
                     curComStar = comStars[i];
                     lastPos = Vector2.right;
 
+                    clickComStars.Add(comStars[i]);
                     comStars.RemoveAt(i);
 
                 }
@@ -204,6 +216,12 @@ namespace GFGGame
 
         private void OnClickUIEnd()
         {
+            if (clickComStars.Count <= 0) return;
+
+            UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[clickComStars.Count - 1]);
+            comStar.m_imgLine.visible = false;
+
+
             if (showGuide && comStars.Count > 0)
             {
                 isFirst = false;
@@ -211,9 +229,60 @@ namespace GFGGame
             }
             else
             {
-                TryCompleteGuide();
-                Timers.inst.Add(0.3f, 1, ClickUIEnd);
+                CheckNotClickComStar();
+                SetComStarDarken();
+
+                Timers.inst.Add(1f, 1, SetClickComStarAni);
+
+
+            }
+        }
+        private void CheckNotClickComStar()
+        {
+            int index = 0;
+            GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
+
+            while (star != null && star.visible == true)
+            {
+                if (clickComStars.IndexOf(star) < 0)
+                {
+                    notClickComStars.Add(star);
+                }
+                index++;
+                star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
+            }
+        }
+
+        private void SetComStarDarken()
+        {
+
+            for (int i = 0; i < notClickComStars.Count; i++)
+            {
+                UI_ComStar notClickComStar = UI_ComStar.Proxy(notClickComStars[i]);
+                notClickComStar.m_imgLine.visible = false;
+                notClickComStar.target.GetChildAt(3).asCom.visible = true;
+                notClickComStar.target.GetChildAt(1).asCom.visible = false;
+            }
+
+        }
+
+        private void SetClickComStarAni(object param)
+        {
+            for (int i = 0; i < clickComStars.Count; i++)
+            {
+                UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[i]);
+                comStar.target.GetChildAt(4).asCom.visible = true;
             }
+            Timers.inst.Add(0.5f, 1, SetEndEffect);
+        }
+        private void SetEndEffect(object param)
+        {
+            _ui.m_effEnd.visible = true;
+            _ui.m_effEnd.SetPlaySettings(0, -1, 1, -1);
+
+            Timers.inst.Add(0.6f, 1, ClickUIEnd);
+            // ClickUIEnd(null);
+            TryCompleteGuide();
         }
         private void ClickUIEnd(object param)
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -21,7 +21,7 @@ namespace GFGGame
         private const float _prefectScale = 60f;//完美缩放比
         private float _time = 0;// 登峰造极按住的时间
 
-        private float _playTime = 2.3f;
+        private float _playTime = 2.5f;
         private bool _stopFight = false;
 
         private GameObject _gameObject0;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -196,7 +196,7 @@ namespace GFGGame
             _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + fightCfg.scoreType;
             if (fightCfg.targetName != null && fightCfg.targetName.Length > 0)
             {
-                _ui.m_txtTargetName.text = "挑战对手 : " + fightCfg.targetName;
+                _ui.m_txtTargetName.text = "挑战对手·" + fightCfg.targetName;
                 _ui.m_loaderHead.url = ResPathUtil.GetNpcHeadPath(fightCfg.targetRes);
             }
             else

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -62,17 +62,11 @@ namespace GFGGame
 
 
             _ui.m_txtNum.text = string.Format("(今天已兑换{0}/{1}次)", _studioData.BuyTimes, _studioCfg.buyNum);
-            ItemCfg cfg1 = ItemCfgArray.Instance.GetCfg(_studioCfg.itemID);
-            UI_ComCostCurrency comCostCurrency = UI_ComCostCurrency.Proxy(_ui.m_comCostItem);
-            comCostCurrency.m_txtNeed.text = _studioCfg.itemNum.ToString();
-            comCostCurrency.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg1.res);
 
+            ItemUtil.SetItemNumAndNeedNum(_ui.m_comCostItem, _studioCfg.itemID, _studioCfg.itemNum);
 
-            ItemCfg cfg2 = ItemCfgArray.Instance.GetCfg(_studioCfg.moneyId);
-            UI_ComCostCurrency comCostCurrency2 = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
             StudioCfgArray.Instance.GetMoneyIdAndNum(_studioCfg.id, _studioData.BuyTimes, 1, out int moneyId, out int moneyNum);
-            comCostCurrency2.m_txtNeed.text = moneyNum.ToString();
-            comCostCurrency2.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg2.res);
+            ItemUtil.SetItemNumAndNeedNum(_ui.m_comCostCurrent, _studioCfg.moneyId, moneyNum);
 
         }
 

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

@@ -96,7 +96,7 @@ namespace GFGGame
             {
                 return;
             }
-            string str = string.Format("{0}{1}", desc, descRight);//  + descRight;
+            string str = string.Format("{0}  {1}", desc, descRight);//  + descRight;
             _ui.m_txtDescLeft.text = str;
             // _ui.m_txtDescLeft.text = desc ?? "";
             // _ui.m_txtDescRight.text = descRight ?? "";

GameClient/Assets/ResIn/UI/Loading.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6b49ac9879f09e840bf87666c2aab02c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ClothingFoster_atlas0.png.meta → GameClient/Assets/ResIn/UI/Loading/Loading_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b103c368c02974f47ae9eff35d5474d2
+guid: cc412b96b10cdb0409f55eb15f3b47ec
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Studio_atlas0.png.meta → GameClient/Assets/ResIn/UI/Loading/Loading_atlas_hibu0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 47a1b23906dc5294e9fe3371b964c069
+guid: f2496c694d31dc544b61044ec43389d8
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Loading/Loading_atlas_hibu1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 86c9bc4b4a0a4164482742447e7c1017
+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/ClothingFoster_fui.bytes.meta → GameClient/Assets/ResIn/UI/Loading/Loading_fui.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1f88ef541cbe5bc40aaef50b14e446b3
+guid: 5fbea9b05221ad5438c4f854c8e90ba3
 TextScriptImporter:
   externalObjects: {}
   userData: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_hibu2m!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 72c695b5422c302439c034a86254b0b0
+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_hibu2m.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 277d5c434dbc61f44bfc5d42129145ae
+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: