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

FGUIProject/assets/FieldGuide/components/ListTravelAreaItem.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="478,232">
   <displayList>
-    <loader id="n10_wono" name="loaIcon" xy="0,0" size="478,232" url="ui://vqq9h9h4wono2p" autoSize="true"/>
+    <image id="n12_ysx9" name="n12" src="ysx93q" fileName="travelGuideExport/xqfs_dtdt.png" xy="0,0"/>
+    <loader id="n10_wono" name="loaIcon" xy="40,37" size="102,52" url="ui://vqq9h9h4ysx93i" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/FieldGuide/package.xml

@@ -74,9 +74,6 @@
     <component id="wono2l" name="ListTravelAreaItem.xml" path="/components/"/>
     <component id="wono2m" name="ListTravelLocationItem.xml" path="/components/"/>
     <component id="wono2n" name="Button5.xml" path="/components/"/>
-    <image id="wono2o" name="xqfs_dd_xy.png" path="/travelGuideExport/" exported="true"/>
-    <image id="wono2p" name="xqfs_dd_hb.png" path="/travelGuideExport/" exported="true"/>
-    <image id="wono2q" name="xqfs_dd_jn.png" path="/travelGuideExport/" exported="true"/>
     <image id="wono2r" name="xqfs_dzdi_3.png" path="/images/"/>
     <image id="wono2s" name="xqfs_dzdi_4.png" path="/images/"/>
     <image id="wono2t" name="xqfs_dztb.png" path="/images/"/>
@@ -93,6 +90,15 @@
     <image id="ysx93e" name="xz_ddtj.png" path="/images/"/>
     <image id="ysx93f" name="tjtj_tj.png" path="/images/"/>
     <image id="ysx93g" name="tztj_tztj.png" path="/images/"/>
+    <image id="ysx93h" name="xqfs_dd_zy.png" path="/travelGuideExport/" exported="true"/>
+    <image id="ysx93i" name="xqfs_dd_bs.png" path="/travelGuideExport/" exported="true"/>
+    <image id="ysx93j" name="xqfs_dd_gz.png" path="/travelGuideExport/" exported="true"/>
+    <image id="ysx93k" name="xqfs_dd_hx.png" path="/travelGuideExport/" exported="true"/>
+    <image id="ysx93l" name="xqfs_dd_jn.png" path="/travelGuideExport/" exported="true"/>
+    <image id="ysx93m" name="xqfs_dd_ln.png" path="/travelGuideExport/" exported="true"/>
+    <image id="ysx93n" name="xqfs_dd_sb.png" path="/travelGuideExport/" exported="true"/>
+    <image id="ysx93o" name="xqfs_dd_xy.png" path="/travelGuideExport/" exported="true"/>
+    <image id="ysx93q" name="xqfs_dtdt.png" path="/travelGuideExport/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -100,7 +100,7 @@ namespace GFGGame
             {
 
                 List<ItemData> rewards = ItemUtil.CreateItemDataList(_cfg.rewardsArr);
-                ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", "到达该区域所有地点时可领取" });
+                ViewManager.Show<RewardPreView>(new object[] { rewards, "到达奖励", "到达该区域所有地点时可领取" });
             }
             else if (state == ConstBonusStatus.CAN_GET)
             {

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

@@ -194,8 +194,9 @@ namespace GFGGame
         {
             int lv = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
             _ui.m_comExpBar.m_txtLvl.text = string.Format("等级 {0}", GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
-            float exp = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
-            float cfgExp = RoleLevelCfgArray.Instance.GetCfg(lv).exp;
+            int exp = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
+            int cfgExp = RoleLevelCfgArray.Instance.GetCfg(lv).exp;
+            _ui.m_comExpBar.m_pbExp.m_title.text = string.Format("{0}/{1}", exp, cfgExp);
             float initWidth = _ui.m_comExpBar.m_pbExp.m_bar.target.initWidth;
             float curWidth = _ui.m_comExpBar.m_pbExp.m_bar.target.width;
             float width = exp / cfgExp * initWidth;

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

@@ -27,7 +27,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_11");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjtj_bjbj");
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_comphoto.target.onClick.Add(OnComPhotoClick);