Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs

@@ -1,89 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComIcon000
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtHasCount;
-        public GLoader m_loaRarity;
-        public GImage m_imgHas;
-        public GImage m_imgNotHas;
-        public GImage m_imgShowTong;
-        public GGroup m_grpGot;
-        public const string URL = "ui://eg2y0ldpng0itiz";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComIcon000";
-        private static UI_ComIcon000 _proxy;
-
-        public static UI_ComIcon000 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComIcon000();
-            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_ComIcon000 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComIcon000();
-            }
-            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_imgHas = (GImage)comp.GetChild("imgHas");
-            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
-            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
-            m_grpGot = (GGroup)comp.GetChild("grpGot");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtHasCount = null;
-            m_loaRarity = null;
-            m_imgHas = null;
-            m_imgNotHas = null;
-            m_imgShowTong = null;
-            m_grpGot = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs

@@ -7,11 +7,13 @@ namespace UI.CommonGame
     public partial class UI_ComIcon001
     {
         public GComponent target;
+        public Controller m_QualityType;
+        public Controller m_ScaleType;
         public GLoader m_bg;
         public GLoader m_loaIcon;
+        public GTextField m_txtCount;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
-        public GLoader m_numBg;
         public GImage m_imgHas;
         public GImage m_imgNotHas;
         public GImage m_imgShowTong;
@@ -63,11 +65,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_QualityType = comp.GetController("QualityType");
+            m_ScaleType = comp.GetController("ScaleType");
             m_bg = (GLoader)comp.GetChild("bg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_numBg = (GLoader)comp.GetChild("numBg");
             m_imgHas = (GImage)comp.GetChild("imgHas");
             m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
             m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
@@ -75,11 +79,13 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_QualityType = null;
+            m_ScaleType = null;
             m_bg = null;
             m_loaIcon = null;
+            m_txtCount = null;
             m_txtHasCount = null;
             m_loaRarity = null;
-            m_numBg = null;
             m_imgHas = null;
             m_imgNotHas = null;
             m_imgShowTong = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs

@@ -7,8 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComItem000
     {
         public GComponent target;
-        public UI_ComIcon000 m_comItemIcon;
-        public GTextField m_txtCount;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpj48o98";
         public const string PACKAGE_NAME = "CommonGame";
@@ -57,15 +56,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComIcon000)UI_ComIcon000.Create(comp.GetChild("comItemIcon"));
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comItemIcon.Dispose();
             m_comItemIcon = null;
-            m_txtCount = null;
             m_txtName = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs

@@ -8,7 +8,6 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public UI_ComIcon001 m_comItemIcon;
-        public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldp9jv6tls";
         public const string PACKAGE_NAME = "CommonGame";
@@ -58,14 +57,12 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comItemIcon.Dispose();
             m_comItemIcon = null;
-            m_txtCount = null;
             m_txtName = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_CombTaskUI.cs

@@ -10,8 +10,6 @@ namespace UI.Task
         public Controller m_c1;
         public UI_LivenessRewardProcess m_LivenessProcess;
         public GList m_TaskList;
-        public GButton m_btnDailyTask;
-        public GButton m_btnBattlePassTask;
         public GButton m_GetAll;
         public const string URL = "ui://5mpsibzzfqor2p";
         public const string PACKAGE_NAME = "Task";
@@ -63,8 +61,6 @@ namespace UI.Task
             m_c1 = comp.GetController("c1");
             m_LivenessProcess = (UI_LivenessRewardProcess)UI_LivenessRewardProcess.Create(comp.GetChild("LivenessProcess"));
             m_TaskList = (GList)comp.GetChild("TaskList");
-            m_btnDailyTask = (GButton)comp.GetChild("btnDailyTask");
-            m_btnBattlePassTask = (GButton)comp.GetChild("btnBattlePassTask");
             m_GetAll = (GButton)comp.GetChild("GetAll");
         }
         public void Dispose(bool disposeTarget = false)
@@ -73,8 +69,6 @@ namespace UI.Task
             m_LivenessProcess.Dispose();
             m_LivenessProcess = null;
             m_TaskList = null;
-            m_btnDailyTask = null;
-            m_btnBattlePassTask = null;
             m_GetAll = null;
             if(disposeTarget && target != null)
             {

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

@@ -18,30 +18,35 @@ namespace GFGGame
         private GImage _imgNotHas;
         private GImage _imgHas;
         private GImage _imgShouTong;
+        private Controller _qualityType;
+        private Controller _scaleType;
         // private GGroup _grpCount;
         private bool _showTips = true;
-
+        private bool _textScale = false;
 
         private ItemData _itemData;
 
-        public ItemView(GComponent obj)
+        public ItemView(GComponent obj,bool textScale = false)
         {
             _obj = obj;
             _item = obj.GetChild("comItemIcon").asCom;
             _loaIcon = _item.GetChild("loaIcon") as GLoader;
             _loaRarity = _item.GetChild("loaRarity") as GLoader;
             _txtName = obj.GetChild("txtName") as GTextField;
-            _txtCount = obj.GetChild("txtCount") as GTextField;
+            _txtCount = _item.GetChild("txtCount") as GTextField;
             _txtHasCount = _item.GetChild("txtHasCount") as GTextField;
             // _imgGot = obj.GetChild("imgGot") as GImage;
             _grpGot = _item.GetChild("grpGot") as GGroup;
             _imgNotHas = _item.GetChild("imgNotHas") as GImage;
             _imgHas = _item.GetChild("imgHas") as GImage;
             _imgShouTong = _item.GetChild("imgShowTong") as GImage;
+            _qualityType = _item.GetController("QualityType") as Controller;
+            _scaleType = _item.GetController("ScaleType") as Controller;
             // _grpCount = obj.GetChild("grpCount") as GGroup;
             // AddClickListener();
             _item.onClick.Remove(AddClickListener);
             _item.onClick.Add(AddClickListener);
+            _textScale = textScale;
         }
         public void Dispose()
         {
@@ -82,6 +87,11 @@ namespace GFGGame
             _txtName.text = itemCfg.name;
             _txtCount.text = string.Format("{0}", _itemData.num);
             _txtHasCount.SetVar("count", "" + ItemDataManager.GetItemNum(_itemData.id)).FlushVars();
+
+            if(itemCfg.rarity > 0)
+                _qualityType.selectedIndex = itemCfg.rarity - 1;
+
+           _scaleType.selectedIndex = _textScale ? 1 : 0;
         }
 
 

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -151,10 +151,10 @@ namespace GFGGame
         {
             _cfgs = TaskDataManager.Instance.GetTaskCfgs(funcType);
             _ui.m_TaskList.numItems = _cfgs.Count;
-            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyTask,
-                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily));
-            RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask,
-                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
+            //RedDotController.Instance.SetComRedDot(_ui.m_btnDailyTask,
+            //    TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily));
+            //RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask,
+            //    TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
         }
 
         private void TaskItemRender(int index, GObject obj)
@@ -193,7 +193,7 @@ namespace GFGGame
         {
             var rewards = (int[][])obj.parent.data;
             var itemData = ItemUtil.createItemData(rewards[index]);
-            var item = new ItemView(obj as GComponent);
+            var item = new ItemView(obj as GComponent,true);
             obj.data = item;
             item.SetData(itemData);
             item.ChangeTxtCountStyle();

GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -35,14 +35,14 @@ namespace GFGGame
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_txz");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
             _ui.m_c1.onChanged.Add(OnCtrlChange);
         }
 
         private void OnBtnBackClick()
         {
             ViewManager.Hide<CombTaskView>();
-            ViewManager.Hide<BattlePassTaskView>();
+            //ViewManager.Hide<BattlePassTaskView>();
             ViewManager.GoBackFrom(typeof(TaskView).FullName);
         }
 
@@ -80,12 +80,12 @@ namespace GFGGame
             {
                 case 1:
                     ViewManager.Show<CombTaskView>();
-                    ViewManager.Hide<BattlePassTaskView>();
-                    break;
-                case 2:
-                    ViewManager.Show<BattlePassTaskView>();
-                    ViewManager.Hide<CombTaskView>();
+                    //ViewManager.Hide<BattlePassTaskView>();
                     break;
+                //case 2:
+                //    ViewManager.Show<BattlePassTaskView>();
+                //    ViewManager.Hide<CombTaskView>();
+                //    break;
             }
 
             viewData = null;