| 
					
				 | 
			
			
				@@ -56,43 +56,48 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void ListItemRenderer(int index, GObject obj) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // UI_ListShopItem item = UI_ListShopItem.Proxy(obj); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // ShopCfg cfg = _giftCfgs[index]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            UI_ListShopItem item = UI_ListShopItem.Proxy(obj); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ShopCfg shopCfg = _shopCfgs[index]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_txtName.text = cfg.name; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_icon.url = ResPathUtil.GetIconPath(cfg.res, "png"); // string.Format("ui://RechargeStore/{0}", cfg.res); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_txtName.text = shopCfg.itemName; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg); // string.Format("ui://RechargeStore/{0}", cfg.res); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_txtDesc.SetVar("count", cfg.desc).FlushVars(); ; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_grpDiscount.visible = cfg.desc != ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_grpDiscount.visible = shopCfg.price < shopCfg.originalPrice; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_txtDesc.text = ((double)(shopCfg.originalPrice / shopCfg.price) * 100).ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_grpEndTime.visible = cfg.endTime != ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_txtEndTime.SetVar("value", ShopDataManager.Instance.GetEndTime(shopCfg.id)).FlushVars(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_txtEndTime.visible = shopCfg.endTime != ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_c2.selectedIndex = StoreDataManager.Instance.GetGiftStateById(cfg.id) ? 0 : 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // if (cfg.lockType == LockType.STORY_LV) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //     StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //     item.m_txtLock.text = string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // else if (cfg.lockType == LockType.ROLE_LV) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //     item.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_c2.selectedIndex = ShopDataManager.Instance.GetShopGoodsStateById(shopCfg.id) ? 0 : 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (shopCfg.lockType == LockType.STORY_LV) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(shopCfg.storyLevelId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                item.m_txtLock.text = string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            else if (shopCfg.lockType == LockType.ROLE_LV) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                item.m_txtLock.text = string.Format("角色达到{0}级解锁", shopCfg.lv); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                item.m_txtLock.text = string.Format("开通{0}解锁", shopCfg.MonthlyCardType == MonthCardType.Gold ? "金卡" : "黑金卡"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // int buyNum = StoreDataManager.Instance.GetGiftBuyNumById(cfg.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_txtLimit.text = string.Format("{0}({1}/{2})", StoreDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_txtLimit.visible = cfg.maxBuyNum > 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.m_c1.selectedIndex = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? 0 : 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_txtLimit.text = string.Format("{0}({1}/{2})", ShopDataManager.Instance.refreshType[shopCfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), shopCfg.maxBuyNum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_txtLimit.visible = shopCfg.maxBuyNum > 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.m_c1.selectedIndex = shopCfg.maxBuyNum == 0 || buyNum < shopCfg.maxBuyNum ? 0 : 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // if (item.m_c1.selectedIndex == 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //     item.m_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //     if (cfg.price > 0 && cfg.costType != CostType.FREE) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //     item.m_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.originalPrice);// cfg.originalPrice.ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //     if (shopCfg.price > 0 && shopCfg.costType != CostType.FREE) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //         item.m_btnBuy.m_grpOriginalPrice.visible = cfg.originalPrice > 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //         item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.originalPrice > 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //         item.m_btnBuy.m_grpIcon.visible = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //         item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //         item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.price);// cfg.price.ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //         if (cfg.costType == CostType.RMB) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //         if (shopCfg.costType == CostType.RMB) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //             item.m_btnBuy.m_loaIcon.visible = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //             item.m_btnBuy.m_txtIcon.visible = true; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -100,7 +105,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //         else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.costId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //             item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //             item.m_btnBuy.m_loaIcon.visible = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //             item.m_btnBuy.m_txtIcon.visible = false; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -118,11 +123,11 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //     item.target.onClick.Add(OnBtnBuyClick); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // item.target.data = cfg.id; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && cfg.price == 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // item.target.data = shopCfg.id; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && shopCfg.price == 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // UI_ListShopItem.ProxyEnd(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            UI_ListShopItem.ProxyEnd(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |