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

modules/guildgve/api_challengefinish.go

@@ -128,9 +128,12 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
 				}
 				v.Record = append(v.Record, record)
 				go this.module.modelGuildGve.booshpchangepush(req.Guildid, info)
-				if v.Hp < 0 {
+				if v.Hp <= 0 {
 					v.Hp = 0
 					info.Kills++
+					if info.Fire == v.Boosid {
+						info.Fire = 0
+					}
 					info.Lastkilltime = configure.Now().Unix()
 					this.module.modelRank.updateRank(info)
 					go this.module.modelGuildGve.booskill(req.Guildid, req.Boosid, info)

modules/guildgve/modelUniongve.go

@@ -249,7 +249,7 @@ func (this *ModelUniongve) booskill(unionid string, boosid int32, info *pb.DBGui
 			return
 		}
 		v.Boosid = conf.BossId
-		v.Hp = v.Hp
+		v.Hp = conf.Hp
 		v.Record = make([]*pb.DBGveRecord, 0)
 	}
 	if err = this.updateGuildGve(info); err != nil {

modules/practice/api_receive.go

@@ -211,8 +211,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
 						ants1[index].N++
 					}
 				}
-				room.Knapsack[pillar.Teacher].State = 0
 			}
+			room.Knapsack[pillar.Teacher].State = 0
 		}
 		if pconfigure != nil {
 			if pconfigure.Exp > 0 { //经验加成
@@ -253,8 +253,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
 						ants2[index].N++
 					}
 				}
-				room.Knapsack[pillar.Prop].State = 0
 			}
+			room.Knapsack[pillar.Prop].State = 0
 		}
 	}
 	this.module.Debug("最终经验加成", log.Field{Key: "exp", Value: exp}, log.Field{Key: "exp1", Value: exp1})