future 1 vuosi sitten
vanhempi
sitoutus
f7e5552d15

+ 20 - 20
assets/scene/game.scene

@@ -93,7 +93,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 540,
-      "y": 960.0000000000002,
+      "y": 960,
       "z": 0
     },
     "_lrot": {
@@ -178,7 +178,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 960.0000000000001,
+    "_orthoHeight": 960,
     "_near": 0,
     "_far": 1000,
     "_color": {
@@ -347,7 +347,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -651,7 +651,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1167,7 +1167,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2016,7 +2016,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4211,7 +4211,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4272,7 +4272,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -540,
-      "y": -960.0000000000001,
+      "y": -960,
       "z": 0
     },
     "_lrot": {
@@ -4311,7 +4311,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5150,7 +5150,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 860.0000000000001,
+      "y": 860,
       "z": 0
     },
     "_lrot": {
@@ -5532,7 +5532,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -421,
-      "y": 818.0000000000001,
+      "y": 818,
       "z": 0
     },
     "_lrot": {
@@ -9121,7 +9121,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -9327,7 +9327,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -540,
-      "y": -960.0000000000001,
+      "y": -960,
       "z": 0
     },
     "_lrot": {
@@ -9366,7 +9366,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -14900,7 +14900,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24339,7 +24339,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24432,7 +24432,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24601,7 +24601,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24653,7 +24653,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24774,7 +24774,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 11 - 11
assets/script/run/TaskSchedule/taskServce.ts

@@ -179,18 +179,18 @@ export class taskServce {
                         taskServce.cur_only_collect_event.event_item_collect_event_data.event_id_list.push(element)
                     }
                     // console.log('唯一 收集事件:',taskServce.cur_only_collect_event.event_item_collect_event_data.event_id_list)
-                    
-                } else {
-                    taskServce.cur_collect_event = new event_item;
-                    taskServce.cur_collect_event.event_id = event.event_id;
-                    taskServce.cur_collect_event.type = event.type;
-                    taskServce.cur_collect_event.event_item_collect_event_data = new event_collect_event_item
-                    for (let index = 0; index < event_id_list.length; index++) {
-                        const element = event_id_list[index];
-                        taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.push(element)
-                    }
-                    // console.log('普通 收集事件:',taskServce.cur_collect_event.event_item_collect_event_data.event_id_list
+                    return
+                }
+
+                taskServce.cur_collect_event = new event_item;
+                taskServce.cur_collect_event.event_id = event.event_id;
+                taskServce.cur_collect_event.type = event.type;
+                taskServce.cur_collect_event.event_item_collect_event_data = new event_collect_event_item
+                for (let index = 0; index < event_id_list.length; index++) {
+                    const element = event_id_list[index];
+                    taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.push(element)
                 }
+                // console.log('普通 收集事件:',taskServce.cur_collect_event.event_item_collect_event_data.event_id_list
                 
                 // 之前的
                 // console.log("collect_event--",taskServce.cur_collect_event)

+ 2 - 0
assets/script/run/ui/count_down.ts

@@ -1,6 +1,7 @@
 import { _decorator, Color, Component, Label, Node, ProgressBar } from 'cc';
 import { att_count_down, widget_item_data } from '../../../data/data';
 import { gameManager } from '../gameManager';
+import { SdkUtil } from '../../sdkUtil';
 const { ccclass, property } = _decorator;
 
 @ccclass('count_down')
@@ -64,6 +65,7 @@ export class count_down extends Component {
 
     public startCountDown(){
         this.schedule(()=>{
+            if(SdkUtil.isLookAd) { return }
             this.time_count+=1;
             let all_time = this.m_data.time_count+this.add_time
             if(this.time_count>all_time){