future пре 1 година
родитељ
комит
dc60deda0e
39 измењених фајлова са 1301 додато и 587 уклоњено
  1. 907 134
      assets/resources/ui/home.prefab
  2. 5 5
      assets/resources/ui/rank.prefab
  3. 1 0
      assets/script/data.ts
  4. 1 7
      assets/script/main.ts
  5. 30 0
      assets/script/tools.ts
  6. 6 0
      assets/script/ui/home/home.ts
  7. 36 5
      assets/script/ui/home/home_bottom.ts
  8. 23 1
      assets/script/ui/home/home_top.ts
  9. 1 1
      assets/script/ui/loading_view/loading_view.ts
  10. 6 14
      assets/script/ui/rank/rank.ts
  11. 2 3
      assets/script/ui/rank/rank_list_item.ts
  12. BIN
      assets/texture/ui/home/_0000s_0001_图层-743.png
  13. BIN
      assets/texture/ui/home/_0014_图层-139.png
  14. BIN
      assets/texture/ui/home/_0020_w-.png
  15. 0 134
      assets/texture/ui/home/_0020_w-.png.meta
  16. BIN
      assets/texture/ui/home/btn_car_lib.png
  17. 33 33
      assets/texture/ui/home/btn_car_lib.png.meta
  18. BIN
      assets/texture/ui/home/btn_gong_gao.png
  19. 33 33
      assets/texture/ui/home/btn_gong_gao.png.meta
  20. BIN
      assets/texture/ui/home/btn_setting.png
  21. 32 32
      assets/texture/ui/home/btn_setting.png.meta
  22. BIN
      assets/texture/ui/home/img_change.png
  23. 28 28
      assets/texture/ui/home/img_change.png.meta
  24. BIN
      assets/texture/ui/home/img_gengduo.png
  25. 28 28
      assets/texture/ui/home/img_gengduo.png.meta
  26. BIN
      assets/texture/ui/home/img_head.png
  27. 31 31
      assets/texture/ui/home/img_head.png.meta
  28. BIN
      assets/texture/ui/home/img_head_di.png
  29. 0 0
      assets/texture/ui/home/img_question_mark.png
  30. 2 2
      assets/texture/ui/home/img_question_mark.png.meta
  31. BIN
      assets/texture/ui/home/img_top.png
  32. 15 15
      assets/texture/ui/home/img_top.png.meta
  33. BIN
      assets/texture/ui/home/img_up_rank.png
  34. 18 18
      assets/texture/ui/home/img_up_rank.png.meta
  35. BIN
      assets/texture/ui/home/img_week_score.png
  36. 35 35
      assets/texture/ui/home/img_week_score.png.meta
  37. BIN
      assets/texture/ui/home/img_wenhao.png
  38. 28 28
      assets/texture/ui/home/img_wenhao.png.meta
  39. BIN
      assets/texture/ui/home/img_zhongguo.png

Разлика између датотеке није приказан због своје велике величине
+ 907 - 134
assets/resources/ui/home.prefab


+ 5 - 5
assets/resources/ui/rank.prefab

@@ -109,7 +109,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 865.0000000000001,
+      "y": 865,
       "z": 0
     },
     "_lrot": {
@@ -469,7 +469,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 700.0000000000001,
+      "y": 700,
       "z": 0
     },
     "_lrot": {
@@ -1169,7 +1169,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -10.000000000000114,
+      "y": -10,
       "z": 0
     },
     "_lrot": {
@@ -4822,7 +4822,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -770.0000000000001,
+      "y": -770,
       "z": 0
     },
     "_lrot": {
@@ -6217,7 +6217,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 1 - 0
assets/script/data.ts

@@ -64,6 +64,7 @@ export class rankData{
     public avatarUrl:string = "" //	头像
     public nickName:string = "" //昵称
     public license_code:string = "" //车牌号
+    public car_id:number = 1 // 当前汽车图片id
     public car_url:string = "" //	当前汽车图片
 }
 

+ 1 - 7
assets/script/main.ts

@@ -1,13 +1,7 @@
-import { _decorator, Component, director, EventTouch, game, Node, PhysicsSystem, PhysicsSystem2D, Settings, Tween, UITransform, Vec3 } from 'cc';
-import { http } from './http';
+import { _decorator, Component, Node} from 'cc';
 import { config } from './config';
-import { model_item_data, userData, userInfo } from './data';
 import { tools } from './tools';
-import { SdkUtil } from './sdkUtil';
-import { GameManager } from './GameManager';
 import { uiManager } from './manager/uiManager';
-import { userDataManager } from './manager/userDataManager';
-import { imageCacheManager } from './manager/imageCacheManager';
 import { home } from './ui/home/home';
 import { loading_view } from './ui/loading_view/loading_view';
 const { ccclass, property } = _decorator;

+ 30 - 0
assets/script/tools.ts

@@ -74,6 +74,36 @@ export class tools  {
                 }  
         })
     }
+
+    public static requestRankList(region_id:number, cb) {
+        http.get(config.STATIC_API.rankings(region_id),(err,d)=>{
+            if(!err){
+                let data = JSON.parse(d)
+                if(data.code===config.status.SUCCESS){
+                    // console.log('data=',data.content)
+                    if(cb!=null) {
+                        cb(data.content)
+                    }
+                }
+            } else{
+                console.log("rankList err",err)
+            }
+        })
+        // let opt = {'stype': stype}
+        // http.post(config.API.user_ranking, opt, (err,d)=>{
+        //     if(!err){
+        //         console.log('排行=',d)
+        //         let data = JSON.parse(d)
+        //         if(data.code===config.status.SUCCESS){
+        //             if(cb!=null) {
+        //                 cb(data.content)
+        //             }
+        //         }
+        //     } else{
+        //         console.log("user rank Data err",err)
+        //     }
+        // })
+    }
 }
 
 

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

@@ -16,6 +16,7 @@ export class home extends Component {
     @property(Node) top:Node = null
     @property(Node) bottom:Node = null
     @property(Node) btn_start_game:Node = null
+
     protected start(): void {
         uiManager.Instance().onButtonListen(this.btn_start_game,()=>{
             tools.playGame(()=>{
@@ -24,6 +25,7 @@ export class home extends Component {
             this.node.parent.active = false
         })
         ClientEvent.on(config.UI_EVENT.GET_NEW_CAR,this.onGetNewCar.bind(this),this)
+        this.reloadCountryRankData()
     }
 
     onGetNewCar(){
@@ -34,6 +36,10 @@ export class home extends Component {
         this.top.getComponent(home_top).init()
         this.bottom.getComponent(home_bottom).init()
     }
+
+    public reloadCountryRankData() {
+        this.bottom.getComponent(home_bottom).reloadCountryRankData()
+    }
 }
 
 

+ 36 - 5
assets/script/ui/home/home_bottom.ts

@@ -1,17 +1,48 @@
-import { _decorator, Component, Node } from 'cc';
+import { _decorator, Component, Node, Sprite } from 'cc';
 import { uiManager } from '../../manager/uiManager';
 import { config } from '../../config';
+import { tools } from '../../tools';
+import { imageCacheManager } from '../../manager/imageCacheManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('home_bottom')
 export class home_bottom extends Component {
+    @property(Node) btn_up_rank:Node = null
+    @property(Node) btn_wenhao:Node = null
+    @property(Node) btn_gengduo:Node = null
+    @property(Node) img_rank_car_1:Node = null
+    @property(Node) img_rank_car_2:Node = null
+    @property(Node) img_rank_car_3:Node = null
     start() {
-        // uiManager.Instance().onButtonListen(this.node, ()=>{
-        //     uiManager.Instance().showUi(config.UI.rank)
-        // })
+        uiManager.Instance().onButtonListen(this.btn_up_rank, ()=>{
+            uiManager.Instance().showUi(config.UI.rank)
+        })
+        uiManager.Instance().onButtonListen(this.btn_wenhao, ()=>{
+            uiManager.Instance().showUi(config.UI.ui_unLock_view)
+        })
+        uiManager.Instance().onButtonListen(this.btn_gengduo, ()=>{
+            uiManager.Instance().showUi(config.UI.rank)
+        })
     }
-    public init(){
 
+    public init() {
+
+    }
+    
+    public reloadCountryRankData(){
+        tools.requestRankList(0, (d_content)=>{
+            let data = null
+            if(d_content.length>0) {
+                data = d_content[0]
+                this.img_rank_car_1.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.car_id)
+            } else if(d_content.length>1) {
+                data = d_content[1]
+                this.img_rank_car_2.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.car_id)
+            } else if(d_content.length>2) {
+                data = d_content[2]
+                this.img_rank_car_3.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.car_id)
+            }
+        })
     }
 }
 

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

@@ -1,13 +1,26 @@
-import { _decorator, Component, Node } from 'cc';
+import { _decorator, Component, Label, Node } from 'cc';
 import { uiManager } from '../../manager/uiManager';
 import { config } from '../../config';
+import { userDataManager } from '../../manager/userDataManager';
+import { select_area } from '../select_area/select_area';
+import { area_item_data } from '../../data';
+import { tools } from '../../tools';
 const { ccclass, property } = _decorator;
 
 @ccclass('home_top')
 export class home_top extends Component {
+    @property(Node) btn_region:Node = null
+    @property(Node) lab_region:Node = null
     @property(Node) btn_gong_gao:Node = null
     @property(Node) btn_setting:Node = null
+    @property(Node) lab_nickname:Node = null
+    @property(Node) lab_car_pai:Node = null
     protected start(): void {
+        uiManager.Instance().onButtonListen(this.btn_region,()=>{
+            uiManager.Instance().showUi(config.UI.ui_select_area, null, (node:Node)=>{
+                node.getComponent(select_area).initView(true, this.onSelectArea.bind(this))
+            })
+        })
         uiManager.Instance().onButtonListen(this.btn_gong_gao,()=>{
             uiManager.Instance().showUi(config.UI.ui_unLock_view)
         })
@@ -16,7 +29,16 @@ export class home_top extends Component {
         })
     }
     public init(){
+        this.lab_region.getComponent(Label).string = '北京市 - 北京市'
+        let user_data = userDataManager.user_data
+        this.lab_nickname.getComponent(Label).string = user_data.nickName
+        this.lab_car_pai.getComponent(Label).string = user_data.license_code
+    }
 
+    private onSelectArea(obj:select_area, data:area_item_data) {
+        tools.requestUserSetRegion(data.id, 2, (d)=>{
+            obj.closeSelf()
+        })
     }
 }
 

+ 1 - 1
assets/script/ui/loading_view/loading_view.ts

@@ -99,7 +99,7 @@ export class loading_view extends Component {
                         let nd = JSON.parse(d)
                         if(nd.code === config.status.SUCCESS){
                             userDataManager.user_data = nd.content
-                            console.log('user_data=',userDataManager.user_data)
+                            // console.log('user_data=',userDataManager.user_data)
                             if(login_finish_cb!=null){
                                 login_finish_cb()
                             }

+ 6 - 14
assets/script/ui/rank/rank.ts

@@ -6,6 +6,7 @@ import { rank_list_top } from './rank_list_top';
 import { http } from '../../http';
 import { config } from '../../config';
 import { userDataManager } from '../../manager/userDataManager';
+import { tools } from '../../tools';
 const { ccclass, property } = _decorator;
 
 @ccclass('rank')
@@ -72,18 +73,10 @@ export class rank extends Component {
         } else if(type==3) {
             id = userDataManager.user_data.region_id
         }
-        http.get(config.STATIC_API.rankings(id),(err,d)=>{
-            if(!err){
-                let data = JSON.parse(d)
-                if(data.code===config.status.SUCCESS){
-                    // console.log('data=',data.content)
-                    this.reloadListTop(data.content)
-                    this.reloadListContent(data.content)
-                    this.reloadMyInfo(type)
-                }
-            } else{
-                console.log("initData err",err)
-            }
+        tools.requestRankList(id,(d_content)=>{
+            this.reloadListTop(d_content)
+            this.reloadListContent(d_content)
+            this.reloadMyInfo(type)
         })
     }
 
@@ -117,11 +110,10 @@ export class rank extends Component {
             if(!err){
                 let data = JSON.parse(d)
                 if(data.code===config.status.SUCCESS){
-                    // console.log('data=',data.content)
                     this.my_info_node.getComponent(rank_my_info).initView(data.content)
                 }
             } else{
-                console.log("initData err",err)
+                console.log("user rank Data err",err)
             }
         })
     }

+ 2 - 3
assets/script/ui/rank/rank_list_item.ts

@@ -1,6 +1,7 @@
 import { _decorator, Component, Label, Node, Sprite, UITransform } from 'cc';
 import { rankData } from '../../data';
 import { tools } from '../../tools';
+import { imageCacheManager } from '../../manager/imageCacheManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('rank_list_item')
@@ -20,9 +21,7 @@ export class rank_list_item extends Component {
         this.lab_nickname.getComponent(Label).string = data.nickName
         this.lab_car_number.getComponent(Label).string = data.license_code
         this.lab_score.getComponent(Label).string = data.score + '分'
-        tools.loadRemoteImg(data.car_url, (r)=>{
-            this.img_car.getComponent(Sprite).spriteFrame = r.sf
-        })
+        this.img_car.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.car_id)
     }
 }
 

