456

assets/data/data.ts

@@ -367,7 +367,7 @@ export class event_item{
     public event_item_start_event_data:event_start_event_item = null; //
     public event_item_collect_event_data:event_collect_event_item = null; // 
     public event_item_active_event_data:event_active_event_item = null; //
-
+    public event_item_stop_active_event_data:event_stop_active_event_item = null; //
 
     public event_item_fail_event_data:event_item_fail_event = null; //失败事件
     public event_item_play_sound_data:event_item_play_sound = null; //播放一个音效
@@ -456,6 +456,9 @@ export class event_start_event_item extends base_event_item{ // 开始的事件
 export class event_active_event_item extends base_event_item{ // 激活控件的事件
     public binding_widget_id:number = -1; //绑定事件
 }
+export class event_stop_active_event_item extends base_event_item{ // 不激活控件的事件,停用交互
+    public binding_widget_id:number = -1; //绑定事件
+}
 export class event_collect_event_item extends base_event_item{ // 收集多个事件完成
     public event_id_list:number[] = []
 }

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",
@@ -1164,7 +1164,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2013,7 +2013,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4184,7 +4184,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4245,7 +4245,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -540,
-      "y": -960.0000000000001,
+      "y": -960,
       "z": 0
     },
     "_lrot": {
@@ -4284,7 +4284,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4807,7 +4807,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 860.0000000000001,
+      "y": 860,
       "z": 0
     },
     "_lrot": {
@@ -5617,7 +5617,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5817,7 +5817,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -540,
-      "y": -960.0000000000001,
+      "y": -960,
       "z": 0
     },
     "_lrot": {
@@ -5856,7 +5856,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -11114,7 +11114,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20282,7 +20282,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20375,7 +20375,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20544,7 +20544,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20596,7 +20596,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -20717,7 +20717,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/script/config.ts

@@ -77,6 +77,7 @@ export class config {
         config.event_type_map.set(config.event_type.countdown_over,"倒计时结束")
 
         config.event_type_map.set(config.event_type.active_event,"激活交互")
+        config.event_type_map.set(config.event_type.stop_active_event,"停用交互")
         config.event_type_map.set(config.event_type.start_event,"开始事件")
         config.event_type_map.set(config.event_type.collect_event,"收集事件")
         config.event_type_map.set(config.event_type.be_event,"被动触发事件")
@@ -215,6 +216,7 @@ export class config {
         start_event:6, //开始事件
         collect_event:7,//收集事件 多组件完成触发
         active_event:8, //激活
+        stop_active_event:9, //停用交互
         countdown_over:10, //倒计时结束
         be_event:11, //被动触发事件
         hide:12, //触发让控件隐藏

assets/script/run/TaskSchedule/taskServce.ts

@@ -178,6 +178,9 @@ export class taskServce {
             case config.event_type.active_event:
                 ClientEvent.dispatchEvent(config.EventRun.NOTICE_EVENT,event.event_item_active_event_data.binding_widget_id,event)
             break;
+            case config.event_type.stop_active_event:
+                ClientEvent.dispatchEvent(config.EventRun.NOTICE_EVENT,event.event_item_stop_active_event_data.binding_widget_id,event)
+            break;
             case config.event_type.countdown_over:
                 
             break;

assets/script/run/game_list_view/game_list.ts

@@ -83,8 +83,10 @@ export class game_list extends Component {
             this.start_pos = et.getUILocation()
         })
         this.content.on(Node.EventType.TOUCH_MOVE,(et:EventTouch)=>{
+            this.onTouchActive = false
             if( Math.abs(this.start_pos.x-et.getUILocation().x)<30){
                 this.start_pos = et.getUILocation()
+                this.onTouchActive = true
                 return
             }
             let p = new Vec3(et.getUILocation().x,et.getUILocation().y)
@@ -108,6 +110,7 @@ export class game_list extends Component {
     }
 
     touchContentScroll() {
+        this.onTouchActive = true
         if(this.content.position.x < 0) { // 向左滑动
             this.onNextPage()
         }
@@ -117,7 +120,6 @@ export class game_list extends Component {
     }
 
     updatePage(page:number){
-        this.onTouchActive = false
         this.content.removeAllChildren()
         gameManager.getStaticUserData().select_page = page
         gameManager.saveUserData()
@@ -128,10 +130,6 @@ export class game_list extends Component {
                 this.initGameList(msg)
             }
         })
-        this.unscheduleAllCallbacks()
-        this.scheduleOnce(()=> {
-            this.onTouchActive = true
-        },1)
     }
 
     onUpPage(){
@@ -163,10 +161,10 @@ export class game_list extends Component {
     }
 
     onItemClick(item:level_list_item){
-        gameManager.Singleton.sys_click_button_music()
         if(!this.onTouchActive){
             return
         }
+        gameManager.Singleton.sys_click_button_music()
         if(!item.getIsUnLock()){
             let userUnlockLevesData = gameManager.getUserUnlockLevesData()
             if(userUnlockLevesData.status==1 && userUnlockLevesData.number>0) {

assets/script/run/ui_layer.ts

@@ -131,6 +131,13 @@ export class ui_layer extends Component {
                     this.createCountDown(time_count)   
                 }
             }
+        }else if(event.type===config.event_type.stop_active_event){
+            let time_count = this.mCountDownLlist.get(widgetId)
+            if(time_count!=null){
+                if(this.mAttCountDown==null){
+                    this.createCountDown(time_count)   
+                }
+            }
         }else if(event.type===config.event_type.hide){
             let ui =  this.mUIList.get(widgetId)
             if(ui){

assets/script/run/widget/widget_base.ts

@@ -144,6 +144,9 @@ export class widget_base extends Component {
                 break;
                 case config.event_type.show_new_item: //显示自己同时被激活
                     
+                break;
+                case config.event_type.stop_active_event: //停止激活
+                    this.mIsActive = false;
                 break;
                 // case config.event_type.collect_event: //自己被触发后，被收集类给收集