Merge remote-tracking branch 'origin/master'

Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIMain/UIMainComponentSystem.cs

@@ -14,41 +14,61 @@ namespace ET.Client
 			{
                 ReferenceCollector rc = self.GetParent<UI>().GameObject.GetComponent<ReferenceCollector>();
                 self.guildBtn = rc.Get<GameObject>("GuildBtn");
-                self.guildBtn.GetComponent<Button>().onClick.AddListener(()=> { self.OnGuild(); });
+                self.guildBtn.GetComponent<Button>().onClick.AddListener(()=> { self.OnDownBtn(1); });
                 self.bagBtn = rc.Get<GameObject>("BagBtn");
-                self.bagBtn.GetComponent<Button>().onClick.AddListener(() => { self.OnBag(); });
+                self.bagBtn.GetComponent<Button>().onClick.AddListener(() => { self.OnDownBtn(2); });
                 self.startBtn = rc.Get<GameObject>("StartBtn");
-                self.startBtn.GetComponent<Button>().onClick.AddListener(() => { self.OnStart(); });
+                self.startBtn.GetComponent<Button>().onClick.AddListener(() => { self.OnDownBtn(3); });
                 self.featureBtn = rc.Get<GameObject>("FeatureBtn");
-                self.featureBtn.GetComponent<Button>().onClick.AddListener(() => { self.OnFeature(); });
+                self.featureBtn.GetComponent<Button>().onClick.AddListener(() => { self.OnDownBtn(4); });
                 self.checkPointBtn = rc.Get<GameObject>("CheckPointBtn");
-                self.checkPointBtn.GetComponent<Button>().onClick.AddListener(() => { self.OnCheckPoint(); });
+                self.checkPointBtn.GetComponent<Button>().onClick.AddListener(() => { self.OnDownBtn(5); });
+
+                var iconBg = rc.Get<GameObject>("iconBgImage");
+                self.iconBgImage = iconBg.GetComponent<Image>();
+                var iconB = rc.Get<GameObject>("iconBtn");
+                self.iconBtn = iconB.GetComponent<Button>().onClick.AddListener(() => {  });
+                var roleName = rc.Get<GameObject>("roleNameTxt");
+                self.roleNameTxt = iconBg.GetComponent<Text>();
+                var dynamingVaule = rc.Get<GameObject>("dynamingVauleTxt");
+                self.dynamingVauleTxt = iconBg.GetComponent<Text>();
+                var dynamingAdd = rc.Get<GameObject>("dynamingAddBtn");
+                self.dynamingAddBtn = dynamingAdd.GetComponent<Button>().onClick.AddListener(() => { });
+                var fightPower = rc.Get<GameObject>("fightPowerTxt");
+                self.fightPowerTxt = iconBg.GetComponent<Text>();
+                var gold = rc.Get<GameObject>("goldTxt");
+                self.goldTxt = iconBg.GetComponent<Text>();
+                var chat = rc.Get<GameObject>("chatTxt");
+                self.chatTxt = iconBg.GetComponent<Text>();
+                var chatB = rc.Get<GameObject>("chatBtn");
+                self.chatBtn = chatB.GetComponent<Button>().onClick.AddListener(() => { });
+                var taskB = rc.Get<GameObject>("taskBtn");
+                self.taskBtn = taskB.GetComponent<Button>().onClick.AddListener(() => { });
+                var taskContentT1 = rc.Get<GameObject>("taskContentTxt1");
+                self.taskContentTxt1 = taskContentT1.GetComponent<Text>();
+                var taskContentT2 = rc.Get<GameObject>("taskContentTxt2");
+                self.taskContentTxt2 = taskContentT2.GetComponent<Text>();
+                var taskAawardIconI = rc.Get<GameObject>("taskAawardIconImage");
+                self.taskAawardIconImage = taskAawardIconI.GetComponent<Image>();
+                var taskAawardContentT = rc.Get<GameObject>("taskAawardContentTxt");
+                self.taskAawardContentTxt = taskAawardContentT.GetComponent<Text>();
+                var autoB = rc.Get<GameObject>("autoBtn");
+                self.autoBtn = autoB.GetComponent<Button>().onClick.AddListener(() => { });
+                var lvlB = rc.Get<GameObject>("lvlBtn");
+                self.lvlBtn = lvlB.GetComponent<Button>().onClick.AddListener(() => { });
+                var lvlContentT1 = rc.Get<GameObject>("lvlContentTxt1");
+                self.lvlContentTxt1 = lvlContentT1.GetComponent<Text>();
+                var lvlContentT2 = rc.Get<GameObject>("lvlContentTxt2");
+                self.lvlContentTxt2 = lvlContentT2.GetComponent<Text>();
+                ////down
+                //public List<GameObject> equipObj;
             }
 		}
 		
-		public static void OnGuild(this UIMainComponent self)
+        //下面横排按钮
+		public static void OnDownBtn(this UIMainComponent self,int type)
 		{
-            Log.Error("OnGuild");
-        }
-
-        public static void OnBag(this UIMainComponent self)
-        {
-            Log.Error("OnBag");
-        }
-
-        public static void OnStart(this UIMainComponent self)
-        {
-            Log.Error("OnStart");
-        }
-
-        public static void OnFeature(this UIMainComponent self)
-        {
-            Log.Error("OnFeature");
-        }
-
-        public static void OnCheckPoint(this UIMainComponent self)
-        {
-            Log.Error("OnCheckPoint");
+            Log.Error("OnDownBtn: " + type);
         }
     }
 }

Unity/Assets/Scripts/Codes/ModelView/Client/Demo/UI/UIMain/UIMainComponent.cs

@@ -5,10 +5,33 @@ namespace ET.Client
 	[ComponentOf(typeof(UI))]
 	public class UIMainComponent : Entity, IAwake
 	{
+        //下面横排按钮
         public GameObject guildBtn;
         public GameObject bagBtn;
         public GameObject startBtn;
         public GameObject featureBtn;
         public GameObject checkPointBtn;
+
+        //up
+        public GameObject iconBgImage;
+        public GameObject iconBtn;
+        public GameObject roleNameTxt;
+        public GameObject dynamingVauleTxt;
+        public GameObject dynamingAddBtn;
+        public GameObject fightPowerTxt;
+        public GameObject goldTxt;
+        //down
+        public List<GameObject> equipObj;
+        public GameObject chatTxt;
+        public GameObject chatBtn;
+        public GameObject taskBtn;
+        public GameObject taskContentTxt1;
+        public GameObject taskContentTxt2;
+        public GameObject taskAawardIconImage;
+        public GameObject taskAawardContentTxt;
+        public GameObject autoBtn;
+        public GameObject lvlBtn;
+        public GameObject lvlContentTxt1;
+        public GameObject lvlContentTxt2;
     }
 }