BIN
assets/texture/ui/home/_0000s_0001_图层-743.png


BIN
assets/texture/ui/home/_0014_图层-139.png


BIN
assets/texture/ui/home/_0020_w-.png


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "06438bec-d504-4f8c-9641-0cfeeee4408c",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "06438bec-d504-4f8c-9641-0cfeeee4408c@6c48a",
-      "displayName": "_0020_w-",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "06438bec-d504-4f8c-9641-0cfeeee4408c",
-        "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": "06438bec-d504-4f8c-9641-0cfeeee4408c@f9941",
-      "displayName": "_0020_w-",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 539.5,
-        "offsetY": -959.5,
-        "trimX": 1079,
-        "trimY": 1919,
-        "width": 1,
-        "height": 1,
-        "rawWidth": 1080,
-        "rawHeight": 1920,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -0.5,
-            -0.5,
-            0,
-            0.5,
-            -0.5,
-            0,
-            -0.5,
-            0.5,
-            0,
-            0.5,
-            0.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            1079,
-            1,
-            1080,
-            1,
-            1079,
-            0,
-            1080,
-            0
-          ],
-          "nuv": [
-            0.9990740740740741,
-            0,
-            1,
-            0,
-            0.9990740740740741,
-            0.0005208333333333333,
-            1,
-            0.0005208333333333333
-          ],
-          "minPos": [
-            -0.5,
-            -0.5,
-            0
-          ],
-          "maxPos": [
-            0.5,
-            0.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "06438bec-d504-4f8c-9641-0cfeeee4408c@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "06438bec-d504-4f8c-9641-0cfeeee4408c@f9941"
-  }
-}

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


