Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
976c305d50
@ -45,7 +45,7 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.JielongRewardReq)
|
|||||||
} else {
|
} else {
|
||||||
for _, v := range c {
|
for _, v := range c {
|
||||||
if list.Wincount >= v.Condition {
|
if list.Wincount >= v.Condition {
|
||||||
if _, ok := c[v.Condition]; !ok {
|
if _, ok := list.Reward[v.Condition]; !ok {
|
||||||
res = append(res, v.Reward...)
|
res = append(res, v.Reward...)
|
||||||
list.Reward[v.Condition] = 1
|
list.Reward[v.Condition] = 1
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.JielongRewardReq)
|
|||||||
} else {
|
} else {
|
||||||
for _, v := range c {
|
for _, v := range c {
|
||||||
if list.Hisotry >= v.Condition {
|
if list.Hisotry >= v.Condition {
|
||||||
if _, ok := c[v.Condition]; !ok {
|
if _, ok := list.Gotarr[v.Condition]; !ok {
|
||||||
res = append(res, v.Reward...)
|
res = append(res, v.Reward...)
|
||||||
list.Gotarr[v.Condition] = 1
|
list.Gotarr[v.Condition] = 1
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user