future 1 жил өмнө
parent
commit
060200d569

+ 0 - 1
assets/script/data.ts

@@ -105,7 +105,6 @@ export class sysConfig{
 export class user_free_ads_data{
 export class user_free_ads_data{
     public look_video_count:number = 0
     public look_video_count:number = 0
     public start_date_time:number = 0
     public start_date_time:number = 0
-    public seconds:number = 0
     public is_free:boolean = false
     public is_free:boolean = false
     public is_look_video_infinite_count_reward:boolean = false //是否看广告的无限次数奖励
     public is_look_video_infinite_count_reward:boolean = false //是否看广告的无限次数奖励
 }
 }

+ 13 - 19
assets/script/manager/userDataManager.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Node, sys } from 'cc';
+import { _decorator, sys } from 'cc';
 import { user_car_list, user_free_ads_data, userData } from '../data';
 import { user_car_list, user_free_ads_data, userData } from '../data';
 import { config } from '../config';
 import { config } from '../config';
 import { tools } from '../tools';
 import { tools } from '../tools';
@@ -8,15 +8,15 @@ const { ccclass, property } = _decorator;
 export class userDataManager  {
 export class userDataManager  {
     public static user_data:userData = null
     public static user_data:userData = null
     public static user_car_list:user_car_list = null
     public static user_car_list:user_car_list = null
-    public static user_free_ads_data:user_free_ads_data = null
+    public static free_ads_data:user_free_ads_data = null
 
 
     // 用户免广告
     // 用户免广告
     public static getUserIsFreeAds():boolean {
     public static getUserIsFreeAds():boolean {
-        return userDataManager.user_free_ads_data.is_free
+        return userDataManager.free_ads_data.is_free
     }
     }
 
 
     public static saveUserFreeAdsData() {
     public static saveUserFreeAdsData() {
-        let data = JSON.stringify(userDataManager.user_free_ads_data)
+        let data = JSON.stringify(userDataManager.free_ads_data)
         // console.log('保存-----用户免费广告',data)
         // console.log('保存-----用户免费广告',data)
         sys.localStorage.setItem(config.USER_FREE_ADS_DATA, data)
         sys.localStorage.setItem(config.USER_FREE_ADS_DATA, data)
     }
     }
@@ -26,24 +26,20 @@ export class userDataManager  {
     }
     }
 
 
     public static getUserFreeAdsData():user_free_ads_data {
     public static getUserFreeAdsData():user_free_ads_data {
-        if(userDataManager.user_free_ads_data!=null) {
-            // console.log('获取--静态---用户免费广告',userDataManager.user_free_ads_data)
-            return userDataManager.user_free_ads_data
+        if(userDataManager.free_ads_data!=null) {
+            // console.log('获取--静态---用户免费广告',userDataManager.free_ads_data)
+            return userDataManager.free_ads_data
         }
         }
         let str = sys.localStorage.getItem(config.USER_FREE_ADS_DATA)
         let str = sys.localStorage.getItem(config.USER_FREE_ADS_DATA)
-        let data = new user_free_ads_data
+        // console.log('str=',str)
         if(str==undefined||str==""||str==null||str=='null'){
         if(str==undefined||str==""||str==null||str=='null'){
-            data.look_video_count = 0
-            data.start_date_time = 0
-            data.seconds = 0
-            data.is_free = false
-            data.is_look_video_infinite_count_reward = false
+            userDataManager.free_ads_data = new user_free_ads_data
         } else {
         } else {
-            data = JSON.parse(str)
+            let nd:user_free_ads_data = JSON.parse(str)
+            userDataManager.free_ads_data = nd            
         }
         }
-        userDataManager.user_free_ads_data = data
-        // console.log('获取--解析---用户免费广告',userDataManager.user_free_ads_data)
-        return data
+        // console.log('获取--解析---用户免费广告',userDataManager.free_ads_data)
+        return userDataManager.free_ads_data
     }
     }
 
 
     public static addUserFreeAdsSeconds(add_seconds:number) {
     public static addUserFreeAdsSeconds(add_seconds:number) {
@@ -62,8 +58,6 @@ export class userDataManager  {
         // console.log('old_time=',old_time)
         // console.log('old_time=',old_time)
         if(old_time<=0) {
         if(old_time<=0) {
             free_ads_data.is_free = false
             free_ads_data.is_free = false
-            free_ads_data.look_video_count = 0
-            free_ads_data.is_look_video_infinite_count_reward = false
             return old_time
             return old_time
         }
         }
         
         

+ 2 - 0
assets/script/ui/unLock_view.ts

@@ -26,7 +26,9 @@ export class unLock_view extends base_ui {
 
 
     initView(lookVideo_finish_cb) {
     initView(lookVideo_finish_cb) {
         this.m_lookVideo_finish_cb = lookVideo_finish_cb
         this.m_lookVideo_finish_cb = lookVideo_finish_cb
+        
         this.m_cur_count = userDataManager.getUserFreeAdsData().look_video_count
         this.m_cur_count = userDataManager.getUserFreeAdsData().look_video_count
+        console.log('this.m_cur_count=',this.m_cur_count)
         let sys_config = tools.sys_config
         let sys_config = tools.sys_config
         this.m_max_count = sys_config.free_ads_number
         this.m_max_count = sys_config.free_ads_number
         let time = 0 
         let time = 0