future 1 gadu atpakaļ
vecāks
revīzija
adce772509

+ 9 - 6
assets/script/GameManager.ts

@@ -24,22 +24,25 @@ export class GameManager extends Component {
             return GameManager.settingData
         }
         let str = sys.localStorage.getItem(config.SETTING_DATA)
-        let data = new settingData
         if(str==undefined||str==""||str==null){
-            data.isOpenYinYue = true
-            data.isOpenYinXiao = true
-            data.isOpenZhendong = true
+            GameManager.settingData = new settingData
         } else {
-            data = JSON.parse(str)
+            let data:settingData = JSON.parse(str)
             GameManager.settingData = data
         }
-        return data;
+        return GameManager.settingData;
     }
 
     public static saveSettingData(data:settingData) {
         sys.localStorage.setItem(config.SETTING_DATA, JSON.stringify(data));
     }
 
+    public static vibrateShort() {
+        if(GameManager.settingData.isOpenZhendong) {
+            SdkUtil.vibrateShort()
+        }
+    }
+
     //请求广播
     public static requestGuangbo(cb=null) {
         http.get(config.STATIC_API.msg, (err,d)=>{

+ 2 - 2
assets/script/game/car.ts

@@ -3,7 +3,6 @@ import { wall } from './wall';
 import { box } from './box';
 import { coin } from './coin';
 import { tools } from '../tools';
-import { SdkUtil } from '../sdkUtil';
 import { game } from './game';
 import { DirType, model_content_item_data } from '../data';
 import { config } from '../config';
@@ -12,6 +11,7 @@ import { userDataManager } from '../manager/userDataManager';
 import { audioManager } from '../manager/audioManager';
 import { buff_manager } from './buff/buff_manager';
 import { hp_bar } from './hp_bar';
+import { GameManager } from '../GameManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('car')
@@ -209,7 +209,7 @@ export class car extends Component {
         this.isStopY  = true
         this.updateScores()
         // this.node.getComponent(RigidBody2D).sleep()
-        SdkUtil.vibrateShort()
+        GameManager.vibrateShort()
         // this.node.position = new Vec3(this.node.position.x, this.node.position.y-8)
         // this.node.getComponent(RigidBody2D).linearVelocity = new Vec2(0,-2.5)
 

+ 9 - 0
assets/script/ui/setting.ts

@@ -58,6 +58,9 @@ export class setting extends base_ui {
             this.yinyue_btn_off.active = true
         }
         let setting_data = GameManager.getSettingData()
+        if(open==setting_data.isOpenYinYue) {
+            return
+        }
         setting_data.isOpenYinYue = open
         GameManager.saveSettingData(setting_data)
     }
@@ -71,6 +74,9 @@ export class setting extends base_ui {
             this.shengyin_btn_off.active = true
         }
         let setting_data = GameManager.getSettingData()
+        if(open==setting_data.isOpenYinXiao) {
+            return
+        }
         setting_data.isOpenYinXiao = open
         GameManager.saveSettingData(setting_data)
     }
@@ -84,6 +90,9 @@ export class setting extends base_ui {
             this.zhendong_btn_off.active = true
         }
         let setting_data = GameManager.getSettingData()
+        if(open==setting_data.isOpenZhendong) {
+            return
+        }
         setting_data.isOpenZhendong = open
         GameManager.saveSettingData(setting_data)
     }