更新login动画

assets/resources/module/login/login.prefab

@@ -37,13 +37,10 @@
     "_components": [
       {
         "__id__": 38
-      },
-      {
-        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -131,8 +128,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -13.124,
-        -668.885,
+        0,
+        -667,
         0,
         0,
         0,
@@ -1387,38 +1384,6 @@
     "sync": false
   },
   {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "0b9148fc-0951-469d-8696-57c6d27ed5b9"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
     "__type__": "6dba2tWf41JpYkegatfLoGC",
     "_name": "",
     "_objFlags": 0,

assets/resources/spine/loading.atlas

@@ -1,411 +1,418 @@
 
 loading.png
-size: 1921,1603
+size: 2017,1540
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 bei
-  rotate: true
-  xy: 1402, 12
+  rotate: false
+  xy: 1959, 892
   size: 49, 67
   orig: 52, 70
   offset: 2, 1
   index: -1
 beijing
   rotate: true
-  xy: 2, 851
-  size: 750, 1700
+  xy: 2, 786
+  size: 752, 1702
   orig: 752, 1702
-  offset: 1, 1
+  offset: 0, 0
   index: -1
 bizi
   rotate: true
-  xy: 1707, 411
+  xy: 1924, 438
   size: 41, 39
   orig: 43, 42
   offset: 1, 2
   index: -1
 caihong
   rotate: false
-  xy: 2, 128
+  xy: 2, 63
   size: 712, 721
   orig: 738, 735
   offset: 14, 7
   index: -1
 chengbao
   rotate: true
-  xy: 1704, 868
+  xy: 1814, 213
   size: 223, 190
   orig: 230, 192
   offset: 3, 1
   index: -1
 chuan
   rotate: false
-  xy: 1102, 74
+  xy: 1837, 12
   size: 75, 63
   orig: 77, 65
   offset: 1, 1
   index: -1
 er1
   rotate: false
-  xy: 1529, 9
+  xy: 773, 7
   size: 52, 52
   orig: 54, 54
   offset: 1, 1
   index: -1
 er2
   rotate: false
-  xy: 1583, 12
+  xy: 827, 10
   size: 51, 49
   orig: 53, 51
   offset: 1, 1
   index: -1
 eye1
   rotate: true
-  xy: 1884, 105
+  xy: 1985, 131
   size: 80, 30
   orig: 80, 30
   offset: 0, 0
   index: -1
 eye2
-  rotate: false
-  xy: 1809, 187
+  rotate: true
+  xy: 1951, 105
   size: 106, 32
   orig: 108, 34
   offset: 1, 1
   index: -1
 eye3
   rotate: false
-  xy: 977, 109
+  xy: 598, 33
   size: 111, 28
   orig: 113, 31
   offset: 1, 2
   index: -1
 head
   rotate: true
-  xy: 1809, 300
+  xy: 1289, 16
   size: 152, 110
   orig: 154, 113
   offset: 1, 2
   index: -1
 kuzi
-  rotate: true
-  xy: 1848, 467
+  rotate: false
+  xy: 1401, 15
   size: 95, 58
   orig: 97, 61
   offset: 1, 2
   index: -1
 lang1
   rotate: false
-  xy: 1150, 26
+  xy: 380, 18
   size: 216, 43
   orig: 224, 54
   offset: 3, 4
   index: -1
 lang2
-  rotate: true
-  xy: 1372, 69
+  rotate: false
+  xy: 1757, 77
   size: 164, 24
   orig: 170, 34
   offset: 2, 3
   index: -1
 lang3
   rotate: true
-  xy: 1754, 33
+  xy: 1946, 1119
   size: 174, 46
   orig: 180, 52
   offset: 4, 3
   index: -1
 lang4
   rotate: true
-  xy: 1754, 209
+  xy: 1946, 1295
   size: 243, 53
   orig: 251, 59
   offset: 5, 3
   index: -1
 mei1
-  rotate: true
-  xy: 1902, 1290
+  rotate: false
+  xy: 1289, 2
   size: 28, 12
   orig: 32, 14
   offset: 2, 1
   index: -1
 mei2
-  rotate: true
-  xy: 1090, 109
+  rotate: false
+  xy: 130, 2
   size: 28, 10
   orig: 32, 12
   offset: 2, 1
   index: -1
 niao1
   rotate: false
-  xy: 918, 2
+  xy: 2, 2
   size: 126, 59
   orig: 126, 59
   offset: 0, 0
   index: -1
 san
   rotate: false
-  xy: 1414, 63
+  xy: 1531, 438
   size: 338, 346
   orig: 338, 346
   offset: 0, 0
   index: -1
 sanying
   rotate: false
-  xy: 716, 126
+  xy: 716, 61
   size: 259, 107
   orig: 270, 121
   offset: 8, 8
   index: -1
+shatan
+  rotate: false
+  xy: 130, 14
+  size: 248, 47
+  orig: 248, 47
+  offset: 0, 0
+  index: -1
 shou1
   rotate: false
-  xy: 1636, 37
+  xy: 919, 2
   size: 28, 24
   orig: 32, 27
   offset: 2, 2
   index: -1
 shou2-1
-  rotate: false
-  xy: 1368, 11
+  rotate: true
+  xy: 1959, 961
   size: 32, 56
   orig: 35, 59
   offset: 1, 1
   index: -1
 shou2-2
   rotate: true
-  xy: 1802, 2
+  xy: 1965, 448
   size: 31, 50
   orig: 33, 54
   offset: 1, 3
   index: -1
 shou3
   rotate: true
-  xy: 1654, 411
+  xy: 1871, 438
   size: 41, 51
   orig: 45, 54
   offset: 2, 2
   index: -1
 shou4
   rotate: false
-  xy: 1882, 53
+  xy: 880, 19
   size: 37, 40
   orig: 39, 42
   offset: 1, 1
   index: -1
 shu1
   rotate: true
-  xy: 1654, 454
+  xy: 1757, 103
   size: 108, 192
   orig: 108, 192
   offset: 0, 0
   index: -1
 shu2
-  rotate: true
-  xy: 977, 139
+  rotate: false
+  xy: 1871, 607
   size: 94, 204
   orig: 94, 204
   offset: 0, 0
   index: -1
 shu3
-  rotate: false
-  xy: 650, 3
+  rotate: true
+  xy: 977, 2
   size: 166, 121
   orig: 166, 121
   offset: 0, 0
   index: -1
 shu4
-  rotate: false
-  xy: 1704, 1093
+  rotate: true
+  xy: 1530, 23
   size: 196, 225
   orig: 196, 225
   offset: 0, 0
   index: -1
 shu5
-  rotate: false
-  xy: 1704, 1320
+  rotate: true
+  xy: 1531, 221
   size: 215, 281
   orig: 215, 281
   offset: 0, 0
   index: -1
 shu7
-  rotate: false
-  xy: 1802, 95
-  size: 80, 90
+  rotate: true
+  xy: 1923, 19
+  size: 82, 92
   orig: 82, 92
-  offset: 1, 1
+  offset: 0, 0
   index: -1
 shu8
-  rotate: false
-  xy: 818, 12
-  size: 98, 112
+  rotate: true
+  xy: 1414, 154
+  size: 100, 114
   orig: 100, 114
-  offset: 1, 1
+  offset: 0, 0
   index: -1
 shugan1
   rotate: false
-  xy: 1414, 411
+  xy: 1706, 1100
   size: 238, 438
   orig: 238, 438
   offset: 0, 0
   index: -1
 shuying
-  rotate: false
-  xy: 2, 11
+  rotate: true
+  xy: 1414, 256
   size: 528, 115
   orig: 533, 125
   offset: 2, 4
   index: -1
 toufa
   rotate: false
-  xy: 971, 68
+  xy: 711, 20
   size: 60, 39
   orig: 60, 39
   offset: 0, 0
   index: -1
 tui1
   rotate: false
-  xy: 918, 70
+  xy: 1959, 836
   size: 51, 54
   orig: 51, 54
   offset: 0, 0
   index: -1
 tui2
   rotate: false
-  xy: 1471, 15
+  xy: 1959, 1071
   size: 56, 46
   orig: 56, 46
   offset: 0, 0
   index: -1
 tuoxie1
   rotate: false
-  xy: 1102, 35
+  xy: 1498, 36
   size: 28, 37
   orig: 30, 40
   offset: 1, 2
   index: -1
 tuoxie2
   rotate: false
-  xy: 1854, 2
+  xy: 919, 28
   size: 40, 31
   orig: 42, 34
   offset: 1, 2
   index: -1
 xie1
   rotate: true
-  xy: 1046, 33
+  xy: 1959, 995
   size: 74, 54
   orig: 78, 56
   offset: 2, 1
   index: -1
 xie10
   rotate: false
-  xy: 1046, 2
+  xy: 598, 2
   size: 102, 29
   orig: 108, 34
   offset: 3, 3
   index: -1
 xie2
-  rotate: false
-  xy: 1896, 19
+  rotate: true
+  xy: 1706, 788
   size: 23, 32
   orig: 23, 32
   offset: 0, 0
   index: -1
 xie3
-  rotate: false
-  xy: 1896, 1060
+  rotate: true
+  xy: 1740, 788
   size: 23, 31
   orig: 23, 31
   offset: 0, 0
   index: -1
 xie4
-  rotate: true
-  xy: 1896, 2
+  rotate: false
+  xy: 1513, 115
   size: 15, 17
   orig: 18, 19
   offset: 2, 1
   index: -1
 xie5
   rotate: false
-  xy: 1398, 196
+  xy: 961, 42
   size: 14, 17
   orig: 17, 20
   offset: 1, 1
   index: -1
 xie6
-  rotate: false
-  xy: 1704, 851
+  rotate: true
+  xy: 1513, 134
   size: 18, 15
   orig: 21, 17
   offset: 2, 1
   index: -1
 xie7
   rotate: true
-  xy: 1398, 215
+  xy: 2001, 1520
   size: 18, 14
   orig: 21, 17
   offset: 1, 1
   index: -1
 xie8
   rotate: false
-  xy: 1884, 95
+  xy: 1965, 438
   size: 21, 8
   orig: 24, 10
   offset: 2, 1
   index: -1
 xie9
   rotate: false
-  xy: 818, 2
+  xy: 1988, 438
   size: 21, 8
   orig: 24, 10
   offset: 1, 1
   index: -1
 xigua
   rotate: false
-  xy: 1802, 35
+  xy: 1757, 17
   size: 78, 58
   orig: 80, 60
   offset: 1, 1
   index: -1
 yguang
   rotate: false
-  xy: 716, 235
+  xy: 716, 170
   size: 696, 614
   orig: 750, 627
   offset: 0, 13
   index: -1
 yifu
   rotate: false
-  xy: 1809, 221
+  xy: 1401, 75
   size: 110, 77
   orig: 110, 84
   offset: 0, 7
   index: -1
 yingzi
   rotate: false
-  xy: 1183, 71
+  xy: 1100, 6
   size: 187, 162
   orig: 191, 166
   offset: 2, 2
   index: -1
 yizi
   rotate: false
-  xy: 1654, 564
+  xy: 1706, 813
   size: 251, 285
   orig: 255, 288
   offset: 1, 2
   index: -1
 zhuozi
   rotate: true
-  xy: 532, 2
+  xy: 1871, 481
   size: 124, 116
   orig: 126, 118
   offset: 1, 1
   index: -1
 zui
-  rotate: false
-  xy: 1896, 1031
+  rotate: true
+  xy: 1985, 106
   size: 23, 27
   orig: 32, 30
   offset: 5, 2

assets/resources/spine/loading.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1921,
-  "height": 1603,
+  "width": 2017,
+  "height": 1540,
   "platformSettings": {},
   "subMetas": {
     "loading": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 2,
       "trimY": 2,
-      "width": 1917,
-      "height": 1599,
-      "rawWidth": 1921,
-      "rawHeight": 1603,
+      "width": 2013,
+      "height": 1536,
+      "rawWidth": 2017,
+      "rawHeight": 1540,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/script/game/data/AppData.ts

@@ -20,6 +20,15 @@ export class AppData {
     /** 测试服/正式服的appId */
     public appId: string = 'wxcf31f0e54f7fefda';
 
+    /** 友盟渠道 */
+    public umengChannel:string = '';
+
+    /** 设备型号 */
+    public deviceType:string = '';
+
+    /** 安卓版本号 */
+    public androidVersion:string = '';
+
     public mac: string = 'c9:05:e2:1c:b2:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
@@ -33,6 +42,30 @@ export class AppData {
     };
 
 
+    /**
+     * 更新设备信息
+     * @description 自定义功能 JavaToCocos
+     * @param info  info(Java返回)
+     */
+    public updateDeviceInfo(info) {
+        let arr = info.split('#')
+        this.machineInfo.android_id = arr[0];
+        this.machineInfo.idfa = arr[1];
+        this.machineInfo.imei = arr[2];
+        this.machineInfo.mac = this.mac = arr[3];
+        this.machineInfo.oaid = arr[4];
+        this.machineInfo.umid = arr[5];
+        this.tfChannel = arr[6];
+        this.appVersion = arr[7];
+
+        /** 友盟渠道 */
+        this.umengChannel = arr[8];
+        /** 设备型号 */
+        this.deviceType = arr[9];
+        /** 安卓版本号 */
+        this.androidVersion = arr[10];
+    }
+
     public init() {
 
     }

assets/script/mk/system/JsbSystem.ts

@@ -59,7 +59,7 @@ export default class JsbSystem {
      */
     public static updateDeviceInfo(info) {
         if (cc.sys.os == cc.sys.OS_ANDROID) {
-            //GameConst.updateDeviceInfo(info)
+            gData.appData.updateDeviceInfo(info);
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {