Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
64f975028c
@ -193,7 +193,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
|
|||||||
ants1[index].N++
|
ants1[index].N++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
room.Knapsack[pillar.Teacher].State = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if pconfigure != nil {
|
if pconfigure != nil {
|
||||||
@ -235,6 +235,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
|
|||||||
ants2[index].N++
|
ants2[index].N++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
room.Knapsack[pillar.Prop].State = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -245,8 +246,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
|
|||||||
if errdata = this.module.DispenseRes(session, append(ants1, ants2...), true); errdata != nil {
|
if errdata = this.module.DispenseRes(session, append(ants1, ants2...), true); errdata != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
room.Knapsack[pillar.Teacher].State = 0
|
|
||||||
room.Knapsack[pillar.Prop].State = 0
|
|
||||||
pillar.Hero = ""
|
pillar.Hero = ""
|
||||||
pillar.Teacher = ""
|
pillar.Teacher = ""
|
||||||
pillar.Prop = ""
|
pillar.Prop = ""
|
||||||
|
Loading…
Reference in New Issue
Block a user