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

modules/uigame/api_getlattice.go

@@ -70,10 +70,6 @@ func (this *apiComp) GetLattice(session comm.IUserSession, req *pb.UiGameGetLatt
 		}
 	}
 
-	this.LatticeReward(session, &pb.UiGameLatticeRewardReq{
-		Hdid: "64d4b1f7510317d189bb6ee5",
-		Id:   3,
-	})
 	session.SendMsg(string(this.module.GetType()), "getlattice", &pb.UiGameGetLatticeResp{Data: hdData})
 	return
 }

modules/uigame/api_latticegrid.go

@@ -91,7 +91,7 @@ func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLattic
 	if req.Grid == latticeConf.Outpos {
 		list.Floor += 1
 		// 校验是不是达到最大层数
-		if _, e := this.module.configure.GetLatticeConf(list.Floor); e == nil {
+		if _, e := this.module.configure.GetLatticeConf(list.Floor); e != nil {
 			list.Floor -= 1
 		}
 		update["Floor"] = list.Floor