新年活动合成

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_AcrtivitySyntheticUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_AcrtivitySyntheticUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_listSynthetic;
+        public const string URL = "ui://wpsqkdbzyo402e";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "AcrtivitySyntheticUI";
+        private static UI_AcrtivitySyntheticUI _proxy;
+
+        public static UI_AcrtivitySyntheticUI Create(GObject gObject = null)
+        {
+            var ui = new UI_AcrtivitySyntheticUI();
+            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_AcrtivitySyntheticUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_AcrtivitySyntheticUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_listSynthetic = (GList)comp.GetChild("listSynthetic");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listSynthetic = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_AcrtivitySyntheticUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_SyntheticItemUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_SyntheticItemUI
+    {
+        public GComponent target;
+        public Controller m_btnType;
+        public GComponent m_item1;
+        public GComponent m_item2;
+        public GComponent m_item3;
+        public GButton m_btnMake;
+        public GButton m_btnGet;
+        public const string URL = "ui://wpsqkdbzyo402m";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "SyntheticItemUI";
+        private static UI_SyntheticItemUI _proxy;
+
+        public static UI_SyntheticItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SyntheticItemUI();
+            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_SyntheticItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SyntheticItemUI();
+            }
+            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_btnType = comp.GetController("btnType");
+            m_item1 = (GComponent)comp.GetChild("item1");
+            m_item2 = (GComponent)comp.GetChild("item2");
+            m_item3 = (GComponent)comp.GetChild("item3");
+            m_btnMake = (GButton)comp.GetChild("btnMake");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnType = null;
+            m_item1 = null;
+            m_item2 = null;
+            m_item3 = null;
+            m_btnMake = null;
+            m_btnGet = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_SyntheticItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivitySyntheticView.cs

@@ -0,0 +1,131 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UI.DressUp;
+using FairyGUI;
+using UI.ActivityAfternoonTea;
+using UI.CommonGame;
+
+namespace GFGGame
+{
+    public class ActivitySyntheticView : BaseWindow
+    {
+        private UI_AcrtivitySyntheticUI _ui;
+        private SuitCfg _suitCfg;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_AcrtivitySyntheticUI.PACKAGE_NAME;
+            _ui = UI_AcrtivitySyntheticUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_listSynthetic.itemRenderer = RenderListSyntheticItem;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(5005);
+            _suitCfg = SuitCfgArray.Instance.GetCfg(activityOpenCfg.paramsArr[0]);
+            _ui.m_listSynthetic.numItems = _suitCfg.partsArr.Length;
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ActivitySyntheticView).FullName);
+        }
+
+        private void RenderListSyntheticItem(int index, GObject obj)
+        {
+            UI_SyntheticItemUI comBox = UI_SyntheticItemUI.Proxy(obj);
+            UI_ComItem item1 = UI_ComItem.Proxy(comBox.m_item1);
+            ItemCfg itemSyntheticCfg = ItemCfgArray.Instance.GetCfg(_suitCfg.partsArr[index]);
+            var materiarsArr = itemSyntheticCfg.syntheticMateriarsArr;
+            ItemCfg itemCfg1 = ItemCfgArray.Instance.GetCfg(materiarsArr[0][0]);
+            RarityIconController.UpdateRarityIcon(item1.m_loaRarity, itemCfg1.id, false);
+            string ext1 = ItemUtil.GetItemResExt(itemCfg1.itemType, itemCfg1.subType, true);
+            item1.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg1.res, ext1);
+            if(item1.target.data == null)
+                item1.target.onClick.Add(OnSelectorItemClick);
+            item1.target.data = materiarsArr[0][0];
+            item1.m_QualityType.selectedIndex = itemCfg1.rarity - 1;
+            item1.m_txtCount.text = materiarsArr[0][1].ToString();
+            UI_ComItem.ProxyEnd();
+
+            UI_ComItem item2 = UI_ComItem.Proxy(comBox.m_item2);
+            ItemCfg itemCfg2 = ItemCfgArray.Instance.GetCfg(materiarsArr[1][0]);
+            RarityIconController.UpdateRarityIcon(item2.m_loaRarity, itemCfg2.id, false);
+            string ext2 = ItemUtil.GetItemResExt(itemCfg2.itemType, itemCfg2.subType, true);
+            item2.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg2.res, ext2);
+            if (item2.target.data == null)
+                item2.target.onClick.Add(OnSelectorItemClick);
+            item2.target.data = materiarsArr[1][0];
+            item2.m_QualityType.selectedIndex = itemCfg2.rarity - 1;
+            item2.m_txtCount.text = materiarsArr[1][1].ToString();
+            UI_ComItem.ProxyEnd();
+
+            UI_ComItem item3 = UI_ComItem.Proxy(comBox.m_item3);
+            ItemCfg itemCfg3 = ItemCfgArray.Instance.GetCfg(_suitCfg.partsArr[index]);
+            RarityIconController.UpdateRarityIcon(item3.m_loaRarity, itemCfg3.id, false);
+            string ext3 = ItemUtil.GetItemResExt(itemCfg3.itemType, itemCfg3.subType, true);
+            item3.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg3.res, ext3);
+            if (item3.target.data == null)
+                item3.target.onClick.Add(OnSelectorItemClick);
+            item3.target.data = _suitCfg.partsArr[index];
+            item3.m_QualityType.selectedIndex = itemCfg3.rarity - 1;
+            item3.m_txtCount.text = "1";
+            UI_ComItem.ProxyEnd();
+
+            if (ItemDataManager.GetItemNum(_suitCfg.partsArr[index]) > 0)
+            {
+                comBox.m_btnType.selectedIndex = 2;
+            }
+            else if (materiarsArr[0][1] >= ItemDataManager.GetItemNum(materiarsArr[0][0]) && materiarsArr[1][1] >= ItemDataManager.GetItemNum(materiarsArr[1][0]))
+            {
+                comBox.m_btnType.selectedIndex = 1;
+                if(comBox.m_btnMake.data == null)
+                    comBox.m_btnMake.onClick.Add(OnClickBtnMake);
+
+                comBox.m_btnMake.data = index;
+            }
+            else { 
+                comBox.m_btnType.selectedIndex = 0;
+                if (comBox.m_btnGet.data == null)
+                    comBox.m_btnGet.onClick.Add(OnClickBtnGet);
+
+                comBox.m_btnGet.data = index;
+            }
+            UI_SyntheticItemUI.ProxyEnd();
+        }
+
+        private void OnClickBtnMake()
+        {
+
+        }
+
+        private void OnClickBtnGet()
+        {
+            ViewManager.Show<StoryChapterView>();
+        }
+
+        private void OnSelectorItemClick(EventContext context)
+        {
+            if (!(context.sender is GObject obj)) return;
+            int itemID = (int)obj.data;
+            GoodsItemTipsController.ShowItemTips(itemID);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivitySyntheticView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -81,13 +81,13 @@ namespace GFGGame
 
         private void OnClickBtnMergeView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.ItemSynthetic))
-            {
-                PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
-                return;
-            }
+            //if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.ItemSynthetic))
+            //{
+            //    PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
+            //    return;
+            //}
             //合成入口
-
+            ViewManager.Show<ActivitySyntheticView>();
         }
 
     }