Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

data/DB_PropExchange.dat

@@ -1,5 +1,5 @@
 
-6

т├
у├
ж├
в├
с├
"║█ю└=
-.
ы├
з├
ш├
ь├
"║█ю└=
-W
ш├
т├
у├
ж├
ь├
ы├
с├
в├
з├
"	║█─╜Б
-]
т├
в├
ь├
ш├
з├
э├
с├
у├
ж├
ы├
"╒█Т
+6

ж├
в├
с├
т├
у├
"║█ю└=
+.
з├
ш├
ь├
ы├
"║█ю└=
+W
ж├
ь├
з├
с├
т├
у├
в├
ы├
ш├
"	║█─╜Б
+]
ш├
э├
у├
т├
ж├
в├
ь├
ы├
з├
с├
"╒█Т

data/DB_Task.json

@@ -204,6 +204,42 @@
 			"Order": 6,
 			"ActivityType": 3,
 			"TaskType": 18,
+			"TargetTimes": 10,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 10000000,
+				"100002": 10
+			}
+		},
+		{
+			"Id": 22,
+			"Order": 7,
+			"ActivityType": 3,
+			"TaskType": 16,
+			"TargetTimes": 5,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 10000000,
+				"100002": 10
+			}
+		},
+		{
+			"Id": 23,
+			"Order": 8,
+			"ActivityType": 3,
+			"TaskType": 16,
+			"TargetTimes": 10,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 10000000,
+				"100002": 10
+			}
+		},
+		{
+			"Id": 24,
+			"Order": 9,
+			"ActivityType": 3,
+			"TaskType": 18,
 			"TargetTimes": 100,
 			"FinishTimes": 1,
 			"Award": {
@@ -211,6 +247,30 @@
 				"100002": 10
 			}
 		},
+		{
+			"Id": 25,
+			"Order": 10,
+			"ActivityType": 3,
+			"TaskType": 18,
+			"TargetTimes": 500,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 10000000,
+				"100002": 10
+			}
+		},
+		{
+			"Id": 26,
+			"Order": 11,
+			"ActivityType": 3,
+			"TaskType": 18,
+			"TargetTimes": 1000,
+			"FinishTimes": 1,
+			"Award": {
+				"100001": 10000000,
+				"100002": 10
+			}
+		},
 		{
 			"Id": 17,
 			"Order": 1,

public

@@ -1 +1 @@
-Subproject commit f2cb642621ff9b824620b144e2bb561962f66004
+Subproject commit 9a482efe5436a4c453466087584d51e28ff33fed