1

assets/DH/DH_3/DH_3.prefab

@@ -3242,7 +3242,9 @@
     "_enabled": true,
     "nanzhu": null,
     "heishehui": null,
-    "progress": null,
+    "progress": {
+      "__id__": 12
+    },
     "m_bg": {
       "__id__": 5
     },

assets/DH/DH_4/DH_4.prefab

@@ -37,13 +37,10 @@
       },
       {
         "__id__": 54
-      },
-      {
-        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -1986,16 +1983,6 @@
     "_originalHeight": 1334,
     "_id": ""
   },
-  {
-    "__type__": "01b77kAaMhGwYzF5HlMABbp",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_id": ""
-  },
   {
     "__type__": "86fb5f1RMFB1Zsr2qZ+wUYL",
     "_name": "",
@@ -2004,7 +1991,9 @@
       "__id__": 1
     },
     "_enabled": true,
-    "doctor": null,
+    "doctor": {
+      "__id__": 7
+    },
     "m_bg": {
       "__id__": 5
     },

assets/DH/DH_5/DH_5.prefab

@@ -1510,10 +1510,12 @@
   },
   {
     "__type__": "cc.ClickEvent",
-    "target": null,
+    "target": {
+      "__id__": 1
+    },
     "component": "",
-    "_componentId": "649c49J/pxN2ohyBiR6yQqc",
-    "handler": "onClickNeedQiPao303",
+    "_componentId": "f757cpW7whA3YBZTNkv58ck",
+    "handler": "onTouch",
     "customEventData": ""
   },
   {

assets/DH/DH_5/res.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.3",
-  "uuid": "2e05557d-e51d-45a4-9415-fd143ae19e9c",
-  "importer": "folder",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/DH/DH_5/spine.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.3",
-  "uuid": "8e2591fe-e262-421d-a232-924294b8b21a",
-  "importer": "folder",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/Scripts/DH/DH_3.ts

@@ -38,7 +38,13 @@ export default class DH_3 extends DHBase {
         // Common5.playRemoteAudioMusic("remotesound/effect/打雷下雨声", true)
         Common5.preLoadRemoteAudioByChatConfig(this.chatConfig);
         super.start();
-        this.continueStory();
+        let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo()
+        let mainId = mainTaskInfo.Id
+        if (mainId == MainTaskIdEnum.MainTask_605) {
+            this.continueStory();
+        } else {
+            this.m_bg.getChildByName("砸").active = true
+        }
         // this.scheduleOnce(() => {
         //     PrefabManage.preloadPrefabByType(GameType.DH_39)
         // })
@@ -58,9 +64,9 @@ export default class DH_3 extends DHBase {
             (func) => {
                 this.m_bg.getChildByName("needGoodNode_605").active = true
                 // this.heishehui.setAnimation(0, "小弟待机", true)
-                this.showClickDialog(this.chatConfig[this.dialogIndex++], func, () => {
-                    // this.nanzhu.setAnimation(0, "侧头笑说话", true)
-                });
+                // this.showClickDialog(this.chatConfig[this.dialogIndex++], func, () => {
+                //     // this.nanzhu.setAnimation(0, "侧头笑说话", true)
+                // });
             },
         ]
         const dialogCallFunc = (logEvents: any[]) => {
@@ -102,9 +108,13 @@ export default class DH_3 extends DHBase {
         this.m_bg.getChildByName("needGoodNode_605").active = false
         UserManager.subMoney(20000000)
         this.showQiPao(this.chatConfig[this.dialogIndex++], () => {
-            this.m_bg.getChildByName("砸").active = true
-            TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_605)
-            TaskManager.setCurTask(MainTaskIdEnum.MainTask_606)
+            this.showQiPao(this.chatConfig[this.dialogIndex++], () => {
+                this.m_bg.getChildByName("砸").active = true
+                TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_605)
+                TaskManager.setCurTask(MainTaskIdEnum.MainTask_606)
+            }, () => {
+                // this.heishehui.setAnimation(0, "小弟说话", true)
+            });
         }, () => {
             // this.heishehui.setAnimation(0, "小弟说话", true)
         });
@@ -113,11 +123,17 @@ export default class DH_3 extends DHBase {
     onTouchZaSuo() {
         this.progress.progress += 0.1
         if (this.progress.progress >= 1) {
-            User.setStatistics("zhangJie", 6)
-            TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_606)
-            TaskManager.setCurTask(MainTaskIdEnum.MainTask_701)
-
-            this.m_bg.getChildByName("前往医院").active = true
+            this.m_bg.getChildByName("砸").active = false
+            this.m_bg.getChildByName("背景1").active = true
+            this.showQiPao(this.chatConfig[this.dialogIndex++], ()=>{
+                User.setStatistics("zhangJie", 6)
+                TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_606)
+                TaskManager.setCurTask(MainTaskIdEnum.MainTask_701)
+    
+                this.m_bg.getChildByName("前往医院").active = true
+            }, () => {
+                // this.heishehui.setAnimation(0, "小弟说话", true)
+            });
         }
     }
 

assets/Scripts/DH/DH_4.ts

@@ -32,8 +32,12 @@ export default class DH_4 extends DHBase {
     MoveNodes: cc.Node = null
 
     start() {
-        TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_701)
-        TaskManager.setCurTask(MainTaskIdEnum.MainTask_702)
+        let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo()
+        let mainId = mainTaskInfo.Id
+        if (mainId == MainTaskIdEnum.MainTask_701) {
+            TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_701)
+            TaskManager.setCurTask(MainTaskIdEnum.MainTask_702)
+        }
         // Common5.playRemoteAudioMusic("remotesound/effect/轻快-10秒", true)
         Common5.preLoadRemoteAudioByChatConfig(this.chatConfig);
         super.start();

assets/Scripts/DH/DH_5.ts

@@ -38,58 +38,66 @@ export default class DH_5 extends DHBase {
     start() {
         Common5.preLoadRemoteAudioByChatConfig(this.chatConfig);
         super.start();
+        this.continueStory()
     }
 
     // 继续剧情
-        continueStory() {
-            // this.scheduleOnce(() => {
-            //     PrefabManage.preloadPrefabByType(GameType.DH_2)
-            // })
-            // this.nanzhu.setAnimation(0, "下面持续", true)
-            // this.heishehui.setAnimation(0, "小弟待机", true)
-            const dialogEvents = [
-                (func) => {
-                    this.showQiPao(this.chatConfig[this.dialogIndex++], func, () => {
-                        // this.heishehui.setAnimation(0, "小弟说话", true)
-                    });
-                },
-                (func) => {
-                    // this.heishehui.setAnimation(0, "小弟待机", true)
-                    this.showClickDialog(this.chatConfig[this.dialogIndex++], func, () => {
-                        // this.nanzhu.setAnimation(0, "侧头笑说话", true)
-                    });
-                },
-            ]
-            const dialogCallFunc = (logEvents: any[]) => {
-                logEvents.shift()(() => {
-                    if (logEvents.length > 0) {
-                        dialogCallFunc(logEvents);
-                    } else {
-                        User.setStatistics("zhangJie", 5)
-                        TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_503)
-                        TaskManager.setCurTask(MainTaskIdEnum.MainTask_601)
-                        UserManager.subMoney(5000000)
-                        PrefabManage.showBlackGuoDu(() => {
-                            PrefabManage.loadPrefabByType(GameType.MainHall)
-                            this.node.removeFromParent()
-                            this.node.destroy()
-                        })
-                        // PrefabManage.loadPrefabByType(GameType.GetAward, null, (prefabNode) => {
-                        //     let goods = [{ goodId: 1733, goodNum: 1 }];
-                        //     prefabNode.getComponent(GetAward).initView(goods, () => {
-                        //         // TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_530)
-                        //         // User.setRoomGoodStatus("DH_29")
-                        //         // UserManager.clearAndaddStructureFlash("cf_FengRenYuan")
-                        //     });
-                        // });
-                        // TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_202)
-                        // TaskManager.setCurUnLockMainTaskInfo(MainTaskIdEnum.MainTask_203)
-                        // this.node.destroy()
-                    }
+    continueStory() {
+        // this.scheduleOnce(() => {
+        //     PrefabManage.preloadPrefabByType(GameType.DH_2)
+        // })
+        // this.nanzhu.setAnimation(0, "下面持续", true)
+        // this.heishehui.setAnimation(0, "小弟待机", true)
+        const dialogEvents = [
+            (func) => {
+                this.showQiPao(this.chatConfig[this.dialogIndex++], func, () => {
+                    // this.heishehui.setAnimation(0, "小弟说话", true)
                 });
-            }
-            dialogCallFunc(dialogEvents);
+            },
+            (func) => {
+                // this.heishehui.setAnimation(0, "小弟待机", true)
+                this.m_bg.getChildByName("needGoodNode_503").active = true
+            },
+        ]
+        const dialogCallFunc = (logEvents: any[]) => {
+            logEvents.shift()(() => {
+                if (logEvents.length > 0) {
+                    dialogCallFunc(logEvents);
+                } else {
+                    // PrefabManage.loadPrefabByType(GameType.GetAward, null, (prefabNode) => {
+                    //     let goods = [{ goodId: 1733, goodNum: 1 }];
+                    //     prefabNode.getComponent(GetAward).initView(goods, () => {
+                    //         // TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_530)
+                    //         // User.setRoomGoodStatus("DH_29")
+                    //         // UserManager.clearAndaddStructureFlash("cf_FengRenYuan")
+                    //     });
+                    // });
+                    // TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_202)
+                    // TaskManager.setCurUnLockMainTaskInfo(MainTaskIdEnum.MainTask_203)
+                    // this.node.destroy()
+                }
+            });
         }
+        dialogCallFunc(dialogEvents);
+    }
+
+    onTouch() {
+        this.m_bg.getChildByName("needGoodNode_503").active = false
+        UserManager.subMoney(5000000)
+        this.showClickDialog(this.chatConfig[this.dialogIndex++], () => {
+            User.setStatistics("zhangJie", 5)
+            TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_503)
+            TaskManager.setCurTask(MainTaskIdEnum.MainTask_601)
+            UserManager.subMoney(5000000)
+            PrefabManage.showBlackGuoDu(() => {
+                PrefabManage.loadPrefabByType(GameType.MainHall)
+                this.node.removeFromParent()
+                this.node.destroy()
+            })
+        }, () => {
+            // this.nanzhu.setAnimation(0, "侧头笑说话", true)
+        });
+    }
 
     guideView(nodeArray, opacity = -1) {
         PrefabManage.loadPrefabByType(GameType.GuideMskNode, this.node, (prefab) => {

assets/Scripts/MainHall/MainHallBtn.ts

@@ -759,9 +759,19 @@ export default class MainHallBtn extends cc.Component {
         let mainId = mainTaskInfo.Id
         if (mainId == MainTaskIdEnum.MainTask_303 || mainId == MainTaskIdEnum.MainTask_401 || mainId == MainTaskIdEnum.MainTask_402) {
             PrefabManage.loadPrefabByType(GameType.Room2)
-        }else if (MainTaskIdEnum.MainTask_602) {
+        }
+        // else if (mainId == MainTaskIdEnum.MainTask_503) {
+        //     PrefabManage.loadPrefabByType(GameType.DH_5)
+        // }
+        else if (mainId == MainTaskIdEnum.MainTask_602) {
             PrefabManage.loadPrefabByType(GameType.GameStory4)
         }
+        // else if (mainId == MainTaskIdEnum.MainTask_605 || mainId == MainTaskIdEnum.MainTask_606) {
+        //     PrefabManage.loadPrefabByType(GameType.DH_3)
+        // }
+        // else if (mainId == MainTaskIdEnum.MainTask_701 || mainId == MainTaskIdEnum.MainTask_702) {
+        //     PrefabManage.loadPrefabByType(GameType.DH_4)
+        // }
     }
 
     clickSignBtnEvent() {

assets/Scripts/MainScene/MainScene.ts

@@ -91,7 +91,7 @@ export default class MainScene extends cc.Component {
         // })
         // return
         // User.setFirstStepIndex(6000000)
-        // TaskManager.setCurTask(MainTaskIdEnum.MainTask_200)
+        TaskManager.setCurTask(MainTaskIdEnum.MainTask_701)
         // User.setCurGameLevelIndex(1)
         // for (let i = 0; i < 18; i++) {
         //     MiShuManager.setMishuLock(i, true, false)

assets/Scripts/ZaoCanDian/ZaoCanDian.ts

@@ -9,8 +9,9 @@ import { ryw_Event } from "../../FrameWork/Event/EventEnum";
 import EventMgr from "../../FrameWork/Event/EventMgr";
 import User from "../../FrameWork/User/User";
 import Common5 from "../../Platform/th/Common5";
-import TaskManager from "../JuQingChat/TaskManager";
+import TaskManager, { MainTaskIdEnum } from "../JuQingChat/TaskManager";
 import ZaoCanManager from "../Manager/ZaoCanManager";
+import PrefabManage, { GameType } from "../PrefabManager/PrefabManage";
 import ZaoCanDianNpc from "./ZaoCanDianNpc";
 
 const { ccclass, property } = cc._decorator;
@@ -36,6 +37,9 @@ export default class ZaoCanDian extends cc.Component {
     @property(cc.Node)
     npc_parent: cc.Node = null;
 
+    @property(sp.Skeleton)
+    car: sp.Skeleton = null;
+
     npcNodes: cc.Node[] = [];
     lastDirect: Npc_Direct = Npc_Direct.RIGHT;
 
@@ -54,11 +58,17 @@ export default class ZaoCanDian extends cc.Component {
     start() {
         let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo()
         let mainId = mainTaskInfo.Id
+        let config = TaskManager.getTaskConfigById(mainId)
         let index = User.getFirstStepIndex()
         // if (index == 3) { //早餐摊引导
 
         //     return
         // }
+        if (config.wanFaRuKouTip.includes('rk_chuZuChe')) {
+            this.car.node.active = true
+        }else{
+            this.car.node.active = false
+        }
         //刷新早餐种类
         this.refreshZaoCan()
         EventMgr.onEvent_custom(ryw_Event.levelUpChange, () => {
@@ -98,7 +108,7 @@ export default class ZaoCanDian extends cc.Component {
         }
         this.npcNodes = []
 
-        this.runNpc()
+        // this.runNpc()
     }
 
     runNpc() {
@@ -155,7 +165,7 @@ export default class ZaoCanDian extends cc.Component {
                 if (shengyuNum == 0) {
                     //手动补货，补全
                     this.setTanWeiSpine(custom, zaoCanStr, 3)
-                }else{
+                } else {
                     this.setTanWeiSpine(custom, `${zaoCanStr}余${shengyuNum}`, 3)
                 }
             } else {
@@ -269,5 +279,22 @@ export default class ZaoCanDian extends cc.Component {
 
     }
 
+    onTouchCar() {
+        this.car.setAnimation(0, "开走", false)
+        this.car.setCompleteListener(() => {
+            this.car.setCompleteListener(null)
+            let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo()
+            let mainId = mainTaskInfo.Id
+            if (mainId == MainTaskIdEnum.MainTask_503) {
+                PrefabManage.loadPrefabByType(GameType.DH_5)
+            } else if (mainId == MainTaskIdEnum.MainTask_605 || mainId == MainTaskIdEnum.MainTask_606) {
+                PrefabManage.loadPrefabByType(GameType.DH_3)
+            } else if (mainId == MainTaskIdEnum.MainTask_701 || mainId == MainTaskIdEnum.MainTask_702) {
+                PrefabManage.loadPrefabByType(GameType.DH_4)
+            }
+        })
+
+    }
+
     // update (dt) {}
 }

assets/ZaoCanDian/spine/电动车.atlas

@@ -0,0 +1,62 @@
+
+电动车.png
+size: 584,191
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+人
+  rotate: true
+  xy: 211, 56
+  size: 133, 203
+  orig: 135, 205
+  offset: 1, 1
+  index: -1
+头盔
+  rotate: true
+  xy: 415, 10
+  size: 44, 49
+  orig: 46, 51
+  offset: 1, 1
+  index: -1
+车
+  rotate: true
+  xy: 2, 5
+  size: 184, 207
+  orig: 186, 209
+  offset: 1, 1
+  index: -1
+车灯
+  rotate: false
+  xy: 538, 145
+  size: 44, 44
+  orig: 48, 49
+  offset: 3, 2
+  index: -1
+轮胎
+  rotate: true
+  xy: 416, 70
+  size: 119, 120
+  orig: 119, 120
+  offset: 0, 0
+  index: -1
+轮胎前
+  rotate: true
+  xy: 466, 2
+  size: 66, 77
+  orig: 68, 79
+  offset: 1, 1
+  index: -1
+轮胎后
+  rotate: true
+  xy: 538, 101
+  size: 42, 36
+  orig: 45, 38
+  offset: 1, 1
+  index: -1
+阴影
+  rotate: false
+  xy: 211, 7
+  size: 202, 47
+  orig: 212, 52
+  offset: 1, 1
+  index: -1

assets/ZaoCanDian/spine/电动车.atlas.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "450cf327-3558-4b9a-8b2e-53377dfcc755",
+  "importer": "asset",
+  "subMetas": {}
+}

assets/ZaoCanDian/spine/电动车.json.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.2.5",
+  "uuid": "ac55d382-492d-4089-a73d-104381adb4ce",
+  "importer": "spine",
+  "textures": [
+    "f9341940-9f71-469b-9603-82506b5a101d"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

assets/ZaoCanDian/spine/电动车.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "f9341940-9f71-469b-9603-82506b5a101d",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 584,
+  "height": 191,
+  "platformSettings": {},
+  "subMetas": {
+    "电动车": {
+      "ver": "1.0.6",
+      "uuid": "9eafee1f-a388-4ab4-bfac-16db963db265",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "f9341940-9f71-469b-9603-82506b5a101d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 580,
+      "height": 187,
+      "rawWidth": 584,
+      "rawHeight": 191,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}