| 
					
				 | 
			
			
				@@ -28,8 +28,8 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.viewCom.Center(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_listBonus.itemRenderer = UpdateBonusItem; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-             
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            _ui.m_listBonus.onClickItem.Add(OnClickListBonusItem); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // _ui.m_listBonus.onClickItem.Add(OnClickListBonusItem); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_btnSure.onClick.Add(OnClickBtnSure); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -42,7 +42,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _getStatusCall = datas[1] as GetBoxBonusStatusCall; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _getBonusCall = datas[2] as GetBoxBonusCall; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             UpdateBtnStatus(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(_bonusList != null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (_bonusList != null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 _ui.m_listBonus.numItems = _bonusList.Count; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -50,7 +50,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 _ui.m_listBonus.numItems = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(_ui.m_listBonus.numItems > 4) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (_ui.m_listBonus.numItems > 4) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 _ui.m_listBonus.columnGap = 40; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -74,10 +74,10 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             GoodsItemTipsController.ShowItemTips(itemId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private void UpdateBtnStatus() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private void UpdateBtnStatus() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int status = _getStatusCall(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            switch(status) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            switch (status) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 case ConstBonusStatus.CAN_GET: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     _ui.m_btnSure.text = "领取"; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -94,25 +94,33 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnClickBtnSure() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int status = _getStatusCall(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(status == ConstBonusStatus.CAN_GET) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (status == ConstBonusStatus.CAN_GET) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 _getBonusCall(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.Hide(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void UpdateBonusItem(int index, GObject item) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ItemData itemData = _bonusList[index] as ItemData; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            UI_BonusItem listItem = UI_BonusItem.Proxy(item); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            listItem.m_goodsItem.m_txtNumber.text = "x" + itemData.num; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            listItem.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemData.id)).FlushVars(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            listItem.m_goodsItem.m_txtName.text = itemCfg.name; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            listItem.m_goodsItem.m_iconItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            listItem.m_iconBonusOnce.visible = itemData.isOnceBonus; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            RarityIconController.UpdateRarityIcon(listItem.m_goodsItem.m_iconItem.m_rarity, itemData.id, true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            listItem.target.data = itemData.id; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // UI_BonusItem listItem = UI_BonusItem.Proxy(item); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // listItem.m_goodsItem.m_txtNumber.text = "x" + itemData.num; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // listItem.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemData.id)).FlushVars(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // listItem.m_goodsItem.m_txtName.text = itemCfg.name; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // listItem.m_goodsItem.m_iconItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // listItem.m_iconBonusOnce.visible = itemData.isOnceBonus; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // RarityIconController.UpdateRarityIcon(listItem.m_goodsItem.m_iconItem.m_rarity, itemData.id, true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // listItem.target.data = itemData.id; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (item.data == null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                item.data = new ItemView(item as GComponent); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                (item.data as ItemView).SetData(itemData); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |