Compare commits

..

No commits in common. "3e229a4bc9b98fb4b182d750f0e92ae72fa266d9" and "756ed0601698b44d0c302e09113ce57cf0e9c362" have entirely different histories.

5 changed files with 5 additions and 65 deletions

View File

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

Binary file not shown.

View File

@ -204,42 +204,6 @@
"Order": 6, "Order": 6,
"ActivityType": 3, "ActivityType": 3,
"TaskType": 18, "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, "TargetTimes": 100,
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
@ -247,30 +211,6 @@
"100002": 10 "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, "Id": 17,
"Order": 1, "Order": 1,

2
public

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

Binary file not shown.