消耗钻石比赛开始再统计

data/DB_Task.json

@@ -4,11 +4,11 @@
 			"Id": 1,
 			"Order": 1,
 			"ActivityType": 1,
-			"TaskType": 1,
+			"TaskType": 7,
 			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
-				"100001": 50000,
+				"100001": 500000,
 				"100004": 5
 			},
 			"Position": [

deploy.bat

@@ -9,7 +9,6 @@ call shell/gen_go.bat
 call shell/update_public.bat
 
 git add .
-git add public
 git commit -m "update develop"
 
 git checkout release

public

@@ -1 +1 @@
-Subproject commit 1979cd52fb471bf87bce124133da8d9996ffa3e4
+Subproject commit 7fba2cfaa48724a929e7b393ec9951b6bee61545

worldsrv/player.go

@@ -1913,10 +1913,14 @@ func (this *Player) AddDiamond(num, add int64, gainWay int32, oper, remark strin
 			} else {
 				this.Diamond += num
 			}
-			TaskSubjectSingleton.Touch(common.TaskTypeCostDiamond, &TaskData{
-				SnId: this.SnId,
-				Num:  -num,
-			})
+			switch gainWay {
+			case common.GainWay_MatchSignup: // 排除的
+			default:
+				TaskSubjectSingleton.Touch(common.TaskTypeCostDiamond, &TaskData{
+					SnId: this.SnId,
+					Num:  -num,
+				})
+			}
 		}
 
 		this.SendDiffData()

worldsrv/tournament.go

@@ -732,6 +732,12 @@ func (this *Tournament) Start(platform string, tmId int32) {
 			GameFreeID: tm.dbGameFree.GetId(),
 			Num:        1,
 		})
+		if matchInfo.GetSignupCostDiamond() > 0 {
+			TaskSubjectSingleton.Touch(common.TaskTypeCostDiamond, &TaskData{
+				SnId: v.SnId,
+				Num:  matchInfo.GetSignupCostDiamond(),
+			})
+		}
 	}
 	this.signupPlayers[platform][tmId].signup = make(map[int32]*TmPlayer)
 }