+ 33 - 33
assets/texture/ui/home/btn_car_lib.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
+        "offsetX": 0.5,
+        "offsetY": 0.5,
+        "trimX": 2,
         "trimY": 0,
-        "width": 66,
-        "height": 63,
-        "rawWidth": 66,
-        "rawHeight": 63,
+        "width": 204,
+        "height": 79,
+        "rawWidth": 207,
+        "rawHeight": 80,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -33,
-            -31.5,
+            -102,
+            -39.5,
             0,
-            33,
-            -31.5,
+            102,
+            -39.5,
             0,
-            -33,
-            31.5,
+            -102,
+            39.5,
             0,
-            33,
-            31.5,
+            102,
+            39.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
-            63,
-            66,
-            63,
-            0,
-            0,
-            66,
-            0
+            2,
+            80,
+            206,
+            80,
+            2,
+            1,
+            206,
+            1
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
+            0.00966183574879227,
+            0.0125,
+            0.9951690821256038,
+            0.0125,
+            0.00966183574879227,
             1,
+            0.9951690821256038,
             1
           ],
           "minPos": [
-            -33,
-            -31.5,
+            -102,
+            -39.5,
             0
           ],
           "maxPos": [
-            33,
-            31.5,
+            102,
+            39.5,
             0
           ]
         },

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


+ 33 - 33
assets/texture/ui/home/btn_gong_gao.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
+        "offsetX": -0.5,
+        "offsetY": 1,
+        "trimX": 1,
         "trimY": 0,
-        "width": 139,
-        "height": 139,
-        "rawWidth": 139,
-        "rawHeight": 139,
+        "width": 68,
+        "height": 64,
+        "rawWidth": 71,
+        "rawHeight": 66,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -69.5,
-            -69.5,
+            -34,
+            -32,
             0,
