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

FGUIProject/assets/CommonGame/ComListReward.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1000,700" overflow="hidden" opaque="false">
+<component size="1000,980" overflow="hidden" opaque="false">
   <displayList>
-    <list id="n6_m9wm" name="listReward" xy="-9,-52" size="1010,751" layout="flow_hz" overflow="scroll" scrollBarFlags="256" lineGap="-150" colGap="-100" defaultItem="ui://eg2y0ldpm9wm8u" autoItemSize="true">
-      <relation target="" sidePair="width-width,height-height,center-center"/>
+    <list id="n6_m9wm" name="listReward" xy="-5,-52" size="1010,1030" layout="flow_hz" overflow="scroll" scrollBarFlags="256" lineGap="-150" colGap="-100" defaultItem="ui://eg2y0ldpm9wm8u" autoItemSize="true">
       <item/>
       <item/>
       <item/>
@@ -19,4 +18,5 @@
       <item/>
     </list>
   </displayList>
+  <relation target="n6_m9wm" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/RewardUI.xml

@@ -5,8 +5,8 @@
     <image id="n1_m9wm" name="imgTitle" src="m9wm8r" fileName="images/gxhd_btbt.png" xy="0,300" group="n8_m9wm">
       <relation target="" sidePair="center-center"/>
     </image>
-    <component id="n6_m9wm" name="comListReward" src="kztethp" fileName="ComListReward.xml" xy="49,577" size="1000,700" group="n8_m9wm"/>
-    <group id="n8_m9wm" name="grp" xy="0,300" size="1080,977" advanced="true"/>
+    <component id="n6_m9wm" name="comListReward" src="kztethp" fileName="ComListReward.xml" xy="49,577" size="1000,1030" group="n8_m9wm"/>
+    <group id="n8_m9wm" name="grp" xy="0,300" size="1080,1307" advanced="true"/>
     <text id="n7_m9wm" name="n7" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">
       <relation target="" sidePair="bottom-bottom"/>
     </text>

FGUIProject/assets/RoleLvUp/RoleLvUpUI.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="700,900">
+<component size="700,900" opaque="false">
   <displayList>
     <image id="n0_mueb" name="n0" src="mueb2" fileName="images/sjsd_kuangdi_1.png" xy="12,0"/>
-    <text id="n1_mueb" name="txtLv" xy="350,307" pivot="0.5,0.5" anchor="true" size="190,192" fontSize="150" color="#cda45f" text="35"/>
+    <text id="n1_mueb" name="txtLv" xy="350,307" pivot="0.5,0.5" anchor="true" size="190,191" fontSize="150" color="#cda45f" text="35"/>
     <text id="n4_mueb" name="n4" xy="185,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV."/>
     <text id="n3_mueb" name="txtLastLv" xy="240,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="34"/>
     <text id="n5_mueb" name="n5" xy="326,624" size="47,49" group="n7_mueb" fontSize="36" color="#e4c084" text="&gt;&gt;"/>

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -396,12 +396,13 @@ namespace GFGGame
                 if (temp == itemId)
                 {
                     itemIndex = i;
-                    _ui.m_listClothing.ScrollToView(i);
                     break;
                 }
             }
 
-            GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 4, "找到需要合成的物品", itemIndex);
+            bool guide = GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 4, "找到需要合成的物品", itemIndex);
+            if (guide) _ui.m_listClothing.ScrollToView(itemIndex);
+
             if (_ui.m_listMaterias.numChildren > 0)
             {
                 listTypeItem_CloSynthetic = UI_MateriasListItem.Proxy(_ui.m_listMaterias.GetChildAt(0));

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

@@ -17,15 +17,11 @@ namespace GFGGame
         private List<GMovieClip> _effects = new List<GMovieClip>();
         // private List<GoWrapper> _wrappers = new List<GoWrapper>();
 
+        private const int maxHeight = 1030;
         public override void Dispose()
         {
             base.Dispose();
-            // _effects.c
-            // for (int i = 0; i < _effects.Count; i++)
-            // {
-            //     SceneController.DestroyObjectFromView(_effects[i]);
 
-            // }
         }
 
         protected override void OnInit()
@@ -55,6 +51,12 @@ namespace GFGGame
                 _listItemDatas = this.viewData as List<ItemData>;
             }
             _ui.m_comListReward.m_listReward.numItems = _listItemDatas.Count;
+
+            _ui.m_comListReward.m_listReward.ResizeToFit();
+            if (_ui.m_comListReward.m_listReward.height > maxHeight)
+            {
+                _ui.m_comListReward.m_listReward.height = maxHeight;
+            }
         }
         protected override void OnHide()
         {