修改华容道UI适配和相册UI适配

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoEntryUI.cs

@@ -10,13 +10,13 @@ namespace UI.ActivityHuaRongDao
         public Controller m_activityID;
         public GLoader m_loaBg;
         public GButton m_btnClose;
+        public GButton m_btnRule;
         public GButton m_btnBack;
         public UI_scrollPane m_scrollPane;
-        public GTextField m_challengeTimes;
         public GTextField m_curLevel;
         public GTextField m_txtTime;
         public GButton m_btnStart;
-        public GButton m_btnRule;
+        public GTextField m_challengeTimes;
         public Transition m_hide;
         public Transition m_show;
         public const string URL = "ui://wf8geywtltoy4";
@@ -69,13 +69,13 @@ namespace UI.ActivityHuaRongDao
             m_activityID = comp.GetController("activityID");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_scrollPane = (UI_scrollPane)UI_scrollPane.Create(comp.GetChild("scrollPane"));
-            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
             m_curLevel = (GTextField)comp.GetChild("curLevel");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnStart = (GButton)comp.GetChild("btnStart");
-            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
             m_hide = comp.GetTransition("hide");
             m_show = comp.GetTransition("show");
         }
@@ -84,14 +84,14 @@ namespace UI.ActivityHuaRongDao
             m_activityID = null;
             m_loaBg = null;
             m_btnClose = null;
+            m_btnRule = null;
             m_btnBack = null;
             m_scrollPane.Dispose();
             m_scrollPane = null;
-            m_challengeTimes = null;
             m_curLevel = null;
             m_txtTime = null;
             m_btnStart = null;
-            m_btnRule = null;
+            m_challengeTimes = null;
             m_hide = null;
             m_show = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemGalleryPreviewUI.cs

@@ -8,6 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_mask;
         public GLoader m_loaPicture;
         public GButton m_btnback;
         public GComponent m_comHead;
@@ -66,6 +67,7 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_loaPicture = (GLoader)comp.GetChild("loaPicture");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comHead = (GComponent)comp.GetChild("comHead");
@@ -80,6 +82,7 @@ namespace UI.Poem
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_mask = null;
             m_loaPicture = null;
             m_btnback = null;
             m_comHead = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoPreviewUI.cs

@@ -8,7 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
-        public GGraph m_grhBg;
+        public GGraph m_mask;
         public GList m_list;
         public GList m_listTravel;
         public GButton m_btnLeft;
@@ -65,7 +65,7 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_grhBg = (GGraph)comp.GetChild("grhBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_list = (GList)comp.GetChild("list");
             m_listTravel = (GList)comp.GetChild("listTravel");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
@@ -78,7 +78,7 @@ namespace UI.Poem
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_grhBg = null;
+            m_mask = null;
             m_list = null;
             m_listTravel = null;
             m_btnLeft = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoSaveUI.cs

@@ -8,7 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
-        public GGraph m_grhBg;
+        public GGraph m_mask;
         public UI_ListPhotoPreviewItem m_personalPhoto;
         public GGraph m_saveImg;
         public GProgressBar m_progress;
@@ -61,7 +61,7 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_grhBg = (GGraph)comp.GetChild("grhBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_personalPhoto = (UI_ListPhotoPreviewItem)UI_ListPhotoPreviewItem.Create(comp.GetChild("personalPhoto"));
             m_saveImg = (GGraph)comp.GetChild("saveImg");
             m_progress = (GProgressBar)comp.GetChild("progress");
@@ -70,7 +70,7 @@ namespace UI.Poem
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_grhBg = null;
+            m_mask = null;
             m_personalPhoto.Dispose();
             m_personalPhoto = null;
             m_saveImg = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoShareUI.cs

@@ -8,7 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
-        public GGraph m_graBg;
+        public GGraph m_mask;
         public GLoader m_loaBg;
         public GButton m_btnback;
         public GButton m_btnSave;
@@ -62,7 +62,7 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_graBg = (GGraph)comp.GetChild("graBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_btnSave = (GButton)comp.GetChild("btnSave");
@@ -72,7 +72,7 @@ namespace UI.Poem
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_graBg = null;
+            m_mask = null;
             m_loaBg = null;
             m_btnback = null;
             m_btnSave = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -200,7 +200,8 @@ namespace GFGGame
                 return;
             }
 
-            HuarongRoadGame cfg = HuarongRoadGameArray.Instance.dataArray[curLevel];
+            HuarongRoadGame cfg = HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]);
+
             var result = await MiniGameProxy.ReqMiniGameStart(cfg.id, cfg.type, _activityID);
             if (!result) return;
 

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_grhBg.onClick.Add(OnBtnBackClick);
+            _ui.m_mask.onClick.Add(OnBtnBackClick);
 
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = RenderListItem;

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
-            _ui.m_graBg.onClick.Add(OnBtnBackClick);
+            _ui.m_mask.onClick.Add(OnBtnBackClick);
             _ui.m_btnSave.onClick.Add(OnBtnSaveClick);
             _ui.m_btnShare.onClick.Add(OnBtnShareClick);
             _ui.m_btnShare.visible = false;