From 313d3fae3ee797a85d9c0563bc466d8f213d5ef8 Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 26 May 2022 19:43:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E7=89=B9=E6=83=A0=E7=A4=BC=E5=8C=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activityField/dailyRMBGiftsField.ts | 9 +- shared/resource/jsons/dic_goods.json | 218 ++++++++++++++++-- 2 files changed, 205 insertions(+), 22 deletions(-) diff --git a/shared/domain/activityField/dailyRMBGiftsField.ts b/shared/domain/activityField/dailyRMBGiftsField.ts index dce374d83..9802a91f4 100644 --- a/shared/domain/activityField/dailyRMBGiftsField.ts +++ b/shared/domain/activityField/dailyRMBGiftsField.ts @@ -70,14 +70,13 @@ export class DailyRMBGiftsData extends ActivityBase { } public calTodayReceiveStatus() { + this.unReceiveCount = this.unReceived.length; if(this.isBuy) { let hasAllReceived = !this.list.find(item => !item.isReceive); - console.log('##### calTodayReceiveStatus', this.unReceived, this.todayIndex, hasAllReceived) if(!hasAllReceived && this.unReceived.indexOf(this.todayIndex) == -1) { - this.unReceived.push(this.todayIndex); + this.unReceiveCount++; } } - this.unReceiveCount = this.unReceived.length; } public calButtonStatus() { @@ -88,6 +87,10 @@ export class DailyRMBGiftsData extends ActivityBase { } else { this.buttonStatus = DAILY_RMB_GIFT_STATUS.CAN_RECEIVE; } + } else { + if(this.unReceiveCount > 0) { + this.buttonStatus = DAILY_RMB_GIFT_STATUS.HAS_RECEIVED; + } } } diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json index b6db07f5e..30e1400b3 100644 --- a/shared/resource/jsons/dic_goods.json +++ b/shared/resource/jsons/dic_goods.json @@ -1063,9 +1063,9 @@ }, { "good_id": 11265, - "name": "精英曹操头像", + "name": "银枪白马头像", "quality": 1, - "image_id": 41024, + "image_id": 41202, "itid": 50, "goodType": 9, "redPoint": 0, @@ -1074,16 +1074,16 @@ "getWays": "&", "useWays": "&", "value": 0, - "condition": "7&41101", + "condition": "7&41202", "timelimit": 0, "gift": 0, - "info": "精英曹操" + "info": "银枪白马（赵云）头像" }, { "good_id": 11266, - "name": "精英赵云头像", + "name": "枪出如龙头像", "quality": 1, - "image_id": 41013, + "image_id": 41119, "itid": 50, "goodType": 9, "redPoint": 0, @@ -1095,7 +1095,97 @@ "condition": "7&41119", "timelimit": 0, "gift": 0, - "info": "精英赵云" + "info": "枪出如龙（赵云）头像" + }, + { + "good_id": 11267, + "name": "红袖枭姬头像", + "quality": 1, + "image_id": 41138, + "itid": 50, + "goodType": 9, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41138", + "timelimit": 0, + "gift": 0, + "info": "红袖枭姬（孙尚香）头像" + }, + { + "good_id": 11268, + "name": "曲误周顾头像", + "quality": 1, + "image_id": 41140, + "itid": 50, + "goodType": 9, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41140", + "timelimit": 0, + "gift": 0, + "info": "曲误周顾（小乔）头像" + }, + { + "good_id": 11269, + "name": "无双飞将头像", + "quality": 1, + "image_id": 41144, + "itid": 50, + "goodType": 9, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41144", + "timelimit": 0, + "gift": 0, + "info": "无双飞将（吕布）头像" + }, + { + "good_id": 11270, + "name": "少女无暇头像", + "quality": 1, + "image_id": 41153, + "itid": 50, + "goodType": 9, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41153", + "timelimit": 0, + "gift": 0, + "info": "少女无暇（夏侯轻衣）头像" + }, + { + "good_id": 11271, + "name": "有女初成头像", + "quality": 1, + "image_id": 41156, + "itid": 50, + "goodType": 9, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41156", + "timelimit": 0, + "gift": 0, + "info": "有女初成（貂蝉）头像" }, { "good_id": 11301, @@ -2233,29 +2323,29 @@ }, { "good_id": 11465, - "name": "精英曹操形象", + "name": "银枪白马形象", "quality": 1, - "image_id": 41101, + "image_id": 41202, "itid": 52, - "goodType": 9, + "goodType": 11, "redPoint": 0, "decomposeItem": "&", "hid": 0, "getWays": "&", "useWays": "&", "value": 0, - "condition": "7&41101", + "condition": "7&41202", "timelimit": 0, "gift": 0, - "info": "精英曹操" + "info": "银枪白马（赵云）的形象" }, { "good_id": 11466, - "name": "精英赵云形象", + "name": "枪出如龙形象", "quality": 1, "image_id": 41119, "itid": 52, - "goodType": 9, + "goodType": 11, "redPoint": 0, "decomposeItem": "&", "hid": 0, @@ -2265,11 +2355,101 @@ "condition": "7&41119", "timelimit": 0, "gift": 0, - "info": "精英赵云" + "info": "枪出如龙（赵云）的形象" + }, + { + "good_id": 11467, + "name": "红袖枭姬形象", + "quality": 1, + "image_id": 41138, + "itid": 52, + "goodType": 11, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41138", + "timelimit": 0, + "gift": 0, + "info": "红袖枭姬（孙尚香）的形象" + }, + { + "good_id": 11468, + "name": "曲误周顾形象", + "quality": 1, + "image_id": 41140, + "itid": 52, + "goodType": 11, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41140", + "timelimit": 0, + "gift": 0, + "info": "曲误周顾（小乔）的形象" + }, + { + "good_id": 11469, + "name": "无双飞将形象", + "quality": 1, + "image_id": 41144, + "itid": 52, + "goodType": 11, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41144", + "timelimit": 0, + "gift": 0, + "info": "无双飞将（吕布）的形象" + }, + { + "good_id": 11470, + "name": "少女无暇形象", + "quality": 1, + "image_id": 41153, + "itid": 52, + "goodType": 11, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41153", + "timelimit": 0, + "gift": 0, + "info": "少女无暇（夏侯轻衣）的形象" + }, + { + "good_id": 11471, + "name": "有女初成形象", + "quality": 1, + "image_id": 41156, + "itid": 52, + "goodType": 11, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "useWays": "&", + "value": 0, + "condition": "7&41156", + "timelimit": 0, + "gift": 0, + "info": "有女初成（貂蝉）的形象" }, { "good_id": 17001, - "name": "觉醒丹", + "name": "觉醒石", "quality": 5, "image_id": "wujiangjuexingshi", "itid": 38, @@ -2283,7 +2463,7 @@ "condition": 0, "timelimit": 0, "gift": 0, - "info": "觉醒丹，用于武将觉醒，激发武将潜能，提升武将品质" + "info": "觉醒石，用于武将觉醒，激发武将潜能，提升武将品质" }, { "good_id": 17002, @@ -4227,7 +4407,7 @@ "condition": 0, "timelimit": 0, "gift": 0, - "info": "使用后可招募武将" + "info": "使用后可在点将招募武将" }, { "good_id": 22002, @@ -4245,7 +4425,7 @@ "condition": 0, "timelimit": 0, "gift": 0, - "info": "使用后可招募武将" + "info": "使用后可在求贤若渴招募武将" }, { "good_id": 22003,