future преди 1 година
родител
ревизия
23aa5c8cf7

+ 17 - 17
assets/resources/ui/car_info.prefab

@@ -146,7 +146,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1222,7 +1222,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1305,7 +1305,7 @@
     "fileId": "1egQWV+zBLPKi5DUdXmOrJ"
   },
   {
-    "__type__": "cc.BlockInputEvents",
+    "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1316,14 +1316,25 @@
     "__prefab": {
       "__id__": 55
     },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
+      "__expectedType__": "cc.AnimationClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "37P1VCmoxBSoChFMWC397X"
+    "fileId": "b3WI1NX6hLVYmfpjJ80FE+"
   },
   {
-    "__type__": "cc.Animation",
+    "__type__": "cc.BlockInputEvents",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1334,22 +1345,11 @@
     "__prefab": {
       "__id__": 57
     },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
-      "__expectedType__": "cc.AnimationClip"
-    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b3WI1NX6hLVYmfpjJ80FE+"
+    "fileId": "37P1VCmoxBSoChFMWC397X"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 100 - 100
assets/resources/ui/feedback.prefab

@@ -25,14 +25,17 @@
         "__id__": 10
       },
       {
-        "__id__": 308
+        "__id__": 306
       },
       {
-        "__id__": 340
+        "__id__": 338
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 346
+      },
       {
         "__id__": 348
       },
@@ -282,13 +285,10 @@
       },
       {
         "__id__": 303
-      },
-      {
-        "__id__": 305
       }
     ],
     "_prefab": {
-      "__id__": 307
+      "__id__": 305
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7549,35 +7549,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "dfMIXrgM9K0KO1ONBUnYaQ"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 306
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
-      "__expectedType__": "cc.AnimationClip"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "34NQ/B+a5KfaARrf7X4V6R"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -7601,20 +7572,20 @@
     },
     "_children": [
       {
-        "__id__": 309
+        "__id__": 307
       },
       {
-        "__id__": 323
+        "__id__": 321
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 337
+        "__id__": 335
       }
     ],
     "_prefab": {
-      "__id__": 339
+      "__id__": 337
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7651,27 +7622,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 308
+      "__id__": 306
     },
     "_children": [
       {
-        "__id__": 310
+        "__id__": 308
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 316
+        "__id__": 314
       },
       {
-        "__id__": 318
+        "__id__": 316
       },
       {
-        "__id__": 320
+        "__id__": 318
       }
     ],
     "_prefab": {
-      "__id__": 322
+      "__id__": 320
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7708,20 +7679,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 309
+      "__id__": 307
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 311
+        "__id__": 309
       },
       {
-        "__id__": 313
+        "__id__": 311
       }
     ],
     "_prefab": {
-      "__id__": 315
+      "__id__": 313
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7758,11 +7729,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 310
+      "__id__": 308
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 312
+      "__id__": 310
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7786,11 +7757,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 310
+      "__id__": 308
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 314
+      "__id__": 312
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -7867,11 +7838,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 309
+      "__id__": 307
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 317
+      "__id__": 315
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7895,11 +7866,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 309
+      "__id__": 307
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 319
+      "__id__": 317
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -7940,11 +7911,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 309
+      "__id__": 307
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 321
+      "__id__": 319
     },
     "clickEvents": [],
     "_interactable": true,
@@ -7996,7 +7967,7 @@
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": {
-      "__id__": 309
+      "__id__": 307
     },
     "_id": ""
   },
@@ -8023,27 +7994,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 308
+      "__id__": 306
     },
     "_children": [
       {
-        "__id__": 324
+        "__id__": 322
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 330
+        "__id__": 328
       },
       {
-        "__id__": 332
+        "__id__": 330
       },
       {
-        "__id__": 334
+        "__id__": 332
       }
     ],
     "_prefab": {
-      "__id__": 336
+      "__id__": 334
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8080,20 +8051,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 323
+      "__id__": 321
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 325
+        "__id__": 323
       },
       {
-        "__id__": 327
+        "__id__": 325
       }
     ],
     "_prefab": {
-      "__id__": 329
+      "__id__": 327
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8130,11 +8101,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 324
+      "__id__": 322
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 326
+      "__id__": 324
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8158,11 +8129,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 324
+      "__id__": 322
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 328
+      "__id__": 326
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8239,11 +8210,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 323
+      "__id__": 321
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 331
+      "__id__": 329
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8267,11 +8238,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 323
+      "__id__": 321
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 333
+      "__id__": 331
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8312,11 +8283,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 323
+      "__id__": 321
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 335
+      "__id__": 333
     },
     "clickEvents": [],
     "_interactable": true,
@@ -8368,7 +8339,7 @@
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": {
-      "__id__": 323
+      "__id__": 321
     },
     "_id": ""
   },
@@ -8395,11 +8366,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 308
+      "__id__": 306
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 338
+      "__id__": 336
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8442,17 +8413,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 341
+        "__id__": 339
       },
       {
-        "__id__": 343
+        "__id__": 341
       },
       {
-        "__id__": 345
+        "__id__": 343
       }
     ],
     "_prefab": {
-      "__id__": 347
+      "__id__": 345
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8489,11 +8460,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 340
+      "__id__": 338
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 342
+      "__id__": 340
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8517,11 +8488,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 340
+      "__id__": 338
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 344
+      "__id__": 342
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8562,11 +8533,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 340
+      "__id__": 338
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 346
+      "__id__": 344
     },
     "clickEvents": [],
     "_interactable": true,
@@ -8635,7 +8606,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 349
+      "__id__": 347
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8663,7 +8634,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 351
+      "__id__": 349
     },
     "_alignFlags": 45,
     "_target": null,
@@ -8699,10 +8670,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 353
+      "__id__": 351
     },
     "btn_close": {
-      "__id__": 340
+      "__id__": 338
     },
     "img_title": {
       "__id__": 17
@@ -8712,13 +8683,13 @@
       "__expectedType__": "cc.SpriteFrame"
     },
     "submit_bottom": {
-      "__id__": 308
+      "__id__": 306
     },
     "btn_submit_up": {
-      "__id__": 309
+      "__id__": 307
     },
     "btn_submit_true": {
-      "__id__": 323
+      "__id__": 321
     },
     "selected_node": {
       "__id__": 23
@@ -8732,6 +8703,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "49DUG7SoFE4oR95MrAYCFH"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 353
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "1fmnYDuBJAZadX6qUfmwUg"
+  },
   {
     "__type__": "cc.BlockInputEvents",
     "_name": "",

+ 50 - 50
assets/resources/ui/restart_view.prefab

@@ -25,11 +25,14 @@
         "__id__": 10
       },
       {
-        "__id__": 64
+        "__id__": 62
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 70
+      },
       {
         "__id__": 72
       },
@@ -143,7 +146,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -282,13 +285,10 @@
       },
       {
         "__id__": 59
-      },
-      {
-        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 61
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1466,35 +1466,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "admXWgTw9BmI/WzVSfn5+o"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 62
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
-      "__expectedType__": "cc.AnimationClip"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "5a15OW0ENNjYN2DXGxy4XW"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1520,17 +1491,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 63
       },
       {
-        "__id__": 67
+        "__id__": 65
       },
       {
-        "__id__": 69
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1567,11 +1538,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 64
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1595,11 +1566,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 66
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1640,11 +1611,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 68
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1713,12 +1684,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1741,7 +1712,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 73
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1777,10 +1748,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 75
     },
     "btn_close": {
-      "__id__": 64
+      "__id__": 62
     },
     "btn_look_video": {
       "__id__": 36
@@ -1794,6 +1765,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "866TdiFvBF1aVKgkYAZVxD"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 77
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "2a290986-2f60-4b6c-a9aa-c8dbef477bc7",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "56NoZcfStJv4IvXBjYZKuC"
+  },
   {
     "__type__": "cc.BlockInputEvents",
     "_name": "",

+ 2 - 2
assets/script/GameManager.ts

@@ -122,7 +122,7 @@ export class GameManager extends Component {
         if(GameManager.settingData!=null) {
             return GameManager.settingData
         }
-        let str = sys.localStorage.getItem(config.SETTING_DATA)
+        let str = sys.localStorage.getItem(config.LOCAL_STORAGE.SETTING_DATA)
         if(str==undefined||str==""||str==null){
             GameManager.settingData = new settingData
         } else {
@@ -133,7 +133,7 @@ export class GameManager extends Component {
     }
 
     public static saveSettingData(data:settingData) {
-        sys.localStorage.setItem(config.SETTING_DATA, JSON.stringify(data));
+        sys.localStorage.setItem(config.LOCAL_STORAGE.SETTING_DATA, JSON.stringify(data));
     }
 
     // 震动

+ 4 - 2
assets/script/config.ts

@@ -123,8 +123,10 @@ export class config  {
         MSG_GUANGBO_RANK:"msg_guangbo_rank",
     }
 
-    static SETTING_DATA:string = "SETTING_DATA"
-    static USER_FREE_ADS_DATA:string = 'USER_FREE_ADS_DATA'
+    public static LOCAL_STORAGE = {
+        SETTING_DATA: "SETTING_DATA",
+        USER_FREE_ADS_DATA: 'USER_FREE_ADS_DATA'
+    }
 
     public static ADS_TYPE = {
         UNKNOWN:"UNKNOWN",

+ 3 - 3
assets/script/manager/userDataManager.ts

@@ -55,11 +55,11 @@ export class userDataManager  {
     public static saveUserFreeAdsData() {
         let data = JSON.stringify(userDataManager.free_ads_data)
         // console.log('保存-----用户免费广告',data)
-        sys.localStorage.setItem(config.USER_FREE_ADS_DATA, data)
+        sys.localStorage.setItem(config.LOCAL_STORAGE.USER_FREE_ADS_DATA, data)
     }
 
     public static clearUserFreeAdsData() {
-        sys.localStorage.removeItem(config.USER_FREE_ADS_DATA)
+        sys.localStorage.removeItem(config.LOCAL_STORAGE.USER_FREE_ADS_DATA)
     }
 
     public static getUserFreeAdsData():user_free_ads_data {
@@ -67,7 +67,7 @@ export class userDataManager  {
             // 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.LOCAL_STORAGE.USER_FREE_ADS_DATA)
         // console.log('str=',str)
         if(str==undefined||str==""||str==null||str=='null'){
             userDataManager.free_ads_data = new user_free_ads_data