Browse Source

画廊商店

zhaoyang 2 years ago
parent
commit
18a4416264
25 changed files with 325 additions and 43 deletions
  1. 3 3
      FGUIProject/assets/ClothingShop/ClothingShopUI.xml
  2. 8 0
      FGUIProject/assets/CommonGame/RuleUI.xml
  3. 3 3
      FGUIProject/assets/CommonGame/components/ComponentValueBar.xml
  4. 1 0
      FGUIProject/assets/CommonGame/package.xml
  5. 3 0
      FGUIProject/assets/Travel/TravelUI.xml
  6. 2 2
      FGUIProject/assets/Travel/components/Button2.xml
  7. 5 6
      GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs
  8. 1 1
      GameClient/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs
  9. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs
  10. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs.meta
  11. 27 17
      GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs
  12. 60 0
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs
  13. 11 0
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs.meta
  14. 8 8
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  15. 2 0
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs
  16. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs
  17. 5 1
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs
  18. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs
  19. BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  21. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_atlas0.png
  22. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_1.png
  23. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_2.png
  24. 96 0
      GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_2.png.meta
  25. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_fui.bytes

+ 3 - 3
FGUIProject/assets/ClothingShop/ClothingShopUI.xml

@@ -77,12 +77,12 @@
       </item>
     </list>
     <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
-    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,105">
-      <gearXY controller="c1" pages="2,3,4,5" values="159,90|159,90|159,105|159,105" default="159,105"/>
+    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,105">
+      <gearXY controller="c1" pages="2,3,4,5,6" values="159,90|159,90|159,105|159,105|0,105"/>
     </component>
     <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>
-    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="154,52" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="画廊商店">
+    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="画廊商店">
       <gearText controller="c1" pages="4,6" values="落星商店|画廊商店" default="活动商店"/>
     </text>
     <group id="n51_f5bl" name="grpTop" xy="282,103" size="516,55" advanced="true">

+ 8 - 0
FGUIProject/assets/CommonGame/RuleUI.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="800,1200">
+  <displayList>
+    <image id="n2_r9ri" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="800,1200"/>
+    <text id="n0_r9ri" name="txtTitle" xy="309,91" size="182,42" fontSize="30" text="积分奖励规则"/>
+    <richtext id="n1_r9ri" name="txtContent" xy="126,293" size="528,368" fontSize="30" ubb="true" autoSize="none" text=""/>
+  </displayList>
+</component>

+ 3 - 3
FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -12,12 +12,12 @@
   <displayList>
     <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="3"/>
-      <gearXY controller="c1" pages="3" values="688,2" default="460,5"/>
+      <gearXY controller="c1" pages="3" values="814,2" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
     <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="4"/>
-      <gearXY controller="c1" pages="4" values="688,2" default="460,5"/>
+      <gearXY controller="c1" pages="4" values="814,2" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
     <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="0,5">
@@ -52,7 +52,7 @@
     </component>
     <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,2">
       <gearDisplay controller="c1" pages="9"/>
-      <gearXY controller="c1" pages="0,1,5,6,8,9" values="814,2|684,2|684,2|684,2|814,2|814,2" default="688,5"/>
+      <gearXY controller="c1" pages="0,1,3,5,6,8,9" values="814,2|684,2|814,2|684,2|684,2|814,2|814,2" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
   </displayList>

+ 1 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -218,6 +218,7 @@
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
     <image id="r9ritjk" name="tc_tydikua_1.png" path="/imgnew/"/>
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
+    <component id="r9ritjn" name="RuleUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 3 - 0
FGUIProject/assets/Travel/TravelUI.xml

@@ -17,6 +17,9 @@
       <property target="loaTitle" propertyId="1" value="ui://jitclg1gwono1a"/>
     </component>
     <image id="n8_wono" name="n8" src="wonoo" fileName="images/xqfs_yldik_1.png" xy="2,254" group="n16_wono"/>
