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

modules/activity/module.go

@@ -287,7 +287,12 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32,
 				}
 
 				if conf, err := this.configure.GetHDCelebration(data.Val); err == nil {
-
+					for _, v1 := range conf.Bosstype {
+						if v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
+							bosstype = 0
+							break
+						}
+					}
 					if conf.Systemtype == systemtype {
 						data.Gotarr[bosstype] += 1
 						// 天数