-            69.5,
-            -69.5,
+            34,
+            -32,
             0,
-            -69.5,
-            69.5,
+            -34,
+            32,
             0,
-            69.5,
-            69.5,
+            34,
+            32,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
-            139,
-            139,
-            139,
-            0,
-            0,
-            139,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
             1,
-            0,
-            0,
+            66,
+            69,
+            66,
             1,
+            2,
+            69,
+            2
+          ],
+          "nuv": [
+            0.014084507042253521,
+            0.030303030303030304,
+            0.971830985915493,
+            0.030303030303030304,
+            0.014084507042253521,
             1,
+            0.971830985915493,
             1
           ],
           "minPos": [
-            -69.5,
-            -69.5,
+            -34,
+            -32,
             0
           ],
           "maxPos": [
-            69.5,
-            69.5,
+            34,
+            32,
             0
           ]
         },

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


+ 32 - 32
assets/texture/ui/home/btn_setting.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
+        "offsetY": 1,
+        "trimX": 2,
         "trimY": 0,
-        "width": 139,
-        "height": 139,
-        "rawWidth": 139,
-        "rawHeight": 139,
+        "width": 54,
+        "height": 61,
+        "rawWidth": 58,
+        "rawHeight": 63,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -69.5,
-            -69.5,
+            -27,
+            -30.5,
             0,
-            69.5,
-            -69.5,
+            27,
+            -30.5,
             0,
-            -69.5,
-            69.5,
+            -27,
+            30.5,
             0,
-            69.5,
-            69.5,
+            27,
+            30.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
-            139,
-            139,
-            139,
-            0,
-            0,
-            139,
-            0
+            2,
+            63,
+            56,
+            63,
+            2,
+            2,
+            56,
+            2
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
+            0.034482758620689655,
+            0.031746031746031744,
+            0.9655172413793104,
+            0.031746031746031744,
+            0.034482758620689655,
             1,
+            0.9655172413793104,
             1
           ],
           "minPos": [
-            -69.5,
-            -69.5,
+            -27,
+            -30.5,
             0
           ],
           "maxPos": [
-            69.5,
-            69.5,
+            27,
+            30.5,
             0
           ]
         },

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


+ 28 - 28
assets/texture/ui/home/img_zhongguo.png.meta → assets/texture/ui/home/img_change.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "12d4101c-a842-41c5-9cbb-836a9fbc2bd2",
+  "uuid": "eb955293-59a1-4b0e-a83f-60d229f8e138",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "12d4101c-a842-41c5-9cbb-836a9fbc2bd2@6c48a",
-      "displayName": "img_zhongguo",
+      "uuid": "eb955293-59a1-4b0e-a83f-60d229f8e138@6c48a",
+      "displayName": "img_change",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "12d4101c-a842-41c5-9cbb-836a9fbc2bd2",
+        "imageUuidOrDatabaseUri": "eb955293-59a1-4b0e-a83f-60d229f8e138",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "12d4101c-a842-41c5-9cbb-836a9fbc2bd2@f9941",
-      "displayName": "img_zhongguo",
+      "uuid": "eb955293-59a1-4b0e-a83f-60d229f8e138@f9941",
+      "displayName": "img_change",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 98,
-        "height": 28,
-        "rawWidth": 98,
-        "rawHeight": 28,
+        "width": 34,
+        "height": 32,
+        "rawWidth": 34,
+        "rawHeight": 32,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -49,
-            -14,
+            -17,
+            -16,
             0,
-            49,
-            -14,
+            17,
+            -16,
             0,
-            -49,
-            14,
+            -17,
+            16,
             0,
-            49,
-            14,
+            17,
+            16,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            28,
-            98,
-            28,
+            32,
+            34,
+            32,
             0,
             0,
-            98,
+            34,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -49,
-            -14,
+            -17,
+            -16,
             0
           ],
           "maxPos": [
-            49,
-            14,
+            17,
+            16,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "12d4101c-a842-41c5-9cbb-836a9fbc2bd2@6c48a",
+        "imageUuidOrDatabaseUri": "eb955293-59a1-4b0e-a83f-60d229f8e138@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "12d4101c-a842-41c5-9cbb-836a9fbc2bd2@f9941"
+    "redirect": "eb955293-59a1-4b0e-a83f-60d229f8e138@f9941"
   }
 }

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


+ 28 - 28
assets/texture/ui/home/img_score.png.meta → assets/texture/ui/home/img_gengduo.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "56e7eccf-c45a-42da-9ee6-e02e8e222976",
+  "uuid": "fcd48869-abd0-4735-96db-88af466d31a3",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "56e7eccf-c45a-42da-9ee6-e02e8e222976@6c48a",
-      "displayName": "img_score",
+      "uuid": "fcd48869-abd0-4735-96db-88af466d31a3@6c48a",
+      "displayName": "img_gengduo",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "56e7eccf-c45a-42da-9ee6-e02e8e222976",
+        "imageUuidOrDatabaseUri": "fcd48869-abd0-4735-96db-88af466d31a3",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "56e7eccf-c45a-42da-9ee6-e02e8e222976@f9941",
-      "displayName": "img_score",
+      "uuid": "fcd48869-abd0-4735-96db-88af466d31a3@f9941",
+      "displayName": "img_gengduo",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 71,
-        "height": 35,
-        "rawWidth": 71,
-        "rawHeight": 35,
+        "width": 91,
+        "height": 30,
+        "rawWidth": 91,
+        "rawHeight": 30,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -35.5,
-            -17.5,
+            -45.5,
+            -15,
             0,
-            35.5,
-            -17.5,
+            45.5,
+            -15,
             0,
-            -35.5,
-            17.5,
+            -45.5,
+            15,
             0,
-            35.5,
-            17.5,
+            45.5,
+            15,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            35,
-            71,
-            35,
+            30,
+            91,
+            30,
             0,
             0,
-            71,
+            91,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -35.5,
-            -17.5,
+            -45.5,
+            -15,
             0
           ],
           "maxPos": [
-            35.5,
-            17.5,
+            45.5,
+            15,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "56e7eccf-c45a-42da-9ee6-e02e8e222976@6c48a",
+        "imageUuidOrDatabaseUri": "fcd48869-abd0-4735-96db-88af466d31a3@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "56e7eccf-c45a-42da-9ee6-e02e8e222976@f9941"
+    "redirect": "fcd48869-abd0-4735-96db-88af466d31a3@f9941"
   }
 }

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


+ 31 - 31
assets/texture/ui/home/img_head.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
+        "offsetX": -2,
+        "offsetY": 1,
         "trimX": 0,
-        "trimY": 0,
-        "width": 224,
-        "height": 224,
-        "rawWidth": 224,
-        "rawHeight": 224,
+        "trimY": 3,
+        "width": 222,
+        "height": 236,
+        "rawWidth": 226,
+        "rawHeight": 244,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -112,
-            -112,
+            -111,
+            -118,
             0,
-            112,
-            -112,
+            111,
+            -118,
             0,
-            -112,
-            112,
+            -111,
+            118,
             0,
-            112,
-            112,
+            111,
+            118,
             0
           ],
           "indexes": [
@@ -84,32 +84,32 @@
           ],
           "uv": [
             0,
-            224,
-            224,
-            224,
+            241,
+            222,
+            241,
             0,
-            0,
-            224,
-            0
+            5,
+            222,
+            5
           ],
           "nuv": [
             0,
+            0.020491803278688523,
+            0.9823008849557522,
+            0.020491803278688523,
             0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
+            0.9877049180327869,
+            0.9823008849557522,
+            0.9877049180327869
           ],
           "minPos": [
-            -112,
-            -112,
+            -111,
+            -118,
             0
           ],
           "maxPos": [
-            112,
-            112,
+            111,
+            118,
             0
           ]
         },

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


+ 0 - 0
assets/texture/ui/home/_0005__.png → assets/texture/ui/home/img_question_mark.png


+ 2 - 2
assets/texture/ui/home/_0005__.png.meta → assets/texture/ui/home/img_question_mark.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "da6ce475-c4b9-45ca-a7e2-749bd8631b21@6c48a",
-      "displayName": "_0005__",
+      "displayName": "img_question_mark",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "da6ce475-c4b9-45ca-a7e2-749bd8631b21@f9941",
-      "displayName": "_0005__",
+      "displayName": "img_question_mark",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

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


+ 15 - 15
assets/texture/ui/home/img_top.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
+        "offsetY": 0.5,
         "trimX": 0,
         "trimY": 0,
         "width": 1080,
-        "height": 255,
+        "height": 296,
         "rawWidth": 1080,
-        "rawHeight": 255,
+        "rawHeight": 297,
         "borderTop": 72,
         "borderBottom": 84,
         "borderLeft": 252,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -540,
-            -127.5,
+            -148,
             0,
             540,
-            -127.5,
+            -148,
             0,
             -540,
-            127.5,
+            148,
             0,
             540,
-            127.5,
+            148,
             0
           ],
           "indexes": [
@@ -84,19 +84,19 @@
           ],
           "uv": [
             0,
-            255,
+            297,
             1080,
-            255,
-            0,
+            297,
             0,
+            1,
             1080,
-            0
+            1
           ],
           "nuv": [
             0,
-            0,
+            0.003367003367003367,
             1,
-            0,
+            0.003367003367003367,
             0,
             1,
             1,
@@ -104,12 +104,12 @@
           ],
           "minPos": [
             -540,
-            -127.5,
+            -148,
             0
           ],
           "maxPos": [
             540,
-            127.5,
+            148,
             0
           ]
         },

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


+ 18 - 18
assets/texture/ui/home/_0000s_0001_图层-743.png.meta → assets/texture/ui/home/img_up_rank.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "a2773225-cfca-404c-950c-b0dda8c516e5",
+  "uuid": "f45222f5-b377-492a-a9bd-4a1ddd783e8d",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "a2773225-cfca-404c-950c-b0dda8c516e5@6c48a",
-      "displayName": "_0000s_0001_图层-743",
+      "uuid": "f45222f5-b377-492a-a9bd-4a1ddd783e8d@6c48a",
+      "displayName": "img_up_rank",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a2773225-cfca-404c-950c-b0dda8c516e5",
+        "imageUuidOrDatabaseUri": "f45222f5-b377-492a-a9bd-4a1ddd783e8d",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "a2773225-cfca-404c-950c-b0dda8c516e5@f9941",
-      "displayName": "_0000s_0001_图层-743",
+      "uuid": "f45222f5-b377-492a-a9bd-4a1ddd783e8d@f9941",
+      "displayName": "img_up_rank",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -47,9 +47,9 @@
         "trimX": 0,
         "trimY": 0,
         "width": 97,
-        "height": 288,
+        "height": 95,
         "rawWidth": 97,
-        "rawHeight": 288,
+        "rawHeight": 95,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -48.5,
-            -144,
+            -47.5,
             0,
             48.5,
-            -144,
+            -47.5,
             0,
             -48.5,
-            144,
+            47.5,
             0,
             48.5,
-            144,
+            47.5,
             0
           ],
           "indexes": [
@@ -84,9 +84,9 @@
           ],
           "uv": [
             0,
-            288,
+            95,
             97,
-            288,
+            95,
             0,
             0,
             97,
@@ -104,17 +104,17 @@
           ],
           "minPos": [
             -48.5,
-            -144,
+            -47.5,
             0
           ],
           "maxPos": [
             48.5,
-            144,
+            47.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "a2773225-cfca-404c-950c-b0dda8c516e5@6c48a",
+        "imageUuidOrDatabaseUri": "f45222f5-b377-492a-a9bd-4a1ddd783e8d@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a2773225-cfca-404c-950c-b0dda8c516e5@f9941"
+    "redirect": "f45222f5-b377-492a-a9bd-4a1ddd783e8d@f9941"
   }
 }

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


+ 35 - 35
assets/texture/ui/home/_0014_图层-139.png.meta → assets/texture/ui/home/img_week_score.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "dfc3d202-670a-476d-9adb-2f1419df7f80",
+  "uuid": "0aa449dc-e010-42a4-b105-c04e7de7e5b3",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "dfc3d202-670a-476d-9adb-2f1419df7f80@6c48a",
-      "displayName": "_0014_图层-139",
+      "uuid": "0aa449dc-e010-42a4-b105-c04e7de7e5b3@6c48a",
+      "displayName": "img_week_score",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "dfc3d202-670a-476d-9adb-2f1419df7f80",
+        "imageUuidOrDatabaseUri": "0aa449dc-e010-42a4-b105-c04e7de7e5b3",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "dfc3d202-670a-476d-9adb-2f1419df7f80@f9941",
-      "displayName": "_0014_图层-139",
+      "uuid": "0aa449dc-e010-42a4-b105-c04e7de7e5b3@f9941",
+      "displayName": "img_week_score",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,11 +45,11 @@
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
-        "trimY": 0,
-        "width": 213,
-        "height": 212,
-        "rawWidth": 213,
-        "rawHeight": 212,
+        "trimY": 8,
+        "width": 719,
+        "height": 389,
+        "rawWidth": 719,
+        "rawHeight": 405,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -106.5,
-            -106,
+            -359.5,
+            -194.5,
             0,
-            106.5,
-            -106,
+            359.5,
+            -194.5,
             0,
-            -106.5,
-            106,
+            -359.5,
+            194.5,
             0,
-            106.5,
-            106,
+            359.5,
+            194.5,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             0,
-            212,
-            213,
-            212,
+            397,
+            719,
+            397,
             0,
-            0,
-            213,
-            0
+            8,
+            719,
+            8
           ],
           "nuv": [
             0,
-            0,
+            0.019753086419753086,
             1,
+            0.019753086419753086,
             0,
-            0,
-            1,
+            0.980246913580247,
             1,
-            1
+            0.980246913580247
           ],
           "minPos": [
-            -106.5,
-            -106,
+            -359.5,
+            -194.5,
             0
           ],
           "maxPos": [
-            106.5,
-            106,
+            359.5,
+            194.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "dfc3d202-670a-476d-9adb-2f1419df7f80@6c48a",
+        "imageUuidOrDatabaseUri": "0aa449dc-e010-42a4-b105-c04e7de7e5b3@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "dfc3d202-670a-476d-9adb-2f1419df7f80@f9941"
+    "redirect": "0aa449dc-e010-42a4-b105-c04e7de7e5b3@f9941"
   }
 }

BIN
assets/texture/ui/home/img_score.png → assets/texture/ui/home/img_wenhao.png


+ 28 - 28
assets/texture/ui/home/img_head_di.png.meta → assets/texture/ui/home/img_wenhao.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "0299ade5-ebd9-4046-91e8-0631e5161c6c",
+  "uuid": "cd341e08-4879-48e4-9cd5-d0c3093621e9",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "0299ade5-ebd9-4046-91e8-0631e5161c6c@6c48a",
-      "displayName": "img_head_di",
+      "uuid": "cd341e08-4879-48e4-9cd5-d0c3093621e9@6c48a",
+      "displayName": "img_wenhao",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "0299ade5-ebd9-4046-91e8-0631e5161c6c",
+        "imageUuidOrDatabaseUri": "cd341e08-4879-48e4-9cd5-d0c3093621e9",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "0299ade5-ebd9-4046-91e8-0631e5161c6c@f9941",
-      "displayName": "img_head_di",
+      "uuid": "cd341e08-4879-48e4-9cd5-d0c3093621e9@f9941",
+      "displayName": "img_wenhao",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 632,
-        "height": 225,
-        "rawWidth": 632,
-        "rawHeight": 225,
+        "width": 39,
+        "height": 39,
+        "rawWidth": 39,
+        "rawHeight": 39,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -316,
-            -112.5,
+            -19.5,
+            -19.5,
             0,
-            316,
-            -112.5,
+            19.5,
+            -19.5,
             0,
-            -316,
-            112.5,
+            -19.5,
+            19.5,
             0,
-            316,
-            112.5,
+            19.5,
+            19.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            225,
-            632,
-            225,
+            39,
+            39,
+            39,
             0,
             0,
-            632,
+            39,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -316,
-            -112.5,
+            -19.5,
+            -19.5,
             0
           ],
           "maxPos": [
-            316,
-            112.5,
+            19.5,
+            19.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "0299ade5-ebd9-4046-91e8-0631e5161c6c@6c48a",
+        "imageUuidOrDatabaseUri": "cd341e08-4879-48e4-9cd5-d0c3093621e9@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "0299ade5-ebd9-4046-91e8-0631e5161c6c@f9941"
+    "redirect": "cd341e08-4879-48e4-9cd5-d0c3093621e9@f9941"
   }
 }

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


Неке датотеке нису приказане због велике количине промена