+    <loader id="n17_r9ri" name="n17" xy="250,413" size="495,749" group="n16_wono" url="ui://jitclg1gwono9" autoSize="true">
+      <gearIcon controller="c1" pages="0,1" values="ui://jitclg1gwono9|ui://jitclg1gwonob" default="ui://jitclg1gwonoa"/>
+    </loader>
     <component id="n1_wono" name="btnTips" src="wono3" fileName="components/Button1.xml" xy="926,346" group="n16_wono">
       <Button title="tips" controller="c2" page="1"/>
     </component>

+ 2 - 2
FGUIProject/assets/Travel/components/Button2.xml

@@ -4,8 +4,8 @@
   <displayList>
     <image id="n4_wono" name="n4" src="wonok" fileName="images/xqfs_ylshul_2.png" xy="0,0"/>
     <image id="n5_wono" name="n5" src="wonop" fileName="images/xqfs_ylshul_1.png" xy="-94,140"/>
-    <loader id="n6_wono" name="loaIcon" xy="45,167" size="60,60" url="ui://eg2y0ldpkztethq" autoSize="true"/>
-    <text id="n7_wono" name="txtCount" xy="119,168" size="44,56" font="ui://eg2y0ldpwonotj9" fontSize="42" color="#f7f2da" strokeColor="#cba461" strokeSize="2" text="-3"/>
+    <loader id="n6_wono" name="loaIcon" xy="49,167" size="60,60" url="ui://eg2y0ldpkztethq" autoSize="true"/>
+    <text id="n7_wono" name="txtCount" xy="128,168" size="29,56" font="ui://eg2y0ldpwonotj9" fontSize="42" color="#f7f2da" strokeColor="#cba461" strokeSize="2" text="1"/>
   </displayList>
   <Button/>
 </component>

+ 5 - 6
GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs

@@ -18,8 +18,7 @@ namespace GFGGame
     }
     public class PhotographDataManager : SingletonBase<PhotographDataManager>
     {
-        public const int BORDERID = 4000013;
-        public const int EffectID = 4000015;
+
         public List<GameObject> itemGameObjs = new List<GameObject>();
 
         public List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
@@ -115,16 +114,16 @@ namespace GFGGame
                     break;
                 case EnumPhotographType.BORDER:
                     _listData = PhotographDataManager.Instance.listBorderData;
-                    if (_listData.IndexOf(BORDERID) < 0)
+                    if (_listData.IndexOf(ConstItemID.BORDERID) < 0)
                     {
-                        _listData.Insert(0, BORDERID);
+                        _listData.Insert(0, ConstItemID.BORDERID);
                     }
                     break;
                 case EnumPhotographType.EFFECT:
                     _listData = PhotographDataManager.Instance.listEffectData;
-                    if (_listData.IndexOf(EffectID) < 0)
+                    if (_listData.IndexOf(ConstItemID.EffectID) < 0)
                     {
-                        _listData.Insert(0, EffectID);
+                        _listData.Insert(0, ConstItemID.EffectID);
                     }
                     break;
             }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs

@@ -25,7 +25,7 @@ namespace GFGGame
             {
                 spr.sprite = null;
             }
-            if (itemCfg.id == PhotographDataManager.BORDERID) return;
+            if (itemCfg.id == ConstItemID.BORDERID) return;
             string resPath = ResPathUtil.GetPhotographBorderPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
             SceneController.SetSpriteRendererToTransform(tf, resPath);
             spr = tf.GetComponent<SpriteRenderer>();

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_RuleUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GTextField m_txtTitle;
+        public GRichTextField m_txtContent;
+        public const string URL = "ui://eg2y0ldpr9ritjn";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "RuleUI";
+        private static UI_RuleUI _proxy;
+
+        public static UI_RuleUI Create(GObject gObject = null)
+        {
+            var ui = new UI_RuleUI();
+            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_RuleUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RuleUI();
+            }
+            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_bg = (GImage)comp.GetChild("bg");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtContent = (GRichTextField)comp.GetChild("txtContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_txtTitle = null;
+            m_txtContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs.meta

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

+ 27 - 17
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -58,6 +58,10 @@ namespace GFGGame
             {
 
             });
+            _valueBar.m_btnGallery.onClick.Add(() =>
+            {
+                ViewManager.Show<RuleView>(new object[] { "积分奖励规则", "" });
+            });
         }
 
         public void Dispose()
@@ -75,8 +79,10 @@ namespace GFGGame
             UpdateCurrency();
             UpdateNumeric();
             UpdateCJExchange();
-            UpdateCJ(LuckyBoxDataManager.Instance.currentBoxId);
+            UpdateCJAExchange();
+            UpdateCJ();
             UpdateTravel();
+            UpdateGallery();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateNumeric);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItem);
         }
@@ -95,8 +101,10 @@ namespace GFGGame
         {
             UpdateCurrency();
             UpdateCJExchange();
-            UpdateCJ(LuckyBoxDataManager.Instance.currentBoxId);
+            UpdateCJAExchange();
+            UpdateCJ();
             UpdateTravel();
+            UpdateGallery();
         }
         private void UpdateCurrency()
         {
@@ -114,29 +122,24 @@ namespace GFGGame
 
         }
 
-        //ÕªÐÇ£¨³é½±£©¶Ò»»
+        //ժ�ǣ��齱���һ�
         private void UpdateCJExchange()
         {
-            int luckyBoxId1 = LuckyBoxDataManager.BOX_ID_2;
-            LuckyBoxCfg luckyBoxCfg1 = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId1);
-            _valueBar.m_btnCJLuoXing.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg1.bonusArr[0][0]);
-            _valueBar.m_btnCJLuoXing.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg1.bonusArr[0][0]).res);
-
-            int luckyBoxId2 = LuckyBoxDataManager.BOX_ID_1;
-            LuckyBoxCfg luckyBoxCfg2 = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId2);
-            _valueBar.m_btnCJHuoDong.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg2.bonusArr[0][0]);
-            _valueBar.m_btnCJHuoDong.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg2.bonusArr[0][0]).res);
-
-
+            _valueBar.m_btnCJLuoXing.text = "" + ItemDataManager.GetItemNum(ConstItemID.LUCKYBOX_STORE_COST);
+            _valueBar.m_btnCJLuoXing.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LUCKYBOX_STORE_COST).res);
         }
-        public void UpdateCJ(int id)
+        private void UpdateCJAExchange()
         {
+            _valueBar.m_btnCJHuoDong.text = "" + ItemDataManager.GetItemNum(ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST);
+            _valueBar.m_btnCJHuoDong.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST).res);
+        }
 
-            LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(id);
+        public void UpdateCJ()
+        {
+            LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId);
             if (luckyBoxCfg == null) return;
             _valueBar.m_btnCJ.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg.costID);
             _valueBar.m_btnCJ.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
-
         }
 
         private void UpdateTravel()
@@ -146,5 +149,12 @@ namespace GFGGame
             _valueBar.m_btnTravel.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(itemId).res);
 
         }
+
+        private void UpdateGallery()
+        {
+            _valueBar.m_btnGallery.text = "" + ItemDataManager.GetItemNum(ConstItemID.GALLERY_STORE_COST);
+            _valueBar.m_btnGallery.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.GALLERY_STORE_COST).res);
+
+        }
     }
 }

+ 60 - 0
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs

@@ -0,0 +1,60 @@
+using ET;
+using FairyGUI;
+using UI.CommonGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class RuleView : BaseWindow
+    {
+        private UI_RuleUI _ui;
+        private string _title;
+        private string _content;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_RuleUI.PACKAGE_NAME;
+            _ui = UI_RuleUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            this._title = (this.viewData as object[])[0].ToString();
+            this._content = (this.viewData as object[])[1].ToString();
+            this._ui.m_txtTitle.text = _title;
+            this._ui.m_txtContent.text = _content;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs.meta

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

+ 8 - 8
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -24,7 +24,7 @@ namespace GFGGame
 
         private bool isActiveBoxOpen = false;
         private int _bgIndex = 0;
-        private int _boxId = 0;
+        // private int _boxId = 0;
         private int _curIndex = 0;
 
         public override void Dispose()
@@ -94,8 +94,8 @@ namespace GFGGame
                     boxId = (int)this.viewData;
                 }
             }
