diff --git a/view/molistar/modules/taskCenter/css/index.css b/view/molistar/modules/taskCenter/css/index.css
index 7753390f..848a46b5 100644
--- a/view/molistar/modules/taskCenter/css/index.css
+++ b/view/molistar/modules/taskCenter/css/index.css
@@ -358,6 +358,23 @@ body {
border-radius: 0.32rem;
padding: 0.32rem;
margin-top: 0.2666666667rem;
+ position: relative;
+}
+.Daily_list .task_List .countdown_box {
+ background: linear-gradient(270deg, #4994E4 0%, #74D5FC 100%);
+ border-radius: 0px 0.32rem 0px 0.32rem;
+ position: absolute;
+ top: 0;
+ right: 0;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 0.32rem;
+ color: #FFFFFF;
+ line-height: 0.4533333333rem;
+ font-style: normal;
+ text-transform: none;
+ padding: 0 0.2133333333rem;
+ display: none;
}
.Daily_list .task_List .task_box {
display: flex;
diff --git a/view/molistar/modules/taskCenter/css/index.scss b/view/molistar/modules/taskCenter/css/index.scss
index 808988cc..46364d0d 100644
--- a/view/molistar/modules/taskCenter/css/index.scss
+++ b/view/molistar/modules/taskCenter/css/index.scss
@@ -400,6 +400,7 @@ body {
.tab_list {
display: flex;
gap: px2rem(40);
+
.tab_box {
font-family: PingFang SC, PingFang SC;
font-weight: 400;
@@ -411,17 +412,20 @@ body {
display: flex;
flex-direction: column;
align-items: center;
- span{
+
+ span {
display: flex;
align-items: center;
position: relative;
- img{
+
+ img {
width: px2rem(36);
height: px2rem(36);
position: absolute;
right: px2rem(-34);
}
}
+
.xian {
width: px2rem(38);
height: px2rem(10);
@@ -441,12 +445,30 @@ body {
.task_List {
position: relative;
+
.task_max_box {
background: #FFFFFF;
border-radius: px2rem(24);
padding: px2rem(24);
margin-top: px2rem(20);
+ position: relative;
+ }
+ .countdown_box {
+ background: linear-gradient(270deg, #4994E4 0%, #74D5FC 100%);
+ border-radius: 0px px2rem(24) 0px px2rem(24);
+ position: absolute;
+ top: 0;
+ right: 0;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: px2rem(24);
+ color: #FFFFFF;
+ line-height: px2rem(34);
+ font-style: normal;
+ text-transform: none;
+ padding: 0 px2rem(16);
+ display: none;
}
.task_box {
@@ -627,6 +649,7 @@ body {
display: flex;
justify-content: space-between;
margin-top: px2rem(6);
+
img {
width: px2rem(34);
height: px2rem(34);
@@ -646,36 +669,37 @@ body {
}
}
}
+
/* 元素块蒙版样式 */
.element-mask {
- position: absolute;
- top: 10.9rem;
- left: 0;
- width: 100%;
- height: px2rem(2850);
- background-color: rgba(0, 0, 0, 0.5);
- z-index: 999;
- display: none;
+ position: absolute;
+ top: 10.9rem;
+ left: 0;
+ width: 100%;
+ height: px2rem(2850);
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 999;
+ display: none;
}
.element-mask .mask-content {
- color: white;
- text-align: center;
-font-family: PingFang SC, PingFang SC;
-font-weight: 600;
-font-size: px2rem(28);
-color: #FFFFFF;
-line-height: px2rem(40);
-text-align: center;
-font-style: normal;
-text-transform: none;
-padding-top: px2rem(200);
+ color: white;
+ text-align: center;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 600;
+ font-size: px2rem(28);
+ color: #FFFFFF;
+ line-height: px2rem(40);
+ text-align: center;
+ font-style: normal;
+ text-transform: none;
+ padding-top: px2rem(200);
}
.element-mask .mask-content .mask-icon {
- width: px2rem(80);
- height: px2rem(80);
- margin-bottom: px2rem(18);
+ width: px2rem(80);
+ height: px2rem(80);
+ margin-bottom: px2rem(18);
}
.arabic {
diff --git a/view/molistar/modules/taskCenter/images/GM_UP_MIC.png b/view/molistar/modules/taskCenter/images/GM_UP_MIC.png
new file mode 100644
index 00000000..2de61542
Binary files /dev/null and b/view/molistar/modules/taskCenter/images/GM_UP_MIC.png differ
diff --git a/view/molistar/modules/taskCenter/js/index.js b/view/molistar/modules/taskCenter/js/index.js
index 49f8c670..5d987362 100644
--- a/view/molistar/modules/taskCenter/js/index.js
+++ b/view/molistar/modules/taskCenter/js/index.js
@@ -238,6 +238,10 @@ function getTaskList(taskTabType) {
let str = '';
res.data.forEach((item, index) => {
if (item.taskType != 'ROOM_DAY_DIAMOND' && item.taskType != 'GUILD_WEEK_REWARD') {
+ if(item.expireSecond && item.expireSecond > 0){
+ countup(item.expireSecond)
+ }
+ // 日常任务
let rewardVos = ''
if (item.rewardVos) {
item.rewardVos.forEach((item, index) => {
@@ -251,6 +255,7 @@ function getTaskList(taskTabType) {
}
str += `
+
})
@@ -265,8 +270,9 @@ function getTaskList(taskTabType) {
`
+
} else if (item.taskType == 'ROOM_DAY_DIAMOND') {
- // 房间钻石流水任务
+ // 房间日流水奖励
let levelVos = ''
item.diamondVo.levelVos.forEach((itemTwo, indexTwo) => {
levelVos += `
@@ -312,6 +318,7 @@ function getTaskList(taskTabType) {
@@ -357,7 +364,7 @@ function funTaskType(type, num, standardValue) {
RECV_LUCKY_GIFT: langReplace(localLang.demoModule.RECV_LUCKY_GIFT),
RECV_NOMAL_GIFT: langReplace(localLang.demoModule.RECV_NOMAL_GIFT),
RECV_NOMAL_GIFT_GOLD: langReplace(localLang.demoModule.RECV_NOMAL_GIFT_GOLD),
- ROOM_SEND_NOMAL_GIFT_GOLD: langReplace(localLang.demoModule.ROOM_SEND_NOMAL_GIFT_GOLD(num, standardValue)),
+ ROOM_SEND_NOMAL_GIFT_GOLD: langReplace(localLang.demoModule.ROOM_SEND_NOMAL_GIFT_GOLD),
ROOM_DAY_DIAMOND: langReplace(localLang.demoModule.Room_income),
UP_MIC_COIN: langReplace(localLang.demoModule.UP_MIC_120(num, standardValue)),
GUILD_WEEK_REWARD: langReplace(localLang.demoModule.Diamond_income(num, standardValue)),
@@ -365,6 +372,7 @@ function funTaskType(type, num, standardValue) {
CHARGE_GOLD_NUM_100: langReplace(localLang.demoModule.CHARGE_GOLD_NUM_100(num, standardValue)),
ROOM_SEND_LUCKY_NUM: langReplace(localLang.demoModule.ROOM_SEND_LUCKY_NUM(num, standardValue)),
ROOM_SEND_BRAVO_NUM: langReplace(localLang.demoModule.ROOM_SEND_BRAVO_NUM(num, standardValue)),
+ GM_UP_MIC: langReplace(localLang.demoModule.GM_UP_MIC(num, standardValue)),
}
return obj[type]
@@ -390,6 +398,7 @@ function funTaskTypeImg(type) {
CHARGE_GOLD_NUM_100: './images/CHARGE_GOLD_NUM.png',
ROOM_SEND_LUCKY_NUM: './images/CHARGE_GOLD_NUM.png',
ROOM_SEND_BRAVO_NUM: './images/CHARGE_GOLD_NUM.png',
+ GM_UP_MIC: './images/GM_UP_MIC.png',
}
return obj[type]
@@ -641,6 +650,46 @@ function getGuildWeekReward() {
$('.element-mask').css('top',offset.top)
$('.element-mask').css('height',outerHeight)
}
+var countupTime1;//倒计时容器
+// 倒計時
+function countup(leftTime, type) {
+ clearTimeout(countupTime1)
+ //獲取當前時間
+ // var now = nowTime;
+ var d = 0;
+ var h = 0;
+ var m = 0;
+ var s = 0;
+ //定義變數 d,h,m,s保存倒計時的時間
+ var d, h, m, s;
+ //遞歸每秒調⽤countTime⽅法，顯⽰動態時間效果
+ if (leftTime > 0) {
+ d = getzf(Math.floor(leftTime / 60 / 60 / 24));
+ h = getzf(Math.floor(leftTime / 60 / 60 % 24));
+ m = getzf(Math.floor(leftTime / 60 % 60));
+ s = getzf(Math.floor(leftTime % 60));
+ console.log(d,h,m,s)
+ //將倒計時賦值到div中
+ $('.countdown_box').html((d + 'D'+ ' ' + h + ':' + m + ':' + s));
+ } else {
+ rankGift();
+ }
+ if (leftTime > 0) {
+ leftTime = leftTime - 1;
+ }else{
+ clearTimeout(countupTime1);
+ }
+ countupTime1 = setTimeout(function () {
+ countup(leftTime);
+ }, 1000);
+}
+//补0操作
+function getzf(num) {
+ if (parseInt(num) < 10) {
+ num = '0' + num;
+ }
+ return num;
+}
var guildWeekRewardItems = [
{
level: 1,
diff --git a/view/molistar/modules/taskCenter/local/ar.js b/view/molistar/modules/taskCenter/local/ar.js
index 28b30933..ce347dd6 100644
--- a/view/molistar/modules/taskCenter/local/ar.js
+++ b/view/molistar/modules/taskCenter/local/ar.js
@@ -59,10 +59,8 @@ langAr = {
return `دخل الماس（${num}/${standardValue}💎）`;
},
Become_tasks:'انضم إلى النقابة للحصول على المزيد من المهام!',
- Stay_Tuned:'ترقبوا المزيد!',
- ROOM_SEND_NOMAL_GIFT_GOLD:function(num,standardValue){
- return `房间送普通礼物（${num}/${standardValue}）`;
- },
+ Stay_Tuned:'مهمة فتح هوية الوكيل',
+ ROOM_SEND_NOMAL_GIFT_GOLD:'إرسال هدايا بقيمة أكثر من ٢٠ ألف (لا تشمل هدايا الحظ أو برافو)',
CHARGE_GOLD_NUM_50:function(num,standardValue){
return `شحن (${num}/${standardValue})`
},
@@ -70,10 +68,13 @@ langAr = {
return `شحن (${num}/${standardValue})`
},
ROOM_SEND_LUCKY_NUM:function(num,standardValue){
- return `送出（${num}/${standardValue}）个幸运礼物`;
+ return `إرسال （${num}/${standardValue}） هدية حظ`;
},
ROOM_SEND_BRAVO_NUM:function(num,standardValue){
- return `送出（${num}/${standardValue}））个Bravo礼物`;
+ return `إرسال （${num}/${standardValue}） هدية برافو`;
+ },
+ GM_UP_MIC:function(num,standardValue){
+ return `مكافأة جديدة للوقت الصوتي للمضيف（${num}/${standardValue}دقيقة）`;
},
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/local/br.js b/view/molistar/modules/taskCenter/local/br.js
index 6794e164..50ca8b79 100644
--- a/view/molistar/modules/taskCenter/local/br.js
+++ b/view/molistar/modules/taskCenter/local/br.js
@@ -58,10 +58,8 @@ langBr = {
return `Renda de moedas da sala（${num}/${standardValue}💎）`;
},
Become_tasks:'Torne-se membro da guilda para obter mais tarefas!',
- Stay_Tuned:'Fiquem atentos!',
- ROOM_SEND_NOMAL_GIFT_GOLD:function(num,standardValue){
- return `房间送普通礼物（${num}/${standardValue}）`;
- },
+ Stay_Tuned:'Missão de Desbloqueio de Identidade de Agente',
+ ROOM_SEND_NOMAL_GIFT_GOLD:'Envie presentes no valor de mais de 20 mil (não inclui presentes lucky/bravo)',
CHARGE_GOLD_NUM_50: function(num, standardValue) {
return `Recarregar (${num}/${standardValue}) moedas`
},
@@ -69,10 +67,13 @@ langBr = {
return `Recarregar (${num}/${standardValue}) moedas`
},
ROOM_SEND_LUCKY_NUM:function(num,standardValue){
- return `送出（${num}/${standardValue}）个幸运礼物`;
+ return `Envie （${num}/${standardValue}） presentes Lucky`;
},
ROOM_SEND_BRAVO_NUM:function(num,standardValue){
- return `送出（${num}/${standardValue}））个Bravo礼物`;
+ return `Envie （${num}/${standardValue}） presentes Bravo`;
+ },
+ GM_UP_MIC:function(num,standardValue){
+ return `Nova recompensa de tempo de microfone para anfitriões（${num}/${standardValue}mins）`;
},
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/local/en.js b/view/molistar/modules/taskCenter/local/en.js
index 8460217f..9c2c2b68 100644
--- a/view/molistar/modules/taskCenter/local/en.js
+++ b/view/molistar/modules/taskCenter/local/en.js
@@ -59,10 +59,8 @@ langEn = {
return `Diamond income（${num}/${standardValue}💎）`;
},
Become_tasks:'Become a agency member to get more tasks!',
- Stay_Tuned:'Stay Tuned!',
- ROOM_SEND_NOMAL_GIFT_GOLD:function(num,standardValue){
- return `房间送普通礼物（${num}/${standardValue}）`;
- },
+ Stay_Tuned:'Agent Identity Unlock Mission',
+ ROOM_SEND_NOMAL_GIFT_GOLD:'Send gift more than 20K (Not include lucky/bravo gift)',
CHARGE_GOLD_NUM_50:function(num,standardValue){
return `Recharge (${num}/${standardValue}) Coins`
},
@@ -70,10 +68,13 @@ langEn = {
return `Recharge (${num}/${standardValue}) Coins`
},
ROOM_SEND_LUCKY_NUM:function(num,standardValue){
- return `送出（${num}/${standardValue}）个幸运礼物`;
+ return `Send （${num}/${standardValue}） Lucky gifts`;
},
ROOM_SEND_BRAVO_NUM:function(num,standardValue){
- return `送出（${num}/${standardValue}））个Bravo礼物`;
+ return `Send （${num}/${standardValue}） Bravo gifts`;
+ },
+ GM_UP_MIC:function(num,standardValue){
+ return `New host reward（${num}/${standardValue}mins）`;
},
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/local/tr.js b/view/molistar/modules/taskCenter/local/tr.js
index 0c904109..e8256f5e 100644
--- a/view/molistar/modules/taskCenter/local/tr.js
+++ b/view/molistar/modules/taskCenter/local/tr.js
@@ -59,10 +59,8 @@ langTr = {
return `Oda jetonu geliri（${num}/${standardValue}💎）`;
},
Become_tasks:'Daha fazla görev almak için lonca üyesi ol!',
- Stay_Tuned:'Bizi izlemeye devam edin!',
- ROOM_SEND_NOMAL_GIFT_GOLD:function(num,standardValue){
- return `房间送普通礼物（${num}/${standardValue}）`;
- },
+ Stay_Tuned:'Ajan Kimlik Açma Görevi',
+ ROOM_SEND_NOMAL_GIFT_GOLD:`20K'dan fazla hediye gönder (şanslı/bravo hediyesi hariç)`,
CHARGE_GOLD_NUM_50:function(num,standardValue){
return `(${num}/${standardValue})'i yeniden yükleyin`
},
@@ -70,10 +68,13 @@ langTr = {
return `(${num}/${standardValue})'i yeniden yükleyin`
},
ROOM_SEND_LUCKY_NUM:function(num,standardValue){
- return `送出（${num}/${standardValue}）个幸运礼物`;
+ return `（${num}/${standardValue}） Şanslı hediye gönder`;
},
ROOM_SEND_BRAVO_NUM:function(num,standardValue){
- return `送出（${num}/${standardValue}））个Bravo礼物`;
+ return `（${num}/${standardValue}） Bravo hediyesi gönder`;
+ },
+ GM_UP_MIC:function(num,standardValue){
+ return `Yeni sunucu mikrofon süresi ödülü（${num}/${standardValue}dk）`;
},
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/local/zh.js b/view/molistar/modules/taskCenter/local/zh.js
index cbe177ca..0f36d34d 100644
--- a/view/molistar/modules/taskCenter/local/zh.js
+++ b/view/molistar/modules/taskCenter/local/zh.js
@@ -59,10 +59,8 @@ langZh = {
return `钻石流水收入（${num}/${standardValue}💎）`;
},
Become_tasks:'成为公会成员即可获得更多任务！',
- Stay_Tuned:'敬请期待～',
- ROOM_SEND_NOMAL_GIFT_GOLD:function(num,standardValue){
- return `房间送普通礼物（${num}/${standardValue}）`;
- },
+ Stay_Tuned:'公会长身份开启任务～',
+ ROOM_SEND_NOMAL_GIFT_GOLD:'送出单个礼物价值超过20K',
CHARGE_GOLD_NUM_50:function(num,standardValue){
return `儲值(${num}/${standardValue})`;
},
@@ -75,5 +73,8 @@ langZh = {
ROOM_SEND_BRAVO_NUM:function(num,standardValue){
return `送出（${num}/${standardValue}））个Bravo礼物`;
},
+ GM_UP_MIC:function(num,standardValue){
+ return `新主播上麦奖励（${num}/${standardValue}mins）`;
+ },
}
}
\ No newline at end of file