开服关卡ui细节调整

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_CompFlower.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_CompFlower
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GImage m_f1;
+        public GImage m_f2;
+        public GImage m_f3;
+        public const string URL = "ui://b8ha2mnsrv7eq";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "CompFlower";
+        private static UI_CompFlower _proxy;
+
+        public static UI_CompFlower Create(GObject gObject = null)
+        {
+            var ui = new UI_CompFlower();
+            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_CompFlower Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompFlower();
+            }
+            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_c1 = comp.GetController("c1");
+            m_f1 = (GImage)comp.GetChild("f1");
+            m_f2 = (GImage)comp.GetChild("f2");
+            m_f3 = (GImage)comp.GetChild("f3");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_f1 = null;
+            m_f2 = null;
+            m_f3 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_CompFlower.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenSererFightItem.cs

@@ -0,0 +1,108 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenSererFightItem
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GLoader m_loaIcon;
+        public GLoader m_loaItem;
+        public GTextField m_txtName;
+        public UI_CompFlower m_comFlower;
+        public GImage m_imgLockBg;
+        public GImage m_imgLock;
+        public GGroup m_grpLock;
+        public GGroup m_comFirstPass;
+        public GGroup m_Panel;
+        public Transition m_ToLeft;
+        public Transition m_ToRight;
+        public Transition m_Left;
+        public const string URL = "ui://b8ha2mnsrv7eo";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenSererFightItem";
+        private static UI_OpenSererFightItem _proxy;
+
+        public static UI_OpenSererFightItem Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenSererFightItem();
+            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_OpenSererFightItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenSererFightItem();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_loaItem = (GLoader)comp.GetChild("loaItem");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_comFlower = (UI_CompFlower)UI_CompFlower.Create(comp.GetChild("comFlower"));
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
+            m_comFirstPass = (GGroup)comp.GetChild("comFirstPass");
+            m_Panel = (GGroup)comp.GetChild("Panel");
+            m_ToLeft = comp.GetTransition("ToLeft");
+            m_ToRight = comp.GetTransition("ToRight");
+            m_Left = comp.GetTransition("Left");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_loaIcon = null;
+            m_loaItem = null;
+            m_txtName = null;
+            m_comFlower.Dispose();
+            m_comFlower = null;
+            m_imgLockBg = null;
+            m_imgLock = null;
+            m_grpLock = null;
+            m_comFirstPass = null;
+            m_Panel = null;
+            m_ToLeft = null;
+            m_ToRight = null;
+            m_Left = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenSererFightItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerFightUI.cs

@@ -11,6 +11,8 @@ namespace UI.OpenServerActivity
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public GList m_list;
+        public GLoader m_iconSuidAdd;
+        public GTextField m_txtFreeNum;
         public const string URL = "ui://b8ha2mnspll2h";
         public const string PACKAGE_NAME = "OpenServerActivity";
         public const string RES_NAME = "OpenServerFightUI";
@@ -62,6 +64,8 @@ namespace UI.OpenServerActivity
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_list = (GList)comp.GetChild("list");
+            m_iconSuidAdd = (GLoader)comp.GetChild("iconSuidAdd");
+            m_txtFreeNum = (GTextField)comp.GetChild("txtFreeNum");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +73,8 @@ namespace UI.OpenServerActivity
             m_valueBar = null;
             m_btnBack = null;
             m_list = null;
+            m_iconSuidAdd = null;
+            m_txtFreeNum = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerFightView.cs

@@ -42,6 +42,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_iconSuidAdd.onClick.Add(OnClickIconSuidAdd);
         }
 
         protected override void AddEventListener()
@@ -62,6 +63,8 @@ namespace GFGGame
             _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_activityFightCfg.type, _activityFightCfg.subType, _activityCfg.params3Arr[0]);
             _ui.m_list.numItems = _storyLevelCfgs.Count;
             UpdateItem();
+
+            _ui.m_txtFreeNum.text = "10/11";
         }
 
         protected override void OnHide()
@@ -79,10 +82,15 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(OpenServerFightView).FullName);
         }
 
+        private void OnClickIconSuidAdd()
+        {
+            ViewManager.GoBackFrom(typeof(OpenServerFightView).FullName);
+        }
+        
         private void RenderListItem(int index, GObject obj)
         {
             // int _index = _storyLevelCfgs.Count - index - 1;
-            UI_ListLevelItem item = UI_ListLevelItem.Proxy(obj);
+            UI_OpenSererFightItem item = UI_OpenSererFightItem.Proxy(obj);
             //item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
             item.m_txtName.text = _storyLevelCfgs[index].name;
             bool isFight = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID);
@@ -112,13 +120,19 @@ namespace GFGGame
                 item.m_loaIcon.url = string.Format("ui://Studio/{0}", _activityFightCfg.res);
             }
             item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
+
+            if (!item.m_grpLock.visible)
+                item.m_comFirstPass.visible = !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index].id);
+            else
+                item.m_comFirstPass.visible = false;
+
             item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
             if (item.m_loaBg.data == null)
             {
                 item.m_loaBg.onClick.Add(OnListItemClick);
             }
             item.m_loaBg.data = index;
-            UI_ListLevelItem.ProxyEnd();
+            UI_OpenSererFightItem.ProxyEnd();
         }
 
         private void OnListItemClick(EventContext context)