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

modules/smithy/model_atlas.go

@@ -123,6 +123,26 @@ func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, qual
 		}
 		update["atlas"] = list.Atlas
 		this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
+	} else if atlasConf.TypeId == 2 {
+		if v, ok := list.Atlas[id]; ok { // 找到相同的
+			if !v.Activate {
+				update := make(map[string]interface{}, 0)
+				data := &pb.ForgeList{
+					Data1: &pb.ForgeData{
+						ForgeCount: forgeCount,
+						Lv:         lv,
+						Quality:    quality,
+						Score:      atlasConf.AtlasScore,
+						Time:       configure.Now().Unix(),
+					},
+					Data2:    nil,
+					Activate: false,
+				}
+				list.Atlas[id] = data
+				update["atlas"] = list.Atlas
+				this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
+			}
+		}
 	}
 	return true
 }