future 1 жил өмнө
parent
commit
b1b0df4854

+ 48 - 48
assets/resources/ui/announcement.prefab

@@ -25,11 +25,14 @@
         "__id__": 10
       },
       {
-        "__id__": 86
+        "__id__": 84
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 92
+      },
       {
         "__id__": 94
       },
@@ -276,13 +279,10 @@
       },
       {
         "__id__": 81
-      },
-      {
-        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 85
+      "__id__": 83
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1864,35 +1864,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "32iCoIX9ZJ/qSud/lRYnsQ"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 84
-    },
-    "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": "1dyeDCWEVMlIzNX6EcN0QA"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1918,17 +1889,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 85
       },
       {
-        "__id__": 89
+        "__id__": 87
       },
       {
-        "__id__": 91
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 91
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1965,11 +1936,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 86
+      "__id__": 84
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 86
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1993,11 +1964,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 86
+      "__id__": 84
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 88
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2038,11 +2009,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 86
+      "__id__": 84
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 90
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2111,7 +2082,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 93
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2139,7 +2110,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 95
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2175,10 +2146,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 97
     },
     "btn_close": {
-      "__id__": 86
+      "__id__": 84
     },
     "empty": {
       "__id__": 73
@@ -2192,6 +2163,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "13wSINiK1FSrDUSd4reirN"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 99
+    },
+    "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": "2avRjrPWVPhq6RNCic94XY"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

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

@@ -25,11 +25,14 @@
         "__id__": 10
       },
       {
-        "__id__": 42
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 48
+      },
       {
         "__id__": 50
       },
@@ -279,13 +282,10 @@
       },
       {
         "__id__": 37
-      },
-      {
-        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -999,35 +999,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "adOJvLOK9JD55p3dlv4qnc"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 40
-    },
-    "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": "6ej3dIUg5P+41MogCfdviM"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1053,17 +1024,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 41
       },
       {
-        "__id__": 45
+        "__id__": 43
       },
       {
-        "__id__": 47
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 47
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1100,11 +1071,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 42
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1128,11 +1099,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 44
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1173,11 +1144,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 46
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1246,7 +1217,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 49
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1274,7 +1245,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 51
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1310,10 +1281,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 53
     },
     "btn_close": {
-      "__id__": 42
+      "__id__": 40
     },
     "lab_xiangcha_score": {
       "__id__": 11
@@ -1343,7 +1314,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 55
     },
     "_id": ""
   },
@@ -1351,6 +1322,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "37P1VCmoxBSoChFMWC397X"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__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+"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

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

@@ -7573,7 +7573,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "9fr/7MAR1G7qrlUO8AWRMv"
+    "fileId": "34NQ/B+a5KfaARrf7X4V6R"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 48 - 48
assets/resources/ui/gameplay_view.prefab

@@ -25,11 +25,14 @@
         "__id__": 10
       },
       {
-        "__id__": 80
+        "__id__": 78
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 86
+      },
       {
         "__id__": 88
       },
@@ -273,13 +276,10 @@
       },
       {
         "__id__": 75
-      },
-      {
-        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 77
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1728,35 +1728,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "9dBxw79GJFbYTL+ih8YnBB"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 78
-    },
-    "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": "2f57Q6QjVNRIH6XjA22skA"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1782,17 +1753,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 81
+        "__id__": 79
       },
       {
-        "__id__": 83
+        "__id__": 81
       },
       {
-        "__id__": 85
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1829,11 +1800,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 80
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 80
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1857,11 +1828,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 80
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 84
+      "__id__": 82
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1902,11 +1873,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 80
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 86
+      "__id__": 84
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1975,7 +1946,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2003,7 +1974,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 89
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2039,10 +2010,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 91
     },
     "btn_close": {
-      "__id__": 80
+      "__id__": 78
     },
     "content_img": {
       "__id__": 52
@@ -2053,6 +2024,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "8dYTBbF41GXqguGEVietFt"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 93
+    },
+    "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": "99hrR9WTtF+pJaCwLe+dKI"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 57 - 57
assets/resources/ui/select_area.prefab

@@ -25,14 +25,17 @@
         "__id__": 10
       },
       {
-        "__id__": 124
+        "__id__": 122
       },
       {
-        "__id__": 130
+        "__id__": 128
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 136
+      },
       {
         "__id__": 138
       },
@@ -282,13 +285,10 @@
       },
       {
         "__id__": 119
-      },
-      {
-        "__id__": 121
       }
     ],
     "_prefab": {
-      "__id__": 123
+      "__id__": 121
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2900,35 +2900,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "f1X2U4+hlJw6ZkGcEc5C9j"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 122
-    },
-    "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": "aavWrjn8RATqCe1JJcrLUh"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -2954,14 +2925,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 125
+        "__id__": 123
       },
       {
-        "__id__": 127
+        "__id__": 125
       }
     ],
     "_prefab": {
-      "__id__": 129
+      "__id__": 127
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2998,11 +2969,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 124
+      "__id__": 122
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 126
+      "__id__": 124
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3026,11 +2997,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 124
+      "__id__": 122
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 128
+      "__id__": 126
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3090,17 +3061,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 131
+        "__id__": 129
       },
       {
-        "__id__": 133
+        "__id__": 131
       },
       {
-        "__id__": 135
+        "__id__": 133
       }
     ],
     "_prefab": {
-      "__id__": 137
+      "__id__": 135
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3137,11 +3108,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 130
+      "__id__": 128
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 132
+      "__id__": 130
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3165,11 +3136,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 130
+      "__id__": 128
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 134
+      "__id__": 132
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3210,11 +3181,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 130
+      "__id__": 128
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 136
+      "__id__": 134
     },
     "clickEvents": [],
     "_interactable": true,
@@ -3283,7 +3254,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 139
+      "__id__": 137
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3311,7 +3282,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 141
+      "__id__": 139
     },
     "_alignFlags": 45,
     "_target": null,
@@ -3347,10 +3318,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 143
+      "__id__": 141
     },
     "btn_close": {
-      "__id__": 130
+      "__id__": 128
     },
     "img_title": {
       "__id__": 17
@@ -3386,7 +3357,7 @@
       "__expectedType__": "cc.Prefab"
     },
     "note_info": {
-      "__id__": 124
+      "__id__": 122
     },
     "_id": ""
   },
@@ -3394,6 +3365,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "782k/ZsFpB/40o9VjE05Uh"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 143
+    },
+    "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": "b6u3RgFiRN8pjhUuxwaQpk"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 93 - 93
assets/resources/ui/setting.prefab

@@ -25,17 +25,20 @@
         "__id__": 10
       },
       {
-        "__id__": 96
+        "__id__": 94
       },
       {
-        "__id__": 104
+        "__id__": 102
       },
       {
-        "__id__": 118
+        "__id__": 116
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 130
+      },
       {
         "__id__": 132
       },
@@ -288,13 +291,10 @@
       },
       {
         "__id__": 91
-      },
-      {
-        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 93
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2273,35 +2273,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "c8XA0Ic1tBaI2gl+9YJlP3"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 94
-    },
-    "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": "85EKgPHqxIeYfNJy2k/LZg"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -2327,17 +2298,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 95
       },
       {
-        "__id__": 99
+        "__id__": 97
       },
       {
-        "__id__": 101
+        "__id__": 99
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 101
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2374,11 +2345,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 94
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 98
+      "__id__": 96
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2402,11 +2373,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 94
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 98
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2447,11 +2418,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 94
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 102
+      "__id__": 100
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2520,23 +2491,23 @@
     },
     "_children": [
       {
-        "__id__": 105
+        "__id__": 103
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 111
+        "__id__": 109
       },
       {
-        "__id__": 113
+        "__id__": 111
       },
       {
-        "__id__": 115
+        "__id__": 113
       }
     ],
     "_prefab": {
-      "__id__": 117
+      "__id__": 115
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2573,20 +2544,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 104
+      "__id__": 102
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 104
       },
       {
-        "__id__": 108
+        "__id__": 106
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 108
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2623,11 +2594,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 105
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 107
+      "__id__": 105
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2651,11 +2622,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 105
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 107
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2732,11 +2703,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 104
+      "__id__": 102
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 112
+      "__id__": 110
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2760,11 +2731,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 104
+      "__id__": 102
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 114
+      "__id__": 112
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2802,11 +2773,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 104
+      "__id__": 102
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 116
+      "__id__": 114
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2846,7 +2817,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 104
+      "__id__": 102
     },
     "_id": ""
   },
@@ -2877,23 +2848,23 @@
     },
     "_children": [
       {
-        "__id__": 119
+        "__id__": 117
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 125
+        "__id__": 123
       },
       {
-        "__id__": 127
+        "__id__": 125
       },
       {
-        "__id__": 129
+        "__id__": 127
       }
     ],
     "_prefab": {
-      "__id__": 131
+      "__id__": 129
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2930,20 +2901,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 118
+      "__id__": 116
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 120
+        "__id__": 118
       },
       {
-        "__id__": 122
+        "__id__": 120
       }
     ],
     "_prefab": {
-      "__id__": 124
+      "__id__": 122
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2980,11 +2951,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 119
+      "__id__": 117
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 121
+      "__id__": 119
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3008,11 +2979,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 119
+      "__id__": 117
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 123
+      "__id__": 121
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3089,11 +3060,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 118
+      "__id__": 116
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 126
+      "__id__": 124
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3117,11 +3088,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 118
+      "__id__": 116
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 128
+      "__id__": 126
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3162,11 +3133,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 118
+      "__id__": 116
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 130
+      "__id__": 128
     },
     "clickEvents": [],
     "_interactable": true,
@@ -3218,7 +3189,7 @@
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": {
-      "__id__": 118
+      "__id__": 116
     },
     "_id": ""
   },
@@ -3249,7 +3220,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 133
+      "__id__": 131
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3277,7 +3248,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 135
+      "__id__": 133
     },
     "_alignFlags": 45,
     "_target": null,
@@ -3313,10 +3284,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 137
+      "__id__": 135
     },
     "btn_close": {
-      "__id__": 96
+      "__id__": 94
     },
     "yinyue_btn_on": {
       "__id__": 30
@@ -3337,13 +3308,13 @@
       "__id__": 78
     },
     "btn_user": {
-      "__id__": 104
+      "__id__": 102
     },
     "lab_user": {
-      "__id__": 105
+      "__id__": 103
     },
     "btn_clear_local_data": {
-      "__id__": 118
+      "__id__": 116
     },
     "_id": ""
   },
@@ -3351,6 +3322,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "1feJVVaStGqIJkeyjDtzA8"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 137
+    },
+    "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": "65vFOSwZpN37UcXeddQdQ7"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 49 - 49
assets/resources/ui/tips_view.prefab

@@ -25,11 +25,14 @@
         "__id__": 10
       },
       {
-        "__id__": 36
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 42
+      },
       {
         "__id__": 44
       },
@@ -276,13 +279,10 @@
       },
       {
         "__id__": 31
-      },
-      {
-        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -794,35 +794,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "799pIcllVInaC+gZgJ2qi6"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 34
-    },
-    "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": "2bMYN/KjhPnZzlSi7uR1Fh"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -848,17 +819,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 35
       },
       {
-        "__id__": 39
+        "__id__": 37
       },
       {
-        "__id__": 41
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 41
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -895,11 +866,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -923,11 +894,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -968,11 +939,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 40
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1041,7 +1012,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 43
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1069,7 +1040,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 45
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1105,10 +1076,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 47
     },
     "btn_close": {
-      "__id__": 36
+      "__id__": 34
     },
     "img_content": {
       "__id__": 23
@@ -1129,7 +1100,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 49
     },
     "_id": ""
   },
@@ -1137,6 +1108,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "dfpmd1B/5M+5idBbcHBU1K"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 51
+    },
+    "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": "59xAd3h0ZImZ+b2ecJsXSK"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 71 - 50
assets/resources/ui/unLock_view.prefab

@@ -25,11 +25,14 @@
         "__id__": 10
       },
       {
-        "__id__": 70
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 76
+      },
       {
         "__id__": 78
       },
@@ -41,10 +44,13 @@
       },
       {
         "__id__": 84
+      },
+      {
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 88
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -282,13 +288,10 @@
       },
       {
         "__id__": 65
-      },
-      {
-        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 67
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1642,35 +1645,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "e1Z8ODslREnpgk48koTrle"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "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": "30yjpoeBJEP7TZj5726ekR"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1696,17 +1670,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 69
       },
       {
-        "__id__": 73
+        "__id__": 71
       },
       {
-        "__id__": 75
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 75
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1743,11 +1717,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 70
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1771,11 +1745,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 72
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1816,11 +1790,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 74
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1889,7 +1863,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 77
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1917,7 +1891,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 79
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1959,7 +1933,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 81
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1995,10 +1969,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 83
     },
     "btn_close": {
-      "__id__": 70
+      "__id__": 68
     },
     "btn_look_video": {
       "__id__": 41
@@ -2015,6 +1989,53 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "aaSMtmELpE1bhivv30fbB8"
   },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 85
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "fePYTakedBxoIc65RvLS9z"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 87
+    },
+    "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": "33KREr8v1BlqxJ9Bh4F47a"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 49 - 49
assets/resources/ui/user_info_view.prefab

@@ -25,11 +25,14 @@
         "__id__": 10
       },
       {
-        "__id__": 98
+        "__id__": 96
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 104
+      },
       {
         "__id__": 106
       },
@@ -291,13 +294,10 @@
       },
       {
         "__id__": 93
-      },
-      {
-        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 95
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2315,35 +2315,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "04cLs0kZ1M3YSD+8pqVsLW"
   },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 96
-    },
-    "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": "c6yE/wFi9ARqcNd99TSAm7"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -2369,17 +2340,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 97
       },
       {
-        "__id__": 101
+        "__id__": 99
       },
       {
-        "__id__": 103
+        "__id__": 101
       }
     ],
     "_prefab": {
-      "__id__": 105
+      "__id__": 103
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2416,11 +2387,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 98
+      "__id__": 96
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 98
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2444,11 +2415,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 98
+      "__id__": 96
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 102
+      "__id__": 100
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2489,11 +2460,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 98
+      "__id__": 96
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 104
+      "__id__": 102
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2562,7 +2533,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 107
+      "__id__": 105
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2590,7 +2561,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 107
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2626,10 +2597,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 111
+      "__id__": 109
     },
     "btn_close": {
-      "__id__": 98
+      "__id__": 96
     },
     "img_avatar": {
       "__id__": 13
@@ -2686,7 +2657,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 113
+      "__id__": 111
     },
     "_id": ""
   },
@@ -2694,6 +2665,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "8eJxQGMzVAubJMptc1NYZ3"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 113
+    },
+    "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": "c7VYxA1vhOq4Ul6qMyfeRf"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {