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

FGUIProject/assets/FieldGuide/FieldGuideUI.xml

@@ -8,7 +8,7 @@
     <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://vqq9h9h4ysx93f"/>
     </component>
-    <list id="n13_pjip" name="listGuide" xy="43,407" size="994,1513" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4pjipe" autoClearItems="true">
+    <list id="n13_pjip" name="listGuide" xy="42,447" size="996,1473" overflow="scroll" lineGap="54" defaultItem="ui://vqq9h9h4pjipe" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/FieldGuide/components/CompGuideItem.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="994,236">
+<component size="992,348">
   <displayList>
-    <loader id="n15_pjip" name="loaderPic" xy="15,15" size="964,202" url="ui://vqq9h9h4r0yx1v" autoSize="true"/>
-    <image id="n8_pjip" name="bg" src="pjip9" fileName="images/tujian_dikuang_1.png" xy="0,0"/>
-    <loader id="n11_pjip" name="loaderTitle" xy="40,0" size="58,198" url="ui://vqq9h9h4pjip4" autoSize="true"/>
-    <image id="n12_pjip" name="n12" src="pjip3" fileName="images/tujian_sjdu.png" xy="814,90"/>
-    <text id="n13_pjip" name="n13" xy="834,129" size="76,34" fontSize="24" color="#fff9f0" text="收集度">
+    <loader id="n15_pjip" name="loaderPic" xy="14,14" size="964,320" url="ui://vqq9h9h4r0yx1v" autoSize="true"/>
+    <image id="n16_mzf8" name="n16" src="mzf83y" fileName="imagesExport/tujian_dikuang_1.png" xy="0,0"/>
+    <loader id="n11_pjip" name="loaderTitle" xy="24,0" size="78,273" url="ui://vqq9h9h4pjip4" autoSize="true"/>
+    <image id="n12_pjip" name="n12" src="mzf842" fileName="imagesExport/tujian_sjdu.png" xy="814,175" group="n17_mzf8"/>
+    <text id="n13_pjip" name="n13" xy="837,207" size="103,46" group="n17_mzf8" fontSize="34" color="#fdf7eb" text="收集度">
       <relation target="n12_pjip" sidePair="center-center"/>
     </text>
-    <text id="n14_pjip" name="txtProgress" xy="846,165" size="53,26" fontSize="18" color="#fff9f0" text="100%">
+    <text id="n14_pjip" name="txtProgress" xy="846,255" pivot="0.5,0" size="85,44" group="n17_mzf8" fontSize="32" color="#fee3b0" align="center" text="100%">
       <relation target="n12_pjip" sidePair="center-center"/>
     </text>
+    <group id="n17_mzf8" name="n17" xy="814,175" size="150,151"/>
   </displayList>
 </component>

FGUIProject/assets/FieldGuide/package.xml

@@ -5,10 +5,6 @@
     <image id="pjip2" name="tujian_qiehuan_2.png" path="/images/"/>
     <image id="pjip3" name="tujian_sjdu.png" path="/images/"/>
     <image id="pjip4" name="tujian_taoz_1.png" path="/imagesExport/" exported="true"/>
-    <image id="pjip5" name="tujian_taoz_2.png" path="/imagesExport/" exported="true"/>
-    <image id="pjip6" name="tujian_taoz_8.png" path="/imagesExport/" exported="true"/>
-    <image id="pjip7" name="tujian_taoz_4.png" path="/imagesExport/" exported="true"/>
-    <image id="pjip8" name="tujian_taoz_5.png" path="/imagesExport/" exported="true"/>
     <image id="pjip9" name="tujian_dikuang_1.png" path="/images/"/>
     <image id="pjipa" name="tujian_huodtu_1.png" path="/imagesExport/" exported="true"/>
     <image id="pjipb" name="tujian_qiehuan_1.png" path="/images/"/>
@@ -53,7 +49,7 @@
     <image id="r0yx1p" name="tujian_qiehuan_3.png" path="/images/"/>
     <image id="r0yx1v" name="tujian_tup_1.png" path="/imagesExport/" exported="true"/>
     <image id="s61p1w" name="tujian_tup_2.png" path="/imagesExport/" exported="true"/>
-    <image id="s61p1x" name="tujian_taoz_6.png" path="/imagesExport/" exported="true"/>
+    <image id="s61p1x" name="tujian_taoz_2.png" path="/imagesExport/" exported="true"/>
     <component id="s61p1y" name="ChapterItemGuideUI.xml" path="/" exported="true"/>
     <image id="s61p23" name="jbhc_diban_4.png" path="/images/" scale="9grid" scale9grid="113,135,226,270"/>
     <image id="s61p24" name="bwtj_bti.png" path="/images/"/>
@@ -81,7 +77,6 @@
     <component id="wono32" name="ComTravel.xml" path="/components/"/>
     <image id="wono33" name="xqfs_dzdi_5.png" path="/images/"/>
     <image id="wono34" name="xqfs_dztb_1.png" path="/images/"/>
-    <image id="wono36" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
     <image id="wono37" name="tujian_tup_3.png" path="/imagesExport/" exported="true"/>
     <image id="wono3a" name="xqfs_wddw.png" path="/components/"/>
     <image id="ysx93d" name="xz_xqfs.png" path="/images/"/>
@@ -104,6 +99,12 @@
     <image id="ysx93v" name="tujian_lw_2.png" path="/imagesExport/" exported="true"/>
     <image id="ysx93w" name="tujian_zikua.png" path="/images/"/>
     <image id="ysx93x" name="tz_dengyingly.png" path="/images/"/>
+    <image id="mzf83y" name="tujian_dikuang_1.png" path="/imagesExport/"/>
+    <image id="mzf83z" name="tujian_qiehuan_1.png" path="/imagesExport/"/>
+    <image id="mzf840" name="tujian_qiehuan_2.png" path="/imagesExport/"/>
+    <image id="mzf841" name="tujian_qiehuan_3.png" path="/imagesExport/"/>
+    <image id="mzf842" name="tujian_sjdu.png" path="/imagesExport/"/>
+    <image id="mzf843" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -55,41 +55,41 @@
     </component>
     <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" group="n52_qqat" advanced="true"/>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1118,1760" group="n59_oju1" advanced="true"/>
-    <component id="n73_mzf8" name="btn0" src="mzf8it" fileName="components/ButtonModle6.xml" xy="70,447" group="n58_oju1">
+    <component id="n73_mzf8" name="btn0" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>
       <property target="loaLockIcon" propertyId="1" value=""/>
       <property target="icon1" propertyId="1" value=""/>
     </component>
-    <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="615,1195" group="n58_oju1">
+    <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="616,1195" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8ik"/>
       <property target="loaLockIcon" propertyId="1" value=""/>
       <property target="icon1" propertyId="1" value=""/>
     </component>
-    <component id="n44_n3xh" name="btnStudio" src="mzf8ip" fileName="components/ButtonModle2.xml" xy="343,673" group="n58_oju1">
+    <component id="n44_n3xh" name="btnStudio" src="mzf8ip" fileName="components/ButtonModle2.xml" xy="344,673" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8im"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482ft"/>
     </component>
-    <component id="n60_wono" name="btnTravel" src="mzf8iq" fileName="components/ButtonModle3.xml" xy="753,893" group="n58_oju1">
+    <component id="n60_wono" name="btnTravel" src="mzf8iq" fileName="components/ButtonModle3.xml" xy="754,893" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8il"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kwonohg"/>
     </component>
-    <component id="n51_v482" name="btnPoem" src="mzf8is" fileName="components/ButtonModle5.xml" xy="118,1487" group="n58_oju1">
+    <component id="n51_v482" name="btnPoem" src="mzf8is" fileName="components/ButtonModle5.xml" xy="119,1487" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8ij"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fr"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="mzf8ir" fileName="components/ButtonModle4.xml" xy="663,1584" group="n58_oju1">
+    <component id="n45_kqhd" name="btnField" src="mzf8ir" fileName="components/ButtonModle4.xml" xy="664,1584" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8io"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fv"/>
     </component>
-    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="58,1634" pivot="0.5,0.5" anchor="true" size="200,234" group="n58_oju1" scale="-1,1"/>
-    <group id="n58_oju1" name="grpRight" xy="-41,447" size="1121,1497" group="n59_oju1" advanced="true">
+    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="165,1447" size="200,234" group="n58_oju1" scale="-1,1"/>
+    <group id="n58_oju1" name="grpRight" xy="71,447" size="1010,1497" group="n59_oju1" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <group id="n59_oju1" name="grpMove" xy="-41,90" size="1159,1854" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,90" size="1118,1854" advanced="true"/>
     <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
     <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>

GameClient/Assets/Game/HotUpdate/Data/Handler/RoleDataHandler.cs

@@ -42,7 +42,7 @@ namespace GFGGame
                 CommonSProxy.ResetDailyData().Coroutine();
             }
 
-            if (seconds >= TimeUtil.SECOND_PER_MUNITE * 0.1)
+            if (seconds >= TimeUtil.SECOND_PER_MUNITE * 1)
             {
                 ViewManager.CheckDispsoe();
                 seconds = 0;

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

@@ -8,7 +8,6 @@ namespace UI.FieldGuide
     {
         public GComponent target;
         public GLoader m_loaderPic;
-        public GImage m_bg;
         public GLoader m_loaderTitle;
         public GTextField m_txtProgress;
         public const string URL = "ui://vqq9h9h4pjipe";
@@ -59,14 +58,12 @@ namespace UI.FieldGuide
         private void Init(GComponent comp)
         {
             m_loaderPic = (GLoader)comp.GetChild("loaderPic");
-            m_bg = (GImage)comp.GetChild("bg");
             m_loaderTitle = (GLoader)comp.GetChild("loaderTitle");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaderPic = null;
-            m_bg = null;
             m_loaderTitle = null;
             m_txtProgress = null;
             if(disposeTarget && target != null)

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

@@ -595,10 +595,10 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
             RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetRechargeGiftFreeRed());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", 10);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -38);
             RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", 5, 7);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -38);
 
         }
 

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -349,7 +349,7 @@ namespace GFGGame
                 // if (kv.Value.packageName == ResPathUtil.GetUIPackagePath("CommonGame") || kv.Value.packageName == ResPathUtil.GetUIPackagePath("Common") || kv.Value.packageName == ResPathUtil.GetUIPackagePath("Main")) return;//这几个包不释放
                 long currentTime = TimeHelper.ClientNowSeconds();
                 long closeTime = kv.Value.closeTime;
-                if (closeTime > 0 && currentTime - closeTime >= TimeUtil.SECOND_PER_MUNITE * 0.1)
+                if (closeTime > 0 && currentTime - closeTime >= TimeUtil.SECOND_PER_MUNITE * 1)
                 {
                     kv.Value.closeTime = 0;
                     kv.Value.Dispose();