yangqiwen 3 months ago
parent 9b27c4861c
commit 26cadbd577
  1. 48
      assets/DH/DH_1/DH_1.prefab
  2. 613
      assets/DH/DH_3/DH_3.prefab
  3. 38
      assets/DH/DH_4/DH_4.prefab
  4. 42
      assets/DH/DH_5/DH_5.prefab
  5. 10
      assets/GameRes/JuQingChat/prefab/chatDialog.prefab
  6. 10
      assets/GameRes/JuQingChat/prefab/chatList.prefab
  7. 4
      assets/GameStoryRes/GameStory4/prefab/GameStory4.prefab
  8. 1469
      assets/GameStoryRes/KaiChangGuanQia1Gai/prefab/KaiChangGuanQia1Gai.prefab
  9. 1742
      assets/MainHall/prefab/MainHall.prefab
  10. 10
      assets/MishuGame/prefab/MishuGame.prefab
  11. 8
      assets/MishuReward/prefab/MishuReward.prefab
  12. 1
      assets/Scripts/DH/DH_1.ts
  13. 20
      assets/Scripts/DH/DH_3.ts
  14. 6
      assets/Scripts/GameRoomRes/Room2/Room2.ts
  15. 46
      assets/Scripts/GameStoryRes/KaiChangGuanQia1Gai.ts
  16. 2
      assets/Scripts/JuQingChat/TaskManager.ts
  17. 28
      assets/Scripts/MainHall/MainHall.ts
  18. 21
      assets/Scripts/MainHall/MainHallBtn.ts
  19. 4
      assets/Scripts/MainScene/MainScene.ts
  20. 45
      assets/Scripts/Manager/LevelUpManager.ts
  21. 40
      assets/Scripts/Manager/ZaoCanManager.ts
  22. 38
      assets/Scripts/ZaoCanDian/ZaoCanDian.ts
  23. 162
      assets/ZaoCanDian/prefab/ZaoCanDianYeWu.prefab
  24. 6
      remotesound/DH/sound.py

@ -2267,8 +2267,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 750,
"height": 134
"width": 638,
"height": 136
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2280,7 +2280,7 @@
"ctor": "Float64Array",
"array": [
0,
-446,
-200,
0,
0,
0,
@ -2428,7 +2428,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "be8d1c61-2a31-4384-9c00-a803d8d2d68e"
"__uuid__": "33fe8477-f03d-4fa5-a661-f9166d80ada7"
},
"_type": 0,
"_sizeMode": 1,
@ -2505,7 +2505,7 @@
"ctor": "Float64Array",
"array": [
0,
-446,
-200,
0,
0,
0,
@ -2556,8 +2556,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1102,
"height": 166
"width": 1099,
"height": 142
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2608,7 +2608,7 @@
],
"paused": false,
"defaultSkin": "default",
"defaultAnimation": "播放",
"defaultAnimation": "说话",
"_preCacheMode": 0,
"_cacheMode": 0,
"loop": true,
@ -2619,13 +2619,13 @@
"_frameCache": null,
"_curFrame": null,
"_skeletonCache": null,
"_animationName": "播放",
"_animationName": "说话",
"_animationQueue": [],
"_headAniInfo": null,
"_playTimes": 0,
"_isAniComplete": true,
"_N$skeletonData": {
"__uuid__": "9f5ebc4f-6ed3-4395-b096-3124aadd6a07"
"__uuid__": "aae0cac4-b922-4e99-8cff-7da9ca8713a1"
},
"_N$_defaultCacheMode": 0,
"_N$debugSlots": false,
@ -2654,7 +2654,7 @@
"__id__": 67
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 72
@ -2669,15 +2669,15 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 274,
"height": 44.32
"width": 186,
"height": 36.76
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2688,7 +2688,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
50.668,
25.595,
1.817,
0,
0,
@ -2728,10 +2728,10 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "你们父子要干什么!",
"_N$string": "你们父子要干什么!",
"_fontSize": 30,
"_lineHeight": 32,
"_string": "你们父子要干什",
"_N$string": "你们父子要干什",
"_fontSize": 26,
"_lineHeight": 26,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
@ -2756,9 +2756,9 @@
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 32,
"g": 73,
"b": 111,
"a": 255
},
"_width": 2,

File diff suppressed because it is too large Load Diff

@ -1261,7 +1261,7 @@
"ctor": "Float64Array",
"array": [
0,
-446,
-200,
0,
0,
0,
@ -1486,7 +1486,7 @@
"ctor": "Float64Array",
"array": [
0,
-446,
-200,
0,
0,
0,
@ -1537,8 +1537,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1102,
"height": 166
"width": 1099,
"height": 142
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -1589,7 +1589,7 @@
],
"paused": false,
"defaultSkin": "default",
"defaultAnimation": "播放",
"defaultAnimation": "说话",
"_preCacheMode": 0,
"_cacheMode": 0,
"loop": true,
@ -1600,13 +1600,13 @@
"_frameCache": null,
"_curFrame": null,
"_skeletonCache": null,
"_animationName": "播放",
"_animationName": "说话",
"_animationQueue": [],
"_headAniInfo": null,
"_playTimes": 0,
"_isAniComplete": true,
"_N$skeletonData": {
"__uuid__": "9f5ebc4f-6ed3-4395-b096-3124aadd6a07"
"__uuid__": "aae0cac4-b922-4e99-8cff-7da9ca8713a1"
},
"_N$_defaultCacheMode": 0,
"_N$debugSlots": false,
@ -1635,7 +1635,7 @@
"__id__": 39
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 44
@ -1650,15 +1650,15 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 274,
"height": 44.32
"width": 238,
"height": 36.76
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -1669,7 +1669,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
50.668,
25.595,
1.817,
0,
0,
@ -1711,8 +1711,8 @@
"_dstBlendFactor": 771,
"_string": "你们父子要干什么!",
"_N$string": "你们父子要干什么!",
"_fontSize": 30,
"_lineHeight": 32,
"_fontSize": 26,
"_lineHeight": 26,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
@ -1737,9 +1737,9 @@
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 32,
"g": 73,
"b": 111,
"a": 255
},
"_width": 2,

@ -1943,8 +1943,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1100,
"height": 149
"width": 750,
"height": 134
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -1956,7 +1956,7 @@
"ctor": "Float64Array",
"array": [
0,
-446,
-200,
0,
0,
0,
@ -2181,7 +2181,7 @@
"ctor": "Float64Array",
"array": [
0,
-446,
-200,
0,
0,
0,
@ -2232,8 +2232,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1102,
"height": 166
"width": 1099,
"height": 142
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2284,7 +2284,7 @@
],
"paused": false,
"defaultSkin": "default",
"defaultAnimation": "播放",
"defaultAnimation": "说话",
"_preCacheMode": 0,
"_cacheMode": 0,
"loop": true,
@ -2295,13 +2295,13 @@
"_frameCache": null,
"_curFrame": null,
"_skeletonCache": null,
"_animationName": "播放",
"_animationName": "说话",
"_animationQueue": [],
"_headAniInfo": null,
"_playTimes": 0,
"_isAniComplete": true,
"_N$skeletonData": {
"__uuid__": "9f5ebc4f-6ed3-4395-b096-3124aadd6a07"
"__uuid__": "aae0cac4-b922-4e99-8cff-7da9ca8713a1"
},
"_N$_defaultCacheMode": 0,
"_N$debugSlots": false,
@ -2330,7 +2330,7 @@
"__id__": 58
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 63
@ -2345,15 +2345,15 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 274,
"height": 44.32
"width": 238,
"height": 36.76
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2364,7 +2364,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
50.668,
25.595,
1.817,
0,
0,
@ -2406,8 +2406,8 @@
"_dstBlendFactor": 771,
"_string": "你们父子要干什么!",
"_N$string": "你们父子要干什么!",
"_fontSize": 30,
"_lineHeight": 32,
"_fontSize": 26,
"_lineHeight": 26,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
@ -2432,9 +2432,9 @@
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 32,
"g": 73,
"b": 111,
"a": 255
},
"_width": 2,

@ -7698,8 +7698,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 72,
"height": 70
"width": 87,
"height": 90
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -7751,7 +7751,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f762b5f5-7b9d-4532-9af6-21e01a5ebc34"
"__uuid__": "84a2e8ca-14c0-4538-a8ff-2e820fad9b01"
},
"_type": 0,
"_sizeMode": 1,
@ -8514,8 +8514,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 48,
"height": 34
"width": 46,
"height": 46
},
"_anchorPoint": {
"__type__": "cc.Vec2",

@ -2573,8 +2573,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 48,
"height": 34
"width": 46,
"height": 46
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2819,8 +2819,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 72,
"height": 70
"width": 87,
"height": 90
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2872,7 +2872,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f762b5f5-7b9d-4532-9af6-21e01a5ebc34"
"__uuid__": "84a2e8ca-14c0-4538-a8ff-2e820fad9b01"
},
"_type": 0,
"_sizeMode": 1,

File diff suppressed because it is too large Load Diff

@ -5519,7 +5519,7 @@
"_enabled": true,
"scaleStart": 1,
"scaleEnd": 1.1,
"time": 0.2,
"time": 0.5,
"_id": ""
},
{
@ -7510,7 +7510,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 338.7,
"width": 312,
"height": 31.5
},
"_anchorPoint": {
@ -7523,7 +7523,7 @@
"ctor": "Float64Array",
"array": [
5.747,
-452.648,
-456.612,
0,
0,
0,
@ -7562,8 +7562,8 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "助理升级到20级可获得点击加成",
"_N$string": "助理升级到20级可获得点击加成",
"_string": "雇佣员工可增加店铺秒赚收益",
"_N$string": "雇佣员工可增加店铺秒赚收益",
"_fontSize": 24,
"_lineHeight": 25,
"_enableWrapText": true,

@ -1192,8 +1192,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 176,
"height": 71
"width": 157,
"height": 66
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -1205,7 +1205,7 @@
"ctor": "Float64Array",
"array": [
0,
-511.54099999999994,
-514.0409999999999,
0,
0,
0,
@ -1374,7 +1374,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e1ecd534-89a0-44a6-b986-795b97cd47a0"
"__uuid__": "d56f80fb-deaf-4a01-9703-798221ae258c"
},
"_type": 0,
"_sizeMode": 1,

@ -58,6 +58,7 @@ export default class DH_1 extends DHBase {
// this.heishehui.setAnimation(0, "小弟待机", true)
const dialogEvents = [
(func) => {
this.openDoor.timeScale = 0.5
this.openDoor.node.active = true
this.openDoor.setAnimation(0, "开门", false)
this.openDoor.setCompleteListener(() => {

@ -33,6 +33,7 @@ export default class DH_3 extends DHBase {
m_bg: cc.Node = null
@property(cc.Node)
MoveNodes: cc.Node = null
isTouch: any;
start() {
// Common5.playRemoteAudioMusic("remotesound/effect/打雷下雨声", true)
@ -137,19 +138,32 @@ export default class DH_3 extends DHBase {
this.door.setCompleteListener(() => {
this.door.setCompleteListener(null)
this.door.node.active = false
this.showQiPao(this.chatConfig[this.dialogIndex++], () => {
this.runBg(1, 2, this.MoveNodes.getChildByName("女儿"), () => {
this.showQiPao(this.chatConfig[3], () => {
User.setStatistics("zhangJie", 6)
TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_606)
TaskManager.setCurTask(MainTaskIdEnum.MainTask_701)
this.m_bg.getChildByName("前往医院").active = true
this.node.getChildByName("前往医院").active = true
}, () => {
// this.heishehui.setAnimation(0, "小弟说话", true)
});
})
})
}
if (!this.isTouch) {
this.isTouch = true
this.schedule(() => {
let jindu = this.progress.progress - 0.1
if (jindu <= 0) {
jindu = 0
}
this.progress.progress = jindu
}, 1)
}
}
onTouchGoYiYuan() {

@ -247,18 +247,20 @@ export default class Room2 extends cc.Component {
this.showQiPao(ChadianConfig.chadianLog402[1], () => {
this.node.getChildByName('mainNode').getChildByName('敲门').active = true
this.node.getChildByName('mainNode').getChildByName('敲门').getComponent(sp.Skeleton).setAnimation(0, '敲门', true)
this.scheduleOnce(() => {
this.showQiPao(ChadianConfig.chadianLog402[2], () => {
PrefabManage.showBlackGuoDu(() => {
this.node.getChildByName('mainNode').getChildByName('敲门').active = false
User.setStatistics("zhangJie", 4)
TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_402)
TaskManager.setCurTask(MainTaskIdEnum.MainTask_501)
PrefabManage.loadPrefabByType(GameType.DH_1)
this.scheduleOnce(() => {
this.node.removeFromParent()
this.node.destroy()
}, 1)
})
})
}, 2)
})
})
}
}

@ -1,6 +1,7 @@
import { ryw_Event } from "../../FrameWork/Event/EventEnum";
import EventMgr from "../../FrameWork/Event/EventMgr";
import User from "../../FrameWork/User/User";
import AppPlatform from "../../FrameWork/Util/AppPlatform";
import Common5 from "../../Platform/th/Common5";
import CommonDefine from "../../Platform/th/CommonDefine";
import { GameStoryConfigData } from "../FirstSelectScene/GameStoryConfig";
@ -54,6 +55,12 @@ let ChadianConfig = {
delay: 3.5,
effectUrl: "GameStoryRes/sound/KaiChangGuanQia1Gai/你个臭卖包子的,也敢推老子?"
},
{
str: "你们是觉得我很好欺负吗?",
qiPaoPos: 7,
delay: 1.8,
effectUrl: "GameStoryRes/sound/KaiChangGuanQia1Gai/你们是觉得我很好欺负吗?"
},
{
str: "你**敢对老子动手?你找死是吧!",
qiPaoPos: 6,
@ -326,8 +333,10 @@ export default class KaiChangGuanQia1 extends cc.Component {
this.nanZhu3.getComponent(sp.Skeleton).setAnimation(0, '男主倒地愤怒', true)
this.showQiPao(ChadianConfig.chadianLog[5], () => {
this.nanZhu2.getComponent(sp.Skeleton).setAnimation(0, '老板扇男主待机', true)
this.dianJiFuChou.active = true
this.djfcTouchArea1.active = true
// this.dianJiFuChou.active = true
// this.djfcTouchArea1.active = true
this.scene2.getChildByName("selectBtn").active = true
});
}, 0.8)
})
@ -348,10 +357,10 @@ export default class KaiChangGuanQia1 extends cc.Component {
this.nanZhu2.getComponent(sp.Skeleton).setAnimation(0, '男主待机冒火', true)
this.nanZhu3.x = -290
this.nanZhu3.getComponent(sp.Skeleton).setAnimation(0, '老板倒地说话', true)
this.showQiPao(ChadianConfig.chadianLog[6], () => {
this.showQiPao(ChadianConfig.chadianLog[7], () => {
this.nanZhu3.getComponent(sp.Skeleton).setAnimation(0, '老板倒地待机', true)
this.nanZhu2.getComponent(sp.Skeleton).setAnimation(0, '男主指人说话', true)
this.showQiPao(ChadianConfig.chadianLog[7], () => {
this.showQiPao(ChadianConfig.chadianLog[8], () => {
this.nanZhu2.getComponent(sp.Skeleton).setAnimation(0, '男主待机冒火', true)
let part2 = () => {
this.laoPo.getComponent(sp.Skeleton).setAnimation(0, '流泪待机', true)
@ -376,10 +385,10 @@ export default class KaiChangGuanQia1 extends cc.Component {
// .to(0.6, { scale: 1.5, x: 130 })
.call(() => {
this.laoPo.getComponent(sp.Skeleton).setAnimation(0, '说话', true)
this.showQiPao(ChadianConfig.chadianLog[8], () => {
this.showQiPao(ChadianConfig.chadianLog[9], () => {
this.laoPo.getComponent(sp.Skeleton).setAnimation(0, '流泪', false)
this.nanZhu3.getComponent(sp.Skeleton).setAnimation(0, '老板倒地说话', true)
this.showQiPao(ChadianConfig.chadianLog[9], () => {
this.showQiPao(ChadianConfig.chadianLog[10], () => {
this.laoPo.getComponent(sp.Skeleton).setAnimation(0, '流泪', false)
this.scheduleOnce(() => {
@ -468,6 +477,31 @@ export default class KaiChangGuanQia1 extends cc.Component {
this.schedule(callFunc, 0.07, str.length - 1)
}
onClickSelectBtn(event, custom) {
// 选择1.含泪受辱 男主讲句话:你们是觉得我很好欺负吗? ;然后接打陈天霸耳光
// 选择2.强力回击 直接接打陈天霸耳光
if (Number(custom) == 1) {
this.scene2.getChildByName("selectBtn").active = false
this.showQiPao(ChadianConfig.chadianLog[6], () => {
this.normalTouchCallback(this.djfcTouchArea1)
});
} else {
let tab = {
onClose: (finish) => {
if (finish) {
Common5.ReportDY("inLevel", "引导关卡-AD-强力回击");
this.scene2.getChildByName("selectBtn").active = false
this.normalTouchCallback(this.djfcTouchArea1)
} else {
Common5.showTips_custom("广告未观看完");
}
}, onFailed: () => {
}
}
AppPlatform.playVideo_custom(tab)
}
}
//转场
showZhuanChang() {
// cc.tween(this.node.getChildByName('mainNode'))

@ -250,7 +250,7 @@ let TaskListConfig = [
/**第5章 **/
{
TaskId: MainTaskIdEnum.MainTask_501, includeSubTaskId: [], needFinishSubTaskId: SubTaskIdEnum.SubTask_None,
TaskTittle: '骤至的债务', TaskDesc: '完成对话了解情况', TaskNeedMoney: 0, finishUnLockJuQingIndex: 'WX_4',
TaskTittle: '骤至的债务', TaskDesc: '完成对话了解情况', TaskNeedMoney: 0, finishUnLockJuQingIndex: 'WX_4', wanFaRuKouTip: ['rk_chuZuChe'],
subtitle: 9, isAutoTanChu: false
},

@ -300,6 +300,10 @@ export default class MainHall extends UiBase {
this.refreshChengHao()
this.refreshView()
}, this)
EventMgr.onEvent_custom(ryw_Event.refreshZaoCan, () => {
this.refreshView()
}, this)
}
My_Guide() {
@ -717,16 +721,19 @@ export default class MainHall extends UiBase {
// let allNum = allshouyi1 + allshouyi2
let allNum = allshouyi1
let beishuSP = ShipuManager.getAllShipuInCome()//面点界面的物品秒赚加成
let beishuTW = TanWeiManager.getAllShipuInCome() //摊位界面的物品点击加成
// let beishuSP = ShipuManager.getAllShipuInCome()//面点界面的物品秒赚加成
// let beishuTW = TanWeiManager.getAllShipuInCome() //摊位界面的物品点击加成
// let chenghaoInCome = LevelUpManager.getAllChengHaoinCome() //称号倍数
let chenghaoInCome = LevelUpManager.getAllChengHaoinCome() //称号倍数
// let zichan = ZiChanManager.getZiChanBeiShu()
let zichan = ZiChanManager.getZiChanBeiShu()
let yewu = ZaoCanManager.getAllZaoCanJiaCheng()
// let mzNum = Math.floor(allNum * beishuSP * beishuTW)
let clickNum = Math.floor(str1) //点击收益
let mzNum = Math.floor(allNum * beishuSP * chenghaoInCome * zichan) //秒赚收益
// let mzNum = Math.floor(allNum * beishuSP * chenghaoInCome * zichan) //秒赚收益
let mzNum = Math.floor(allNum * yewu) //秒赚收益
this.clickMoneyLab.string = '' + Common5.getNumberChangeHanzi(clickNum) + '/次'
this.secondMoneyLab.string = '' + Common5.getNumberChangeHanzi(mzNum) + '/秒'
@ -1188,7 +1195,12 @@ export default class MainHall extends UiBase {
let addlab = this.node.getChildByName('收入提升').getChildByName('提升').getChildByName("addlab")
let cha = ZaoCanManager.getDanJia() - ZaoCanManager.getLastDanJia()
uplab.getComponent(cc.Label).string = `${Common5.getNumberChangeHanzi(ZaoCanManager.getDanJia())}`
addlab.getComponent(cc.Label).string = `+${0}`
let str = ''
for (let i = 0; i < cha.toString().length; i++) {
str += '0'
}
addlab.getComponent(cc.Label).string = `+${str}`
cc.Tween.stopAllByTarget(this.node.getChildByName('收入提升'))
cc.tween(this.node.getChildByName('收入提升'))
@ -1213,8 +1225,8 @@ export default class MainHall extends UiBase {
if (chat.effectUrl && chat.effectUrl.length > 0) {
Common5.playRemoteAudioEffect(chat.effectUrl);
}
this.scheduleOnce(()=>{
this.scheduleOnce(() => {
this.node.getChildByName("员工对话").active = false
},chat.delayTime)
}, chat.delayTime)
}
}

@ -136,6 +136,7 @@ export default class MainHallBtn extends cc.Component {
EventMgr.onEvent_custom(ryw_Event.levelUpChange, () => {
this.refreshClickShouyi()
this.refreshShengJi()
}, this)
// this.showOnlineTime()
this.refreshClickShouyi()
@ -1294,19 +1295,19 @@ export default class MainHallBtn extends cc.Component {
if (myMoney - levelUpSpned >= 0) {
// this.redPoint.active = true
this.adBtn.active = false
this.adBtnLab.string = '升级'
// this.adBtnLab.string = '升级'
} else {
// this.redPoint.active = false
this.adBtn.active = true
let level = 5
if (User.getMyLevel() < 600) {
level = 5
} else if (User.getMyLevel() >= 600 && User.getMyLevel() < 900) {
level = 3
} else {
level = 2
}
this.adBtnLab.string = `升级+${level}`
// let level = 5
// if (User.getMyLevel() < 600) {
// level = 5
// } else if (User.getMyLevel() >= 600 && User.getMyLevel() < 900) {
// level = 3
// } else {
// level = 2
// }
// this.adBtnLab.string = `升级+${level}`
}
if (isMaxLevel) {

@ -90,8 +90,8 @@ export default class MainScene extends cc.Component {
// this.getServerData()
// })
// return
// User.setFirstStepIndex(1000)
// TaskManager.setCurTask(MainTaskIdEnum.MainTask_605)
// User.setFirstStepIndex(100000)
// TaskManager.setCurTask(MainTaskIdEnum.MainTask_501)
// User.setCurGameLevelIndex(1)
// for (let i = 0; i < 18; i++) {
// MiShuManager.setMishuLock(i, true, false)

@ -232,32 +232,33 @@ export default class LevelUpManager {
// update (dt) {}
public static levelUpSpned() {
let level = User.getMyLevel()
let index = Math.floor(level / 100)
// let index = Math.floor(level / 100)
// if (index == 0) {
// let xishu = this.levelArray[index]
// let tempNum = 110
// let yushuLevel = level
// let powNum = Math.pow(xishu, yushuLevel - 1)
// let spendMoney = Math.ceil(tempNum * powNum)
// return spendMoney
// } else if (index > 0) {
// let xishu = this.levelArray[index]
// let yushuLevel = level % 100
// let powNum = Math.pow(xishu, yushuLevel)
// let tempNum = 110
// let addNum = 1
// for (let i = 0; i < index; i++) {
// let xishu = this.levelArray[i]
// addNum = addNum * Math.pow(xishu, 99)
// }
// let spendMoney = Math.ceil(tempNum * powNum * addNum)
// return spendMoney
// }
if (index == 0) {
let xishu = this.levelArray[index]
let tempNum = 110
let yushuLevel = level
let powNum = Math.pow(xishu, yushuLevel - 1)
let spendMoney = Math.ceil(tempNum * powNum)
return spendMoney
} else if (index > 0) {
let xishu = this.levelArray[index]
let yushuLevel = level % 100
let powNum = Math.pow(xishu, yushuLevel)
let tempNum = 110
let addNum = 1
for (let i = 0; i < index; i++) {
let xishu = this.levelArray[i]
addNum = addNum * Math.pow(xishu, 99)
}
let spendMoney = Math.ceil(tempNum * powNum * addNum)
let spendMoney = Math.ceil(18 * Math.pow(1.046, level - 1))
return spendMoney
}
}
public static clickInComeMoney() {
let level = User.getMyLevel()
let index = Math.floor(level / 100)

@ -29,23 +29,23 @@ let zaocanConfig = [
{ id: 3, type: 3, zaocan: '油条', needLevel: 1, jiacheng: 1 },
{ id: 4, type: 4, zaocan: '豆浆', needLevel: 1, jiacheng: 1 },
{ id: 5, type: 0, zaocan: '肉包', needLevel: 100, jiacheng: 2 },
{ id: 6, type: 1, zaocan: '茶叶蛋', needLevel: 150, jiacheng: 2 },
{ id: 7, type: 2, zaocan: '韭菜盒子', needLevel: 200, jiacheng: 2 },
{ id: 8, type: 3, zaocan: '麻球', needLevel: 250, jiacheng: 2 },
{ id: 9, type: 4, zaocan: '小米粥', needLevel: 300, jiacheng: 2 },
{ id: 5, type: 0, zaocan: '肉包', needLevel: 100, jiacheng: 0.3 },
{ id: 6, type: 1, zaocan: '茶叶蛋', needLevel: 150, jiacheng: 0.5 },
{ id: 7, type: 2, zaocan: '韭菜盒子', needLevel: 200, jiacheng: 0.7 },
{ id: 8, type: 3, zaocan: '麻球', needLevel: 250, jiacheng: 1 },
{ id: 9, type: 4, zaocan: '小米粥', needLevel: 300, jiacheng: 1.5 },
{ id: 10, type: 0, zaocan: '烧卖', needLevel: 350, jiacheng: 3 },
{ id: 10, type: 0, zaocan: '烧卖', needLevel: 350, jiacheng: 2 },
{ id: 11, type: 1, zaocan: '玉米', needLevel: 400, jiacheng: 3 },
{ id: 12, type: 2, zaocan: '鸡蛋饼', needLevel: 450, jiacheng: 3 },
{ id: 13, type: 3, zaocan: '油饼', needLevel: 500, jiacheng: 3 },
{ id: 14, type: 4, zaocan: '燕麦', needLevel: 550, jiacheng: 3 },
{ id: 12, type: 2, zaocan: '鸡蛋饼', needLevel: 450, jiacheng: 4 },
{ id: 13, type: 3, zaocan: '油饼', needLevel: 500, jiacheng: 5 },
{ id: 14, type: 4, zaocan: '燕麦', needLevel: 550, jiacheng: 7 },
{ id: 15, type: 0, zaocan: '红薯', needLevel: 600, jiacheng: 4 },
{ id: 16, type: 1, zaocan: '西兰花', needLevel: 650, jiacheng: 4 },
{ id: 17, type: 2, zaocan: '牛排', needLevel: 700, jiacheng: 4 },
{ id: 18, type: 3, zaocan: '鸡腿', needLevel: 750, jiacheng: 4 },
{ id: 19, type: 4, zaocan: '咖啡', needLevel: 800, jiacheng: 4 },
{ id: 15, type: 0, zaocan: '红薯', needLevel: 600, jiacheng: 8 },
{ id: 16, type: 1, zaocan: '西兰花', needLevel: 650, jiacheng: 9 },
{ id: 17, type: 2, zaocan: '牛排', needLevel: 700, jiacheng: 10 },
{ id: 18, type: 3, zaocan: '鸡腿', needLevel: 750, jiacheng: 12 },
{ id: 19, type: 4, zaocan: '咖啡', needLevel: 800, jiacheng: 15 },
]
@ -106,7 +106,7 @@ export default class ZaoCanManager {
if (jiacheng == 0) {
jiacheng = 1
}
return jiacheng
return jiacheng + 1
}
/**
@ -153,16 +153,18 @@ export default class ZaoCanManager {
}
public static getDanJia() {
let price = User.getMyLevel()
let level = User.getMyLevel()
let price = Math.ceil(35 * Math.pow(1.025, level - 1))
// let jiedaoJiacheng = JieDaoManager.getJieDaoBeiShu()
// return Math.ceil(price * jiedaoJiacheng)
// return Math.ceil(level * jiedaoJiacheng)
return price
}
public static getLastDanJia() {
let price = User.getMyLevel() - 1
let level = User.getMyLevel() - 1
let price = Math.ceil(35 * Math.pow(1.025, level - 1))
// let jiedaoJiacheng = JieDaoManager.getJieDaoBeiShu()
// return Math.ceil(price * jiedaoJiacheng)
// return Math.ceil(level * jiedaoJiacheng)
return price
}

@ -56,19 +56,11 @@ export default class ZaoCanDian extends cc.Component {
// onLoad () {}
start() {
let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo()
let mainId = mainTaskInfo.Id
let config = TaskManager.getTaskConfigById(mainId)
let index = User.getFirstStepIndex()
// if (index == 3) { //早餐摊引导
this.updateMainTask()
EventMgr.onEvent_custom(ryw_Event.updateMainTask, () => {
this.updateMainTask()
}, this)
// return
// }
if (config && config.wanFaRuKouTip && config.wanFaRuKouTip.includes('rk_chuZuChe')) {
this.car.node.active = true
} else {
this.car.node.active = false
}
//刷新早餐种类
this.refreshZaoCan()
EventMgr.onEvent_custom(ryw_Event.refreshZaoCan, () => {
@ -282,10 +274,15 @@ export default class ZaoCanDian extends cc.Component {
this.car.setAnimation(0, "开走", false)
this.car.setCompleteListener(() => {
this.car.setCompleteListener(null)
cc.tween(this.car.node)
.by(0.2, { position: cc.v3(-100, 0, 0) })
.start()
let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo()
let mainId = mainTaskInfo.Id
if (mainId == MainTaskIdEnum.MainTask_303 || mainId == MainTaskIdEnum.MainTask_401 || mainId == MainTaskIdEnum.MainTask_402) {
PrefabManage.loadPrefabByType(GameType.Room2)
} else if (mainId == MainTaskIdEnum.MainTask_501) {
PrefabManage.loadPrefabByType(GameType.DH_1)
} else if (mainId == MainTaskIdEnum.MainTask_503) {
PrefabManage.loadPrefabByType(GameType.DH_5)
} else if (mainId == MainTaskIdEnum.MainTask_602) {
@ -299,5 +296,22 @@ export default class ZaoCanDian extends cc.Component {
}
updateMainTask() {
let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo()
let mainId = mainTaskInfo.Id
let config = TaskManager.getTaskConfigById(mainId)
let index = User.getFirstStepIndex()
// if (index == 3) { //早餐摊引导
// return
// }
if (config && config.wanFaRuKouTip && config.wanFaRuKouTip.includes('rk_chuZuChe')) {
this.car.node.active = true
this.car.node.setPosition(cc.v3(0, this.car.node.position.y, 0))
} else {
this.car.node.active = false
}
}
// update (dt) {}
}

@ -24,26 +24,26 @@
"__id__": 6
},
{
"__id__": 81
"__id__": 83
}
],
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 88
},
{
"__id__": 87
"__id__": 89
},
{
"__id__": 88
"__id__": 90
},
{
"__id__": 89
"__id__": 91
}
],
"_prefab": {
"__id__": 90
"__id__": 92
},
"_opacity": 255,
"_color": {
@ -230,11 +230,11 @@
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 81
}
],
"_prefab": {
"__id__": 80
"__id__": 82
},
"_opacity": 255,
"_color": {
@ -628,14 +628,14 @@
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 75
},
{
"__id__": 74
"__id__": 76
}
],
"_prefab": {
"__id__": 78
"__id__": 80
},
"_opacity": 255,
"_color": {
@ -699,11 +699,11 @@
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 73
}
],
"_prefab": {
"__id__": 72
"__id__": 74
},
"_opacity": 255,
"_color": {
@ -767,11 +767,11 @@
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 71
}
],
"_prefab": {
"__id__": 70
"__id__": 72
},
"_opacity": 255,
"_color": {
@ -841,26 +841,26 @@
"__id__": 42
},
{
"__id__": 45
"__id__": 46
},
{
"__id__": 61
"__id__": 62
}
],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 66
},
{
"__id__": 65
"__id__": 67
},
{
"__id__": 66
"__id__": 68
}
],
"_prefab": {
"__id__": 68
"__id__": 70
},
"_opacity": 255,
"_color": {
@ -1718,10 +1718,13 @@
"_components": [
{
"__id__": 43
},
{
"__id__": 44
}
],
"_prefab": {
"__id__": 44
"__id__": 45
},
"_opacity": 255,
"_color": {
@ -1802,6 +1805,19 @@
"_atlas": null,
"_id": ""
},
{
"__type__": "67b86Vr/PZKGZqkUcKGp7BO",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
},
"_enabled": true,
"scaleStart": 1,
"scaleEnd": 1.1,
"time": 0.5,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
@ -1822,20 +1838,20 @@
},
"_children": [
{
"__id__": 46
"__id__": 47
},
{
"__id__": 49
"__id__": 50
}
],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 60
}
],
"_prefab": {
"__id__": 60
"__id__": 61
},
"_opacity": 255,
"_color": {
@ -1889,17 +1905,17 @@
"_name": "等级解锁",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 46
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 48
}
],
"_prefab": {
"__id__": 48
"__id__": 49
},
"_opacity": 255,
"_color": {
@ -1953,7 +1969,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 47
},
"_enabled": true,
"_materials": [
@ -1997,27 +2013,27 @@
"_name": "New ProgressBar",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 46
},
"_children": [
{
"__id__": 50
"__id__": 51
},
{
"__id__": 53
"__id__": 54
}
],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 57
},
{
"__id__": 57
"__id__": 58
}
],
"_prefab": {
"__id__": 58
"__id__": 59
},
"_opacity": 255,
"_color": {
@ -2071,17 +2087,17 @@
"_name": "bar",
"_objFlags": 512,
"_parent": {
"__id__": 49
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 52
}
],
"_prefab": {
"__id__": 52
"__id__": 53
},
"_opacity": 255,
"_color": {
@ -2135,7 +2151,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 51
},
"_enabled": true,
"_materials": [
@ -2178,17 +2194,17 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 49
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 55
}
],
"_prefab": {
"__id__": 55
"__id__": 56
},
"_opacity": 255,
"_color": {
@ -2242,7 +2258,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 54
},
"_enabled": true,
"_materials": [
@ -2286,7 +2302,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 50
},
"_enabled": true,
"_materials": [
@ -2318,12 +2334,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 50
},
"_enabled": true,
"_N$totalLength": 124,
"_N$barSprite": {
"__id__": 51
"__id__": 52
},
"_N$mode": 0,
"_N$progress": 0,
@ -2346,7 +2362,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 46
},
"_enabled": true,
"_materials": [
@ -2395,11 +2411,14 @@
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 63
},
{
"__id__": 64
}
],
"_prefab": {
"__id__": 63
"__id__": 65
},
"_opacity": 255,
"_color": {
@ -2453,7 +2472,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 62
},
"_enabled": true,
"_materials": [
@ -2480,6 +2499,19 @@
"_atlas": null,
"_id": ""
},
{
"__type__": "67b86Vr/PZKGZqkUcKGp7BO",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
},
"_enabled": true,
"scaleStart": 1,
"scaleEnd": 1.1,
"time": 0.5,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
@ -2541,13 +2573,13 @@
"__id__": 36
},
"levelLabel": {
"__id__": 47
"__id__": 48
},
"levelProgress": {
"__id__": 57
"__id__": 58
},
"levelPercentLabel": {
"__id__": 54
"__id__": 55
},
"_id": ""
},
@ -2565,7 +2597,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 67
"__id__": 69
}
],
"_N$interactable": true,
@ -2758,7 +2790,7 @@
"_slideMode": 1,
"pageDistance": 0.3,
"pageChangeEvent": {
"__id__": 75
"__id__": 77
},
"_virtual": true,
"cyclic": false,
@ -2767,12 +2799,12 @@
"_updateRate": 0,
"frameByFrameRenderNum": 0,
"renderEvent": {
"__id__": 76
"__id__": 78
},
"selectedMode": 2,
"repeatEventSingle": false,
"selectedEvent": {
"__id__": 77
"__id__": 79
},
"_id": ""
},
@ -2867,14 +2899,14 @@
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 84
},
{
"__id__": 83
"__id__": 85
}
],
"_prefab": {
"__id__": 85
"__id__": 87
},
"_opacity": 255,
"_color": {
@ -2928,7 +2960,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 83
},
"_enabled": true,
"_materials": [
@ -2960,7 +2992,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 83
},
"_enabled": true,
"_normalMaterial": null,
@ -2969,7 +3001,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 84
"__id__": 86
}
],
"_N$interactable": true,
@ -3110,7 +3142,7 @@
"__id__": 12
},
"listZc": {
"__id__": 74
"__id__": 76
},
"_id": ""
},

@ -29,12 +29,12 @@ def find_files(folder_path):
return file_list
# 获取mp3下所有文件路径
wenJianPath = 'D:/project/lf-tzrsdf-ddd/remotesound/mp3'
wenJianPath = 'D:/project/xianyudefanji/remotesound/mp3'
fileAlls = find_files(wenJianPath)
print(fileAlls)
# 读取DH_1脚本文件寻找effectUrl,去匹配文件,复制文件
DH_Path = 'D:/project/lf-tzrsdf-ddd/assets/Scripts/DH'
DH_Path = 'D:/project/xianyudefanji/assets/Scripts/DH'
DH_MaxNum = 45
for i in range(DH_MaxNum):
updated_lines = []
@ -85,7 +85,7 @@ for i in range(DH_MaxNum):
file.writelines(updated_lines)
# 读取其他脚本文件寻找effectUrl,去匹配文件,复制文件
genpath = 'D:/project/lf-tzrsdf-ddd/assets/Scripts/'
genpath = 'D:/project/xianyudefanji/assets/Scripts/'
otherPath = [genpath + 'MainHall/MainHall.ts',genpath + 'Mishu/MishuGame.ts']
for i in range(len(otherPath)):
otherPathupdated_lines = []

Loading…
Cancel
Save