| 
					
				 | 
			
			
				@@ -53,7 +53,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_btnStart.onClick.Add(OnBtnStartClick); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_btnTask.onClick.Add(OnBtnTaskClick); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_btnShop.onClick.Add(OnBtnShopClick); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            _ui.m_btnBack.onClick.Add(Hide); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _ui.m_btnBack.onClick.Add(OnBtnBackClick); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AddEffect(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -66,9 +66,15 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_list.visible = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var result = await ActivityGetYuanXiaoProxy.ReqGetActivityGameInfos(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (!isShowing || !result) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (!isShowing) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (!result) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                Hide(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                OnBtnBackClick(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -224,7 +230,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.YuanXiao); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (activityID == 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                Hide(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                OnBtnBackClick(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -235,5 +241,12 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private void OnBtnBackClick() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ViewManager.Show<MainUIView>(null, true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ViewManager.DeleteViewStackCountDown("MainUIView"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |