Prechádzať zdrojové kódy

Merge branch 'master' of http://120.79.128.142:3000/904118851/car

xx 1 rok pred
rodič
commit
7329f3d11f

+ 105 - 0
assets/resources/animation/img_guangyun.anim

@@ -0,0 +1,105 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "img_guangyun",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 60,
+    "speed": 0.2,
+    "wrapMode": 22,
+    "enableTrsBlending": false,
+    "_duration": 0.3333333333333333,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 6
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.RealTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      "opacity"
+    ]
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.UIOpacity"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.3333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

+ 13 - 0
assets/resources/animation/img_guangyun.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "cc869ba1-9477-4417-9270-25ddc47903d6",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "img_guangyun"
+  }
+}

+ 308 - 0
assets/resources/animation/img_haiou.anim

@@ -0,0 +1,308 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "img_haiou",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 60,
+    "speed": 0.1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 1.0166666666666666,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 16
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "position"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -486.37200927734375,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 600,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -548.7109985351562,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -300,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 12
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 14
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 13
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 15
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.08333333333333333,
+      0.16666666666666666,
+      0.25,
+      0.3333333333333333,
+      0.4166666666666667,
+      0.5,
+      0.5833333333333334,
+      0.6666666666666666,
+      0.75,
+      0.8333333333333334,
+      0.9166666666666666,
+      1
+    ],
+    "_values": [
+      {
+        "__uuid__": "df789b17-5167-4142-90bb-f4abd259e680@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "df789b17-5167-4142-90bb-f4abd259e680@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "df789b17-5167-4142-90bb-f4abd259e680@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "df789b17-5167-4142-90bb-f4abd259e680@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "df789b17-5167-4142-90bb-f4abd259e680@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "df789b17-5167-4142-90bb-f4abd259e680@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "df789b17-5167-4142-90bb-f4abd259e680@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

+ 13 - 0
assets/resources/animation/img_haiou.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "c3c25889-0186-4ea7-a587-b4f6cb38aa20",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "img_haiou"
+  }
+}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 485 - 235
assets/resources/ui/home.prefab


+ 15 - 0
assets/script/GameManager.ts

@@ -39,6 +39,21 @@ export class GameManager extends Component {
         sys.localStorage.setItem(config.SETTING_DATA, JSON.stringify(data));
     }
 
+    //获取广播
+    public static requestGuangbo(cb=null) {
+        http.get(config.STATIC_API.msg, (err,d)=>{
+            if(!err){
+                let nd = JSON.parse(d)
+                if(nd.code === config.status.SUCCESS){
+                    // console.log("system_msg", nd.content)
+                    if(cb!=null){
+                        cb(nd.content)
+                    }
+                }   
+            }
+        })
+    }
+
     //获取用户车列表
     public static requestUserCarList(cb=null) {
         http.post(config.API.user_car_list,null,(err,d)=>{

+ 1 - 0
assets/script/config.ts

@@ -24,6 +24,7 @@ export class config  {
         levels : "/snakestatic/levels.json",
         regions : "/snakestatic/regions.json",
         car_list : "/snakestatic/car_list.json",
+        msg: "/snakestatic/msg.json",
         rankings: (region_id)=>{
             return `/snakestatic/rankings/${region_id}.json`
         }

+ 4 - 0
assets/script/data.ts

@@ -77,6 +77,10 @@ export class rankData{
     public nationwide_badge_status:number = 0 //全国徽章状态 1展示 0不展示
 }
 
+export class guangboData{
+    public title:string = ""
+}
+
 export class user_car_list{
     public car_list:number[] = [] //汽车列表
     public default_car_id:number = 0 //	默认车辆

+ 1 - 0
assets/script/ui/home/home.ts

@@ -62,6 +62,7 @@ export class home extends Component {
         this.unscheduleAllCallbacks()
         this.schedule(()=>{
             this.bottom.getComponent(home_bottom).reloadCountryRankData()
+            this.top.getComponent(home_top).reloadGuangboData()
         },600)
     }
 }

+ 17 - 16
assets/script/ui/home/home_guangbo.ts

@@ -1,4 +1,5 @@
 import { _decorator, Component, Label, Node, Tween, tween, UITransform, Vec3 } from 'cc';
+import { guangboData } from '../../data';
 const { ccclass, property } = _decorator;
 
 @ccclass('home_guangbo')
@@ -6,23 +7,24 @@ export class home_guangbo extends Component {
     @property(Node) lab_1:Node = null
     @property(Node) lab_2:Node = null
     private cur_index = 0
-    private data_list:string[] = ['1','2','3','4']
-
-    init() {
-        // this.setText(this.lab_1, this.data_list[this.cur_index])
-        // this.schedule(()=>{
-        //     this.cur_index++
-        //     if(this.cur_index>=this.data_list.length) {
-        //         this.cur_index = 0
-        //     }
-        //     this.setText(this.lab_1, this.data_list[this.cur_index])
-            
-        // },2)
+    private data_list:guangboData[] = []
+
+    init(data_list:guangboData[]) {
+        this.data_list = data_list
+        this.lab_1.getComponent(Label).string = this.data_list[this.cur_index].title
+        this.unscheduleAllCallbacks()
+        this.schedule(()=>{
+            this.cur_index++
+            if(this.cur_index>=this.data_list.length) {
+                this.cur_index = 0
+            }
+            this.lab_1.getComponent(Label).string = this.data_list[this.cur_index].title
+        },2.5)
     }
 
     private startSchedule() {
         // this.lab_2.active = false
-        this.setText(this.lab_1, this.data_list[this.cur_index])
+        this.setText(this.lab_1, this.data_list[this.cur_index].title)
         this.schedule(()=>{
             this.cur_index ++
             this.runFrame(this.lab_1)
@@ -31,7 +33,7 @@ export class home_guangbo extends Component {
                 this.cur_index = 0
             }
 
-        },2)
+        },2.5)
     }
 
     private stopSchedule() {
@@ -47,7 +49,7 @@ export class home_guangbo extends Component {
                 // current_node.active = false
                 current_node.setPosition(new Vec3(0,-50,0))
             } else if(later_y==0) {
-                this.setText(current_node, this.data_list[this.cur_index])
+                this.setText(current_node, this.data_list[this.cur_index].title)
                 current_node.active = true
             } else if(later_y==-50) {
                 current_node.active = false
@@ -57,7 +59,6 @@ export class home_guangbo extends Component {
 
     private setText(current_node:Node, str:string) {
         current_node.getComponent(Label).string = '恭喜广州吴彦祖-' + str
-
     }
 }
 

+ 8 - 1
assets/script/ui/home/home_top.ts

@@ -4,6 +4,7 @@ import { config } from '../../config';
 import { userDataManager } from '../../manager/userDataManager';
 import { home_guangbo } from './home_guangbo';
 import { tools } from '../../tools';
+import { GameManager } from '../../GameManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('home_top')
@@ -38,7 +39,13 @@ export class home_top extends Component {
         })
         this.lab_nickname.getComponent(Label).string = user_data.nickName
         this.lab_car_pai.getComponent(Label).string = user_data.license_code
-        this.guangbo.getComponent(home_guangbo).init()
+        this.reloadGuangboData()
+    }
+
+    public reloadGuangboData() {
+        GameManager.requestGuangbo((d_content)=>{
+            this.guangbo.getComponent(home_guangbo).init(d_content)
+        })
     }
     
 }

BIN
assets/texture/ui/home/img_guangyun.png


+ 134 - 0
assets/texture/ui/home/img_guangyun.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "bebca116-cd9d-49d0-9d2a-a54a4268c970",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "bebca116-cd9d-49d0-9d2a-a54a4268c970@6c48a",
+      "displayName": "img_guangyun",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "bebca116-cd9d-49d0-9d2a-a54a4268c970",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "bebca116-cd9d-49d0-9d2a-a54a4268c970@f9941",
+      "displayName": "img_guangyun",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -10,
+        "offsetY": 11,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 812,
+        "height": 909,
+        "rawWidth": 832,
+        "rawHeight": 931,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -406,
+            -454.5,
+            0,
+            406,
+            -454.5,
+            0,
+            -406,
+            454.5,
+            0,
+            406,
+            454.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            931,
+            812,
+            931,
+            0,
+            22,
+            812,
+            22
+          ],
+          "nuv": [
+            0,
+            0.023630504833512353,
+            0.9759615384615384,
+            0.023630504833512353,
+            0,
+            1,
+            0.9759615384615384,
+            1
+          ],
+          "minPos": [
+            -406,
+            -454.5,
+            0
+          ],
+          "maxPos": [
+            406,
+            454.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "bebca116-cd9d-49d0-9d2a-a54a4268c970@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "bebca116-cd9d-49d0-9d2a-a54a4268c970@f9941"
+  }
+}

BIN
assets/texture/ui/home/img_haiou_1.png


+ 134 - 0
assets/texture/ui/home/img_haiou_1.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "df789b17-5167-4142-90bb-f4abd259e680",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "df789b17-5167-4142-90bb-f4abd259e680@6c48a",
+      "displayName": "img_haiou_1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "df789b17-5167-4142-90bb-f4abd259e680",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "df789b17-5167-4142-90bb-f4abd259e680@f9941",
+      "displayName": "img_haiou_1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 106,
+        "height": 58,
+        "rawWidth": 106,
+        "rawHeight": 58,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -53,
+            -29,
+            0,
+            53,
+            -29,
+            0,
+            -53,
+            29,
+            0,
+            53,
+            29,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            58,
+            106,
+            58,
+            0,
+            0,
+            106,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -53,
+            -29,
+            0
+          ],
+          "maxPos": [
+            53,
+            29,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "df789b17-5167-4142-90bb-f4abd259e680@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "df789b17-5167-4142-90bb-f4abd259e680@f9941"
+  }
+}

BIN
assets/texture/ui/home/img_haiou_2.png


+ 134 - 0
assets/texture/ui/home/img_haiou_2.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "dbca90d5-1d69-4e7d-9600-9467ce8dc932",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@6c48a",
+      "displayName": "img_haiou_2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "dbca90d5-1d69-4e7d-9600-9467ce8dc932",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@f9941",
+      "displayName": "img_haiou_2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 2,
+        "offsetY": -2,
+        "trimX": 6,
+        "trimY": 5,
+        "width": 98,
+        "height": 52,
+        "rawWidth": 106,
+        "rawHeight": 58,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -49,
+            -26,
+            0,
+            49,
+            -26,
+            0,
+            -49,
+            26,
+            0,
+            49,
+            26,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            6,
+            53,
+            104,
+            53,
+            6,
+            1,
+            104,
+            1
+          ],
+          "nuv": [
+            0.05660377358490566,
+            0.017241379310344827,
+            0.9811320754716981,
+            0.017241379310344827,
+            0.05660377358490566,
+            0.9137931034482759,
+            0.9811320754716981,
+            0.9137931034482759
+          ],
+          "minPos": [
+            -49,
+            -26,
+            0
+          ],
+          "maxPos": [
+            49,
+            26,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "dbca90d5-1d69-4e7d-9600-9467ce8dc932@f9941"
+  }
+}

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov