diff --git a/assets/LoginScene.fire b/assets/LoginScene.fire index 2d872e92..961b1c7f 100644 --- a/assets/LoginScene.fire +++ b/assets/LoginScene.fire @@ -13997,7 +13997,7 @@ "__id__": 411 } ], - "_active": true, + "_active": false, "_level": 2, "_components": [ { diff --git a/assets/scripts/UI/task/mission_choose.js b/assets/scripts/UI/task/mission_choose.js index adb57c52..a17433ef 100644 --- a/assets/scripts/UI/task/mission_choose.js +++ b/assets/scripts/UI/task/mission_choose.js @@ -62,6 +62,11 @@ cc.Class({ }, initData(data, ceg_num) { + // console.log('mission data' + JSON.stringify(data)); + + this.missionTitle.string = data.name; + this.missionDesc.string = data.des; + this.allChooseHero = new Array(); this.allChooseHero.length = 5; this.allChooseGun = new Array(); diff --git a/assets/scripts/UI/task/singleWanted.js b/assets/scripts/UI/task/singleWanted.js index ed6c9046..c205a298 100644 --- a/assets/scripts/UI/task/singleWanted.js +++ b/assets/scripts/UI/task/singleWanted.js @@ -143,6 +143,9 @@ cc.Class({ }, init(data, originData) { + // console.log('dddd' + JSON.stringify(data)); + // console.log('0000' + JSON.stringify(originData)); + if (data.param2) { for (let i = 0; i < data.param2; i += 1) { this.stars.children[i].getComponent(cc.Sprite).spriteFrame = diff --git a/assets/scripts/game/gameConfig.js b/assets/scripts/game/gameConfig.js index 418d76d3..832425cb 100644 --- a/assets/scripts/game/gameConfig.js +++ b/assets/scripts/game/gameConfig.js @@ -32104,16 +32104,16 @@ var task = { name: 'Weekly Challenges: Week 1 Mission', }, 76006: { - name: 'test 6', + name: 'Arrest Thief', boost: 10, - des: 'test 6', + des: 'Arrest the thief based on intelligence.', subtype: 1, season_task: 0, - param4: 6, + param4: 4, param3: 3, param2: 1, param1: 1, - time: 300, + time: 1500, reward: 10000, type: 7, id: 76006, @@ -32133,16 +32133,16 @@ var task = { target: 10.0, }, 76004: { - name: 'test 4', + name: 'Peace Order Patrol', boost: 10, - des: 'test 4', + des: 'There has been a riot in the business district recently.', subtype: 1, season_task: 0, - param4: 4, + param4: 3, param3: 2, param2: 1, param1: 1, - time: 300, + time: 800, reward: 10000, type: 7, id: 76004, @@ -32150,30 +32150,33 @@ var task = { target: 1.0, }, 71101: { - name: 'Reach 30 Activeness week', - des: 'Reach 30 Activeness today', + name: 'Reach 10 Activeness week', + des: 'Reach 10 Activeness week', subtype: 2, target: 10.0, + reward: 10000, type: 1, id: 71101, condition: 44, icon: 'task1', }, 71102: { - name: 'Reach 60 Activeness week', - des: 'Reach 60 Activeness today', + name: 'Reach 30 Activeness week', + des: 'Reach 30 Activeness week', subtype: 2, target: 30.0, + reward: 10000, type: 1, id: 71102, condition: 44, icon: 'task1', }, 71103: { - name: 'Reach 90 Activeness week', - des: 'Reach 90 Activeness today', + name: 'Reach 50 Activeness week', + des: 'Reach 50 Activeness week', subtype: 2, target: 50.0, + reward: 10000, type: 1, id: 71103, condition: 44, @@ -32198,16 +32201,16 @@ var task = { icon: 'task1', }, 76002: { - name: 'test 2', + name: 'Public Security Management', boost: 10, - des: 'test 2', + des: 'There have been a lot of thieves lately.', subtype: 1, season_task: 0, param4: 2, param3: 1, param2: 1, param1: 1, - time: 300, + time: 400, reward: 10000, type: 7, id: 76002, @@ -32215,16 +32218,16 @@ var task = { target: 1.0, }, 76003: { - name: 'test 3', + name: 'Noise Harassment', boost: 10, - des: 'test 3', + des: 'There is a lot of onise in the residential area.', subtype: 1, season_task: 0, - param4: 3, + param4: 2, param3: 2, param2: 1, param1: 1, - time: 300, + time: 600, reward: 10000, type: 7, id: 76003, @@ -32232,16 +32235,16 @@ var task = { target: 1.0, }, 76008: { - name: 'test 8', + name: 'Preservation of Art', boost: 10, - des: 'test 8', + des: 'According to intelligence, a group of thieves stole the treasures of the museum.', subtype: 1, season_task: 0, - param4: 8, + param4: 5, param3: 4, param2: 1, param1: 1, - time: 300, + time: 3000, reward: 10000, type: 7, id: 76008, @@ -32249,16 +32252,16 @@ var task = { target: 1.0, }, 76009: { - name: 'test 9', + name: 'Dangerous Criminals', boost: 10, - des: 'test 9', + des: 'There is a dangerous and wanted criminal operating in the city.', subtype: 1, season_task: 0, - param4: 9, + param4: 5, param3: 5, param2: 1, param1: 1, - time: 300, + time: 3600, reward: 10000, type: 7, id: 76009, @@ -32306,16 +32309,16 @@ var task = { icon: 'task1', }, 76010: { - name: 'test 10', + name: 'Gang War', boost: 10, - des: 'test 10', + des: "There's a fight going on between two gangs. \nPlease stop it immediately.", subtype: 1, season_task: 0, - param4: 10, + param4: 5, param3: 5, param2: 1, param1: 1, - time: 300, + time: 3600, reward: 10000, type: 7, id: 76010, @@ -32416,9 +32419,9 @@ var task = { icon: 'task1', }, 76001: { - name: 'Gun & Rose', + name: 'Safety and Security', boost: 10, - des: 'test 1', + des: 'There was constant harassment of citizens around the town.', subtype: 1, season_task: 0, param4: 1, @@ -32523,16 +32526,16 @@ var task = { target: 5.0, }, 76005: { - name: 'test 5', + name: 'Crime Prevention', boost: 10, - des: 'test 5', + des: 'Send heroes for crime prevention campaigns.', subtype: 1, season_task: 0, - param4: 5, + param4: 3, param3: 3, param2: 1, param1: 1, - time: 300, + time: 1200, reward: 10000, type: 7, id: 76005, @@ -32540,16 +32543,16 @@ var task = { target: 1.0, }, 76007: { - name: 'test 7', + name: 'Bank Robbers', boost: 10, - des: 'test 7', + des: 'The bank has been robbed. \nWe need to apprehend it as soon as possible.', subtype: 1, season_task: 0, - param4: 7, + param4: 4, param3: 4, param2: 1, param1: 1, - time: 300, + time: 2400, reward: 10000, type: 7, id: 76007,