From 0dbc300b49619524ae6c21de06805175bd361429 Mon Sep 17 00:00:00 2001 From: yangqiwen <494909017@qq.com> Date: Fri, 14 Feb 2025 17:35:06 +0800 Subject: [PATCH] 1 --- assets/CommonRes/texture/namebg.png | Bin 0 -> 4436 bytes assets/CommonRes/texture/namebg.png.meta | 38 + assets/DH/DH_1/res.meta | 13 - assets/DH/DH_1/spine.meta | 13 - assets/DH/DH_2/res.meta | 13 - assets/DH/DH_2/spine.meta | 13 - assets/DH/DH_3/res.meta | 13 - assets/DH/DH_3/spine.meta | 13 - assets/GameRoomRes/Room1/prefab/Room1.prefab | 8 +- assets/GameRoomRes/Room2/prefab/Room2.prefab | 803 +++++++++++------- assets/GameRoomRes/Room2/texture/现金 1.png | Bin 1773 -> 8352 bytes .../Room2/texture/现金 1.png.meta | 16 +- assets/GameRoomRes/Room2/texture/现金.png | Bin 3164 -> 8352 bytes .../GameRoomRes/Room2/texture/现金.png.meta | 12 +- .../prefab/KaiChangGuanQia1Gai.prefab | 524 ++++++++++-- .../PeopleLevelUp/prefab/PeopleLevelUp.prefab | 14 +- .../GameMethodRes/shouhuoji/ShouHuoJiGai.ts | 2 +- assets/Scripts/GameRoomRes/Room1/Room1.ts | 6 + assets/Scripts/GameRoomRes/Room2/Room2.ts | 5 + assets/Scripts/Manager/LevelUpManager.ts | 60 +- .../PeopleLevelUp/PeopleLevelUpScript.ts | 21 +- assets/Scripts/ZaoCanDian/ZaoCanDian.ts | 13 +- 22 files changed, 1069 insertions(+), 531 deletions(-) create mode 100644 assets/CommonRes/texture/namebg.png create mode 100644 assets/CommonRes/texture/namebg.png.meta delete mode 100644 assets/DH/DH_1/res.meta delete mode 100644 assets/DH/DH_1/spine.meta delete mode 100644 assets/DH/DH_2/res.meta delete mode 100644 assets/DH/DH_2/spine.meta delete mode 100644 assets/DH/DH_3/res.meta delete mode 100644 assets/DH/DH_3/spine.meta diff --git a/assets/CommonRes/texture/namebg.png b/assets/CommonRes/texture/namebg.png new file mode 100644 index 0000000000000000000000000000000000000000..f6067c9e72b9b67622bae9926c7e6796f3cb087b GIT binary patch literal 4436 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 { + this.updateMainTask() + }, this) } showChatBtnStatus() { let openBtnSpine = this.node.getChildByName('openBtnSpine') @@ -121,7 +124,10 @@ export default class Room1 extends cc.Component { } clickWXChat() { JuQingManager.openJuQingOrChat('WX') + } + updateMainTask() { + this.node.getChildByName('手机').active = false this.node.getChildByName('回家').active = true } diff --git a/assets/Scripts/GameRoomRes/Room2/Room2.ts b/assets/Scripts/GameRoomRes/Room2/Room2.ts index 2fcd44e6..22600058 100644 --- a/assets/Scripts/GameRoomRes/Room2/Room2.ts +++ b/assets/Scripts/GameRoomRes/Room2/Room2.ts @@ -273,6 +273,9 @@ export default class Room2 extends cc.Component { this.node.getChildByName('mainNode').getChildByName('牌匾 破旧').active = true this.node.getChildByName('mainNode').getChildByName('老婆鞋子').active = true this.node.getChildByName('mainNode').getChildByName('行李箱').active = true + + let chuMen = this.node.getChildByName('出门') + chuMen.active = false } if (mainId == MainTaskIdEnum.MainTask_303 || mainId == MainTaskIdEnum.MainTask_401) { this.node.getChildByName('mainNode').getChildByName('老板').active = true this.node.getChildByName('mainNode').getChildByName('老婆').active = true @@ -296,6 +299,8 @@ export default class Room2 extends cc.Component { } else if (mainId == MainTaskIdEnum.MainTask_201) { this.node.getChildByName('mainNode').getChildByName('女儿站').active = true this.node.getChildByName('mainNode').getChildByName('女儿站').getComponent(sp.Skeleton).setAnimation(0, '女儿哭泣', true) + let chuMen = this.node.getChildByName('出门') + chuMen.active = false } else if (mainId == MainTaskIdEnum.MainTask_402) { this.node.getChildByName('mainNode').getChildByName('女儿站').active = true this.node.getChildByName('mainNode').getChildByName('女儿站').getComponent(sp.Skeleton).setAnimation(0, '女儿哭泣', true) diff --git a/assets/Scripts/Manager/LevelUpManager.ts b/assets/Scripts/Manager/LevelUpManager.ts index 8e7f22cb..9a26ed88 100644 --- a/assets/Scripts/Manager/LevelUpManager.ts +++ b/assets/Scripts/Manager/LevelUpManager.ts @@ -106,36 +106,36 @@ let jiesuoProConfig = [ // { level: 2300, pro: [] }, // { level: 3000, pro: [] }, - { level: 100, pro: [{ isPic: false, name: '云欣' }, { isPic: true, name: '牛肉拉面', isShipu: true }] }, - { level: 150, pro: [{ isPic: false, name: '媱安' }] }, - { level: 200, pro: [{ isPic: false, name: '诗涵' }, { isPic: true, name: '油泼面', isShipu: true }, { isPic: true, name: '擀面杖', isShipu: false }] }, - { level: 300, pro: [{ isPic: false, name: '婉仪' }, { isPic: true, name: '海鲜面', isShipu: true }, { isPic: true, name: '砧板', isShipu: false }] }, - { level: 350, pro: [{ isPic: true, name: '馒头', isShipu: true }] }, - { level: 400, pro: [{ isPic: false, name: '诺依' }, { isPic: true, name: '烧麦', isShipu: true }, { isPic: true, name: '面锅', isShipu: false }] }, - { level: 450, pro: [{ isPic: true, name: '春卷', isShipu: true }] }, - { level: 500, pro: [{ isPic: false, name: '晴萱' }, { isPic: true, name: '龙须面', isShipu: true }, { isPic: true, name: '漏勺', isShipu: false }] }, - { level: 500, pro: [{ isPic: true, name: '百合酥', isShipu: true }] }, - { level: 600, pro: [{ isPic: false, name: '蕾蕾' }, { isPic: true, name: '鲜肉馄饨', isShipu: true }, { isPic: true, name: '汤勺', isShipu: false }] }, - { level: 650, pro: [{ isPic: true, name: '刀削面', isShipu: true }] }, - { level: 700, pro: [{ isPic: false, name: '水萌' }, { isPic: true, name: '猫耳朵', isShipu: true }, { isPic: true, name: '摆摊车', isShipu: false }] }, - { level: 750, pro: [{ isPic: true, name: '铜锣烧', isShipu: true }] }, - { level: 800, pro: [{ isPic: false, name: '可微' }, { isPic: true, name: '意面', isShipu: true }, { isPic: true, name: '调料盒', isShipu: false }] }, - { level: 850, pro: [{ isPic: true, name: '热干面', isShipu: true }] }, - { level: 900, pro: [{ isPic: false, name: '以南' }, { isPic: true, name: '三鲜饺子', isShipu: true }, { isPic: true, name: '长筷子', isShipu: false }] }, - { level: 950, pro: [{ isPic: true, name: '栗子酥', isShipu: true }] }, - { level: 1000, pro: [{ isPic: false, name: '悦澄' }, { isPic: true, name: '龙须酥', isShipu: true }] }, - { level: 1050, pro: [{ isPic: true, name: '椒盐酥', isShipu: true }] }, - { level: 1100, pro: [{ isPic: false, name: '夏彤' }, { isPic: true, name: '杏仁酥', isShipu: true }] }, - { level: 1150, pro: [{ isPic: true, name: '灌汤包', isShipu: true }] }, - { level: 1200, pro: [{ isPic: false, name: '紫琳' }, { isPic: true, name: '多味茶酥', isShipu: true }, { isPic: true, name: '抹布', isShipu: false }] }, - { level: 1250, pro: [{ isPic: true, name: '金丝面', isShipu: true }] }, - { level: 1300, pro: [{ isPic: false, name: '羽婷' }, { isPic: true, name: '小笼包', isShipu: true }] }, - { level: 1350, pro: [{ isPic: true, name: '水晶饺子', isShipu: true }] }, - { level: 1400, pro: [{ isPic: false, name: '梵音' }, { isPic: true, name: '煎饺', isShipu: true }] }, - { level: 1450, pro: [{ isPic: true, name: '抄手', isShipu: true }] }, - { level: 1500, pro: [{ isPic: false, name: '诗锦' }, { isPic: true, name: '鲜花饼', isShipu: true }, { isPic: true, name: '煤气灶', isShipu: false }] }, - { level: 1800, pro: [{ isPic: true, name: '招牌', isShipu: false }] }, - { level: 2000, pro: [{ isPic: false, name: '绮罗' }] }, + // { level: 100, pro: [{ isPic: false, name: '云欣' }, { isPic: true, name: '牛肉拉面', isShipu: true }] }, + // { level: 150, pro: [{ isPic: false, name: '媱安' }] }, + // { level: 200, pro: [{ isPic: false, name: '诗涵' }, { isPic: true, name: '油泼面', isShipu: true }, { isPic: true, name: '擀面杖', isShipu: false }] }, + // { level: 300, pro: [{ isPic: false, name: '婉仪' }, { isPic: true, name: '海鲜面', isShipu: true }, { isPic: true, name: '砧板', isShipu: false }] }, + // { level: 350, pro: [{ isPic: true, name: '馒头', isShipu: true }] }, + // { level: 400, pro: [{ isPic: false, name: '诺依' }, { isPic: true, name: '烧麦', isShipu: true }, { isPic: true, name: '面锅', isShipu: false }] }, + // { level: 450, pro: [{ isPic: true, name: '春卷', isShipu: true }] }, + // { level: 500, pro: [{ isPic: false, name: '晴萱' }, { isPic: true, name: '龙须面', isShipu: true }, { isPic: true, name: '漏勺', isShipu: false }] }, + // { level: 500, pro: [{ isPic: true, name: '百合酥', isShipu: true }] }, + // { level: 600, pro: [{ isPic: false, name: '蕾蕾' }, { isPic: true, name: '鲜肉馄饨', isShipu: true }, { isPic: true, name: '汤勺', isShipu: false }] }, + // { level: 650, pro: [{ isPic: true, name: '刀削面', isShipu: true }] }, + // { level: 700, pro: [{ isPic: false, name: '水萌' }, { isPic: true, name: '猫耳朵', isShipu: true }, { isPic: true, name: '摆摊车', isShipu: false }] }, + // { level: 750, pro: [{ isPic: true, name: '铜锣烧', isShipu: true }] }, + // { level: 800, pro: [{ isPic: false, name: '可微' }, { isPic: true, name: '意面', isShipu: true }, { isPic: true, name: '调料盒', isShipu: false }] }, + // { level: 850, pro: [{ isPic: true, name: '热干面', isShipu: true }] }, + // { level: 900, pro: [{ isPic: false, name: '以南' }, { isPic: true, name: '三鲜饺子', isShipu: true }, { isPic: true, name: '长筷子', isShipu: false }] }, + // { level: 950, pro: [{ isPic: true, name: '栗子酥', isShipu: true }] }, + // { level: 1000, pro: [{ isPic: false, name: '悦澄' }, { isPic: true, name: '龙须酥', isShipu: true }] }, + // { level: 1050, pro: [{ isPic: true, name: '椒盐酥', isShipu: true }] }, + // { level: 1100, pro: [{ isPic: false, name: '夏彤' }, { isPic: true, name: '杏仁酥', isShipu: true }] }, + // { level: 1150, pro: [{ isPic: true, name: '灌汤包', isShipu: true }] }, + // { level: 1200, pro: [{ isPic: false, name: '紫琳' }, { isPic: true, name: '多味茶酥', isShipu: true }, { isPic: true, name: '抹布', isShipu: false }] }, + // { level: 1250, pro: [{ isPic: true, name: '金丝面', isShipu: true }] }, + // { level: 1300, pro: [{ isPic: false, name: '羽婷' }, { isPic: true, name: '小笼包', isShipu: true }] }, + // { level: 1350, pro: [{ isPic: true, name: '水晶饺子', isShipu: true }] }, + // { level: 1400, pro: [{ isPic: false, name: '梵音' }, { isPic: true, name: '煎饺', isShipu: true }] }, + // { level: 1450, pro: [{ isPic: true, name: '抄手', isShipu: true }] }, + // { level: 1500, pro: [{ isPic: false, name: '诗锦' }, { isPic: true, name: '鲜花饼', isShipu: true }, { isPic: true, name: '煤气灶', isShipu: false }] }, + // { level: 1800, pro: [{ isPic: true, name: '招牌', isShipu: false }] }, + // { level: 2000, pro: [{ isPic: false, name: '绮罗' }] }, ] diff --git a/assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts b/assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts index bab87451..d83d3106 100644 --- a/assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts +++ b/assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts @@ -144,15 +144,15 @@ export default class PeopleLevelUpScript extends UiBase { //let clickInComeMoney = LevelUpManager.clickInComeMoney() let isMaxLevel = LevelUpManager.isPeopleLevelUpMax() let myMoney = UserManager.getCurMoney() - // if (myMoney - levelUpSpned >= 0) { - // this.redPoint.active = true - // this.adBtn.active = false - // this.adBtnLab.string = '升级' - // } else { - // this.redPoint.active = false - // this.adBtn.active = true - // this.adBtnLab.string = '升级+5' - // } + if (myMoney - levelUpSpned >= 0) { + // this.redPoint.active = true + this.adBtn.active = false + // this.adBtnLab.string = '升级' + } else { + // this.redPoint.active = false + this.adBtn.active = true + // this.adBtnLab.string = '升级+5' + } if (isMaxLevel) { this.shengjiBtn.active = false @@ -318,7 +318,8 @@ export default class PeopleLevelUpScript extends UiBase { User.setShowAdNum(User.getShowAdNum() + 1) Common5.ReportDY("inLevel", `任务${TaskManager.getCurUnLockMainTaskId()}-AD-升级界面升级`) // Common5.ReportDY("inLevel", "升级界面-AD-升级"); - let dataPro = LevelUpManager.peopleLevelUp(5) + // let dataPro = LevelUpManager.peopleLevelUp(5) + let dataPro = LevelUpManager.peopleLevelUp(1) if (dataPro) { PrefabManage.loadPrefabByType(GameType.JieSuoPro, null, (prefab) => { prefab.getComponent('JieSuoPro').setViewData(dataPro) diff --git a/assets/Scripts/ZaoCanDian/ZaoCanDian.ts b/assets/Scripts/ZaoCanDian/ZaoCanDian.ts index f567791f..bf4c3871 100644 --- a/assets/Scripts/ZaoCanDian/ZaoCanDian.ts +++ b/assets/Scripts/ZaoCanDian/ZaoCanDian.ts @@ -83,7 +83,11 @@ export default class ZaoCanDian extends cc.Component { } } if (i == 3) { - this.setTanWeiSpine(i, `静止放${name}余${shengyuNum}`, shengyuNum) + if (shengyuNum == 3) { + this.setTanWeiSpine(i, `静止放${name}`, 3) + } else { + this.setTanWeiSpine(i, `静止放${name}余${shengyuNum}`, shengyuNum) + } } } @@ -148,7 +152,12 @@ export default class ZaoCanDian extends cc.Component { if (!_npc) { //没有一个npc需要这个早餐 //补货，少几个补几个 if (shengyuNum < 3) { - this.setTanWeiSpine(custom, `${zaoCanStr}余${shengyuNum}`, shengyuNum) + if (shengyuNum == 0) { + //手动补货，补全 + this.setTanWeiSpine(custom, zaoCanStr, 3) + }else{ + this.setTanWeiSpine(custom, `${zaoCanStr}余${shengyuNum}`, 3) + } } else { //所属物品摊位放大缩小 }