zhaoyang 3 tahun lalu
induk
melakukan
80a40b59da

+ 4 - 4
FGUIProject/assets/Studio/StudioUI.xml

@@ -2,9 +2,9 @@
 <component size="1080,1920">
   <displayList>
     <component id="n1_rbxq" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="ComEctype.xml" xy="638,681"/>
-    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="ComEctype.xml" xy="255,812"/>
-    <component id="n4_rbxq" name="ComScore" src="rbxq5" fileName="ComEctype.xml" xy="167,1314"/>
-    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="ComEctype.xml" xy="684,1453"/>
+    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="638,681"/>
+    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="255,812"/>
+    <component id="n4_rbxq" name="comProperty" src="rbxq5" fileName="components/ComEctype.xml" xy="167,1314"/>
+    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="684,1453"/>
   </displayList>
 </component>

+ 1 - 1
GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 32b9cf7ac9d5693e5041c23de15ca73b424f62eb
+Subproject commit f5a091e069da3bb5b4dbce42e6da2396cb9f6b58

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioUI.cs

@@ -10,7 +10,7 @@ namespace UI.Studio
         public GButton m_btnBack;
         public GComponent m_comMetal;
         public GComponent m_comFabric;
-        public GComponent m_ComScore;
+        public GComponent m_comProperty;
         public GComponent m_comFiling;
         public const string URL = "ui://xz8kxrecrbxq0";
         public const string PACKAGE_NAME = "Studio";
@@ -62,7 +62,7 @@ namespace UI.Studio
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comMetal = (GComponent)comp.GetChild("comMetal");
             m_comFabric = (GComponent)comp.GetChild("comFabric");
-            m_ComScore = (GComponent)comp.GetChild("ComScore");
+            m_comProperty = (GComponent)comp.GetChild("comProperty");
             m_comFiling = (GComponent)comp.GetChild("comFiling");
         }
         public void Dispose(bool disposeTarget = false)
@@ -70,7 +70,7 @@ namespace UI.Studio
             m_btnBack = null;
             m_comMetal = null;
             m_comFabric = null;
-            m_ComScore = null;
+            m_comProperty = null;
             m_comFiling = null;
             if(disposeTarget && target != null)
             {

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs

@@ -1,4 +1,5 @@
 
+using System.Collections.Generic;
 using FairyGUI;
 using UI.Studio;
 
@@ -7,7 +8,7 @@ namespace GFGGame
     public class StudioBaseView : BaseWindow
     {
         protected UI_StudioEctypeUI _ui;
-
+        protected List<StudioCfg> studioCfgs;
 
         public override void Dispose()
         {

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -24,6 +24,7 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_c1.selectedIndex = 0;
+            this.studioCfgs = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioFabricView).FullName);
         }
 
         protected override void OnHide()

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs

@@ -23,6 +23,7 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_c1.selectedIndex = 0;
+            this.studioCfgs = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioMetalView).FullName);
 
         }
 

+ 16 - 1
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -16,24 +16,39 @@ namespace GFGGame
         {
             base.OnInit();
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-
+            _ui.m_listProperty.itemRenderer = ListPropertyItemRender;
+            _ui.m_listProperty.onClickItem.Add(OnClickListProperty);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
             _ui.m_c1.selectedIndex = 1;
+            this.studioCfgs = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioPropertyView).FullName);
 
+            _ui.m_listProperty.numItems = this.studioCfgs.Count;
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+
         }
 
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(StudioPropertyView).FullName);
         }
+        private void ListPropertyItemRender(int index, GObject obj)
+        {
+            UI_ListPropertyItem item = UI_ListPropertyItem.Proxy(obj);
+
+            item.target.data = this.studioCfgs[index];
+        }
+        private void OnClickListProperty(EventContext context)
+        {
+            UI_ListPropertyItem item = UI_ListPropertyItem.Proxy(context.data as GObject);
+            StudioCfg cfg = item.target.data as StudioCfg;
+        }
     }
 }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -26,6 +26,7 @@ namespace GFGGame
             // EventAgent.AddEventListener(ConstMessage.MAINTAIN_SUIT, OnListenerFoster);
             // EventAgent.AddEventListener(ConstMessage.GET_MAINTAIN_SUIT_BONUS, OnListenerGetFosterReward);
             // EventAgent.AddEventListener(ConstMessage.MAKE_NEW_SUIT, OnListenerRenew);
+            // _ui.com
         }
 
         protected override void OnShown()

TEMPAT SAMPAH
GameClient/Assets/ResIn/UI/Studio_fui.bytes