| 
					
				 | 
			
			
				@@ -15,7 +15,7 @@ namespace GameLogic.Equipment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// 后续要做特殊装备的话,在加新的字段,以及根据新资源,来组合新guid 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// </summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // public string guid; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        public HeroBasicEquipConfig basicEquipConfig; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // public HeroBasicEquipConfig basicEquipConfig; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // public ItemConfig itemConfig; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // public ItemInfo itemInfo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // public int count; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -44,8 +44,8 @@ namespace GameLogic.Equipment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             myItemInfo = itemInfo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             isWear = eqData.isEquip; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            basicEquipConfig = ConfigComponent.Instance.Get<HeroBasicEquipConfig>(eqData.zyEqId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            level = basicEquipConfig.lv; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // basicEquipConfig = ConfigComponent.Instance.Get<HeroBasicEquipConfig>(eqData.zyEqId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // level = basicEquipConfig.lv; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             quality = eqData.quality; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // CalAtt(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -95,9 +95,9 @@ namespace GameLogic.Equipment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // basicEquipConfig = ConfigComponent.Instance.Get<HeroBasicEquipConfig>(equipmentConfigID); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            level = basicEquipConfig.lv; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // guid = GlobalParam.GenerateGUID(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            myItemInfo.guid = itemConfig.ID.ToString() + basicEquipConfig.lv + quality; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // level = basicEquipConfig.lv; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // // guid = GlobalParam.GenerateGUID(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // myItemInfo.guid = itemConfig.ID.ToString() + basicEquipConfig.lv + quality; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // LogTool.Log("装备职业:"+ basicEquipConfig.profession + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //             "-装备位置:" + basicEquipConfig.Type +  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -142,7 +142,7 @@ namespace GameLogic.Equipment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // count = count, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // itemConfigID = myItemInfo.config.ID, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // dropLv = dropLv, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                zyEqId = basicEquipConfig.ID, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                // zyEqId = basicEquipConfig.ID, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 quality = quality, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // zy = zy, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 isEquip = isWear, 
			 |