zhaoyang 2 жил өмнө
parent
commit
29f9e4db95

+ 19 - 13
FGUIProject/assets/Store/components/ListVipItem.xml

@@ -14,11 +14,14 @@
     <text id="n43_qik1" name="txtName3" xy="120,176" pivot="0.5,0" size="34,41" group="n45_qik1" fontSize="30" color="#915e15" text="婵"/>
     <text id="n44_qik1" name="txtName4" xy="116,203" pivot="0.5,0" size="41,122" group="n45_qik1" fontSize="36" color="#915e15" align="center" leading="-12" autoSize="none" text="婵娟"/>
     <group id="n45_qik1" name="n45" xy="80,60" size="96,265" group="n58_qik1"/>
-    <image id="n46_qik1" name="n46" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,113" pivot="0.5,0.5" group="n49_qik1" scale="-1,1"/>
-    <text id="n48_qik1" name="txtGiftBag" xy="649,100" pivot="0.5,0" size="244,44" group="n49_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级特级礼包"/>
-    <image id="n47_qik1" name="n47" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,113" pivot="0.5,0.5" group="n49_qik1"/>
-    <group id="n49_qik1" name="n49" xy="582,100" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
-    <list id="n50_qik1" name="listGiftBag" xy="574,161" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+    <image id="n46_qik1" name="n46" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,88" pivot="0.5,0.5" group="n49_qik1" scale="-1,1"/>
+    <text id="n48_qik1" name="txtGiftBag" xy="649,75" pivot="0.5,0" size="244,44" group="n49_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级特级礼包"/>
+    <image id="n47_qik1" name="n47" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,88" pivot="0.5,0.5" group="n49_qik1"/>
+    <group id="n49_qik1" name="n49" xy="582,75" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n50_qik1" name="listGiftBag" xy="588,132" size="601,447" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" overflow="scroll" lineGap="15" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
@@ -26,12 +29,15 @@
       <item/>
       <item/>
     </list>
-    <component id="n56_qik1" name="btnGetGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,445" group="n58_qik1"/>
-    <image id="n51_qik1" name="n51" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,565" pivot="0.5,0.5" group="n54_qik1" scale="-1,1"/>
-    <text id="n52_qik1" name="txtWeekGiftBag" xy="649,552" pivot="0.5,0" size="244,44" group="n54_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级每周礼包"/>
-    <image id="n53_qik1" name="n53" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,565" pivot="0.5,0.5" group="n54_qik1"/>
-    <group id="n54_qik1" name="n54" xy="582,552" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
-    <list id="n55_qik1" name="listWeekGiftBag" xy="574,619" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+    <component id="n56_qik1" name="btnGetGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="690,445" group="n58_qik1"/>
+    <image id="n51_qik1" name="n51" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,557" pivot="0.5,0.5" group="n54_qik1" scale="-1,1"/>
+    <text id="n52_qik1" name="txtWeekGiftBag" xy="649,544" pivot="0.5,0" size="244,44" group="n54_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级每周礼包"/>
+    <image id="n53_qik1" name="n53" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,557" pivot="0.5,0.5" group="n54_qik1"/>
+    <group id="n54_qik1" name="n54" xy="582,544" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n55_qik1" name="listWeekGiftBag" xy="588,601" size="601,444" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" overflow="scroll" lineGap="15" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
@@ -39,8 +45,8 @@
       <item/>
       <item/>
     </list>
-    <component id="n57_qik1" name="btnGetWeekGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,906" group="n58_qik1"/>
-    <group id="n58_qik1" name="n58" xy="80,0" size="1095,1037"/>
+    <component id="n57_qik1" name="btnGetWeekGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="690,914" group="n58_qik1"/>
+    <group id="n58_qik1" name="n58" xy="80,0" size="1109,1045"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs

@@ -38,6 +38,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_SuitShowUI.PACKAGE_NAME;
             _ui = UI_SuitShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
@@ -112,7 +113,7 @@ namespace GFGGame
             _actionIsPic = isPic;
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_suitId);
             _ui.m_txtSuitName.text = suitCfg.name;
-            _dressUpObjUI.ResetSceneObj(100, false,true,null,false);
+            _dressUpObjUI.ResetSceneObj(100, false, true, null, false);
             _dressUpObjUI.dressUpObj.PutOnSuitCfg(_suitId, isPic, new int[] { ConstDressUpItemType.BEI_JING });
             _dressUpObjUI.UpdateWrapper(_ui.m_holder);
             UpdateSuitBoxStatus();

+ 27 - 3
GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -130,10 +130,15 @@ namespace GFGGame
                 _dressUpObjUIs.Add(dressUpObjUI);
             }
             _dressUpObjUI = item.m_holder.data as DressUpObjUI;
-            _dressUpObjUI.ResetSceneObj(90, false, true, null, false);
+            _dressUpObjUI.ResetSceneObj(85, false, true, null, false);
             _dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, true, false);
             _dressUpObjUI.UpdateWrapper(item.m_holder);
 
+            if (item.m_btnShow.data == null)
+            {
+                item.m_btnShow.onClick.Add(OnBtnShowClick);
+            }
+            item.m_btnShow.data = vipCfg.suitId;
             if (item.m_btnGetGiftBag.data == null)
             {
                 item.m_btnGetGiftBag.onClick.Add(OnBtnGetGiftBagClick);
@@ -165,6 +170,23 @@ namespace GFGGame
             (obj.data as ItemView).SetData(itemData);
             (obj.data as ItemView).ChangeTxtCountStyle();
         }
+
+        private void OnBtnShowClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int suitId = (int)obj.data;
+            int _suitTypeId = 0;
+            for (int i = 0; i < SuitGuideMenuCfgArray.Instance.dataArray.Length; i++)
+            {
+                string[] suitIds = SuitGuideMenuCfgArray.Instance.dataArray[i].suitIds.Split(';');
+                if (Array.IndexOf(suitIds, suitId.ToString()) >= 0)
+                {
+                    _suitTypeId = SuitGuideMenuCfgArray.Instance.dataArray[i].id;
+                    break;
+                }
+            }
+            ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, new List<int>() { suitId } });
+        }
         private void OnBtnGetGiftBagClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
@@ -193,19 +215,21 @@ namespace GFGGame
             if (_curSelectIndex == 0) return;
             _curSelectIndex = _curSelectIndex - 1;
             _ui.m_list.ScrollToView(_curSelectIndex, true);
-            _ui.m_list.selectedIndex = _curSelectIndex;
+            // _ui.m_list.selectedIndex = _curSelectIndex;
         }
         private void OnBtnRightClick()
         {
             if (_curSelectIndex == _ui.m_list.numItems - 1) return;
             _curSelectIndex = _curSelectIndex + 1;
             _ui.m_list.ScrollToView(_curSelectIndex, true);
-            _ui.m_list.selectedIndex = _curSelectIndex;
+            // _ui.m_list.selectedIndex = _curSelectIndex;
         }
         private void UpdateSuitView()
         {
             _curSelectIndex = _ui.m_list.GetFirstChildInView();
             _ui.m_list.selectedIndex = _curSelectIndex;
         }
+
+
     }
 }

BIN
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes