456

assets/edit_game.scene

@@ -117,7 +117,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 960,
-      "y": 960.0000000000002,
+      "y": 960,
       "z": 0
     },
     "_lrot": {
@@ -207,7 +207,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1920,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -344,7 +344,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 960.0000000000001,
+    "_orthoHeight": 960,
     "_near": 0,
     "_far": 1000,
     "_color": {
@@ -534,7 +534,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 840,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -7333,7 +7333,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -510.0000000000001,
+      "y": -510,
       "z": 0
     },
     "_lrot": {
@@ -19657,7 +19657,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 840,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -180366,7 +180366,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 419.9999999999998,
-      "height": 1870.0000000000002
+      "height": 1870
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -180591,7 +180591,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 419.9999999999998,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -183330,7 +183330,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1920,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/script/run/TaskSchedule/taskServce.ts

@@ -409,7 +409,7 @@ export class taskServce {
     public static checkFinishZhaoXiJieEventItem(finish_event_item:event_item) {
         if(taskServce.isFinishZhaoXiJieTask) {
             if(finish_event_item.event_id == taskServce.finishZhaoXiJieLastEventId) {
-                console.log('事件完成 事件完成 事件完成 执行')
+                // console.log('事件完成 事件完成 事件完成 执行')
                 gameManager.Singleton.unscheduleAllCallbacks()
                 let zhaoxijie_data = taskServce.mTaskData._zhao_xi_jie_data
                 ClientEvent.dispatchEvent(config.EventRun.ON_ZHAO_BU_TONG_ALL_FINISH, zhaoxijie_data)
@@ -429,7 +429,9 @@ export class taskServce {
                 break;
             } else {
                 if(element.widget_id==widget_id) { //找到最后一个
-                    taskServce.finishZhaoXiJieLastEventId = element.finish_event_id
+                    if(element.finish_event_id!=undefined) {
+                        taskServce.finishZhaoXiJieLastEventId = element.finish_event_id
+                    }
                 }
             }
         }
@@ -452,7 +454,7 @@ export class taskServce {
                 return tools.showToast("未设置全部找完任务的下一个事件！")
             }else{
                 if(taskServce.finishZhaoXiJieLastEventId==-1) {
-                    console.log('直接执行了 直接执行了 直接执行了')
+                    // console.log('直接执行了 直接执行了 直接执行了')
                     taskServce.DistributedEvent(taskServce.getEventById(id))                
                 }
             }