-            _boxId = boxId;
-            LuckyBoxDataManager.Instance.currentBoxId = _boxId;
+            // _boxId = boxId;
+            LuckyBoxDataManager.Instance.currentBoxId = boxId;
 
             isActiveBoxOpen = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1) >= 0;
             if (isActiveBoxOpen)
@@ -178,7 +178,7 @@ namespace GFGGame
 
         private void UpdateBg(object param)
         {
-            string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(_boxId).resArr;
+            string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId).resArr;
             _bgIndex++;
             if (_bgIndex >= resArr.Length) _bgIndex = 0;
             GLoader loaBg = _ui.m_listBg.GetChildAt(0).asCom.GetChild("loaBg").asLoader;
@@ -205,14 +205,14 @@ namespace GFGGame
         private void OnListBgScroll()
         {
             _curIndex = _ui.m_listBg.ChildIndexToItemIndex(0);
-            _boxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
-            _valueBarController.UpdateCJ(_boxId);
+            LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
             _bgIndex = 0;
-            LuckyBoxDataManager.Instance.currentBoxId = _boxId;
+            _valueBarController.UpdateCJ();
 
             _ui.m_btnLeft.grayed = _curIndex <= 0;
             _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
-            if (_boxId == LuckyBoxDataManager.BOX_ID_1)
+
+            if (LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1)
             {
                 Timers.inst.Add(1, 0, CheckTime);
             }

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs

@@ -38,10 +38,12 @@ namespace GFGGame
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.scrollPane.onScrollEnd.Add(OnListScrollEnd);
+            _ui.m_list.scrollPane.decelerationRate = 0.8f;
 
             _ui.m_listTravel.SetVirtual();
             _ui.m_listTravel.itemRenderer = RenderListTravelItem;
             _ui.m_listTravel.scrollPane.onScrollEnd.Add(OnListScrollEnd);
+            _ui.m_listTravel.scrollPane.decelerationRate = 0.8f;
 
             _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
             _ui.m_btnRight.onClick.Add(OnBtnRightClick);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs

@@ -34,7 +34,7 @@ namespace GFGGame
             _ui.m_graBg.onClick.Add(OnBtnBackClick);
             _ui.m_btnSave.onClick.Add(OnBtnSaveClick);
             _ui.m_btnShare.onClick.Add(OnBtnShareClick);
-
+            _ui.m_btnShare.visible = false;
         }
         protected override void AddEventListener()
         {

+ 5 - 1
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs

@@ -55,11 +55,15 @@ namespace GFGGame
             base.OnShown();
             _ui.m_c1.selectedIndex = (this.viewData == null) ? (int)PictureSourceType.PersonalAlbum : (int)this.viewData;
             OnBtnTabChange();
+            UpdateView();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _ui.m_c2.selectedIndex = 0;
+            _listDelete.Clear();
+
         }
 
         protected override void RemoveEventListener()
@@ -98,7 +102,7 @@ namespace GFGGame
             _ui.m_c2.selectedIndex = 0;
             _listDelete.Clear();
 
-            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+            // if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
             UpdateView();
 
         }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -79,7 +79,7 @@ namespace GFGGame
             {
                 ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.travelCostArr[0]);
                 _ui.m_btnGo.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
-                _ui.m_btnGo.m_txtCount.text = string.Format("-{0}", GlobalCfgArray.globalCfg.travelCostArr[1]);
+                _ui.m_btnGo.m_txtCount.text = string.Format("{0}", GlobalCfgArray.globalCfg.travelCostArr[1]);
             }
             else if (_ui.m_c1.selectedIndex == (int)TravelGuideType.Travel)
             {

BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Travel/Travel_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_2.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_2.png.meta

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

BIN
GameClient/Assets/ResIn/UI/Travel/Travel_fui.bytes