| 
					
				 | 
			
			
				@@ -21,6 +21,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private List<GObject> _listItemObj = new List<GObject>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private int _countCanUpMaxLevel = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private int _nowCountCanUpLevel = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private int _oldCanUpLevel = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private long _goldsHasNum = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private int _cumulativeGold = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private int _cfgMaxLevel = 0; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -60,7 +61,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             float volumn = (float)_ui.m_slideUpLevel.value / 100; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _nowCountCanUpLevel = _cardData.lv + (int)(volumn * (_countCanUpMaxLevel - _cardData.lv)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            tidyData(_cfgMaxLevel, "Max"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //tidyData(_cfgMaxLevel, "Max"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             tidyData(_nowCountCanUpLevel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ReferViewInfo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -76,6 +77,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _cardData = (CardData)this.viewData; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AddEffect(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ClearItemsCountList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _oldCanUpLevel = _cardData.lv; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_slideUpLevel.value = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _cfgMaxLevel = CardLvlCfgArray.Instance.GetCfgsByrarity(_cardData.itemCfg.rarity).Count; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -224,9 +226,9 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (result) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 this.Hide(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (_cardData.lv - _nowCountCanUpLevel >= 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (_cardData.lv - _oldCanUpLevel >= 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", _nowCountCanUpLevel, _cardData.lv, _cardData.id }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", _oldCanUpLevel, _cardData.lv, _cardData.id }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -237,7 +239,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _nowCountCanUpLevel -= 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (_nowCountCanUpLevel < _cardData.lv) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 _nowCountCanUpLevel = _cardData.lv; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            tidyData(_cfgMaxLevel, "Max"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //tidyData(_cfgMaxLevel, "Max"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             tidyData(_nowCountCanUpLevel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ReferViewInfo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ReferSlide(); 
			 |