Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/equipment/api_ench.go

@@ -46,7 +46,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (
 	}
 	AttrValue = rand.Int31n(conf.AttrMax - conf.AttrMini)
 	if AttrValue > equip.AdverbEntry[req.Index].Value {
-		equip.AdverbEntry[req.Index].Value = AttrValue
+		equip.AdverbEntry[req.Index].BaseValue = AttrValue
 	}
 	if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{
 		"adverbEntry":    equip.AdverbEntry,

modules/equipment/api_wash.go

@@ -52,6 +52,13 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
 		this.module.Errorf("升级服务错误 读取副词条配置错误!")
 		return
 	}
+	for i, v := range attrlibrarys { //移除主属性
+		if v.Key == equip.MainEntry.Id {
+			attrlibrarys = append(attrlibrarys[0:i], attrlibrarys[i+1:]...)
+			break
+		}
+	}
+
 	adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry))
 	r := rand.New(rand.NewSource(time.Now().Unix()))
 	for i, v := range r.Perm(len(equip.AdverbEntry)) {

modules/equipment/modelEquipment.go

@@ -235,6 +235,13 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData
 		return
 	}
 
+	for i, v := range sattr { //移除主属性
+		if v.Key == equipment.MainEntry.Id {
+			sattr = append(sattr[0:i], sattr[i+1:]...)
+			break
+		}
+	}
+
 	for _, v := range conf.Addattrnump {
 		total += int(v)
 	}
@@ -304,10 +311,14 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
 					iskeep = true
 				}
 			}
+			if v.Key == equipment.MainEntry.Id {
+				iskeep = true
+			}
 			if !iskeep {
 				sattr = append(sattr, v)
 			}
 		}
+		if len(sattr) > 0 {
 			r := rand.New(rand.NewSource(time.Now().Unix()))
 			index := r.Perm(len(sattr))[0]
 			if equip.EquipId == 1 {
@@ -318,6 +329,7 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
 					AttrName:  sattr[index].Attrkey,
 					Value:     sattr[index].Attrvar,
 				})
+				return
 			} else {
 				if equipatt, err = this.module.configure.getEquipAttribute(sattr[index].Attrkey); err != nil {
 					return
@@ -329,13 +341,14 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
 					SkillId:   equipatt.SkillId,
 					Lv:        1,
 				})
+				return
+			}
+		}
 	}
-	} else { //随机一个副词条 强化
 	if equip.EquipId == 1 {
 		var attrlibrary *cfg.GameEquipAttrlibraryData
 		r := rand.New(rand.NewSource(time.Now().Unix()))
 		index := r.Perm(len(equipment.AdverbEntry))[0]
-
 		if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.AdverbEntry[index].Id); err != nil {
 			return
 		}
@@ -349,6 +362,5 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
 		index := r.Perm(len(equipment.Adverbskill))[0]
 		equipment.Adverbskill[index].Lv++
 	}
-	}
 	return
 }