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

comm/imodule.go

@@ -62,8 +62,8 @@ type (
 		RecoverTicket(session IUserSession) (errdata *pb.ErrorData)
 		//出售道具
 		SellItem(session IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno)
-		//使用物品
+		//使用物品 slt 0合成 1分解
-		UseItem(session IUserSession, gid string, amount int32) (errdata *pb.ErrorData)
+		UseItem(session IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData)
 		//清理物品
 		CleanItemById(session IUserSession, t string) (errdata *pb.ErrorData)
 	}

modules/buried/module.go

@@ -224,6 +224,12 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
 					}
 				}
 			}
+		} else {
+			bdata = &pb.DBBuriedItem{
+				Btype: conf.Type,
+				Condi: make([]*pb.DBBuriedConItem, 0),
+			}
+			bdatas.Items[conf.Type] = bdata
 		}
 		if !ok { //未找到 初始化一个
 			bitem = &pb.DBBuriedConItem{

modules/items/module.go

@@ -215,8 +215,7 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
 
 //使用物品
 func (this *Items) UseItem(session comm.IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData) {
-
+	return this.modelItems.useitem(session, gid, amount, slt)
-	return
 }
 
 //清理背包