diff --git a/assets/career/img/careerUI.plist b/assets/career/img/careerUI.plist
index 1df451c..a88a47c 100644
--- a/assets/career/img/careerUI.plist
+++ b/assets/career/img/careerUI.plist
@@ -7,11 +7,11 @@
beginBtn.png
frame
- {{2,685},{570,176}}
+ {{49,1170},{570,176}}
offset
{0,0}
rotated
-
+
sourceColorRect
{{0,0},{570,176}}
sourceSize
@@ -33,11 +33,11 @@
cityName.png
frame
- {{849,1052},{179,40}}
+ {{597,1704},{179,40}}
offset
{0,0}
rotated
-
+
sourceColorRect
{{0,0},{179,40}}
sourceSize
@@ -46,7 +46,7 @@
customDi.png
frame
- {{574,685},{352,89}}
+ {{597,1061},{352,89}}
offset
{0,0}
rotated
@@ -59,7 +59,7 @@
customTitle.png
frame
- {{892,776},{230,32}}
+ {{926,782},{230,32}}
offset
{0,0}
rotated
@@ -69,23 +69,62 @@
sourceSize
{230,32}
- fenKuang.png
+ dian1.png
frame
- {{926,1132},{236,62}}
+ {{966,61},{56,57}}
offset
{0,0}
rotated
-
+
+ sourceColorRect
+ {{0,0},{56,57}}
+ sourceSize
+ {56,57}
+
+ dian2.png
+
+ frame
+ {{966,2},{56,57}}
+ offset
+ {0,0}
+ rotated
+
+ sourceColorRect
+ {{0,0},{56,57}}
+ sourceSize
+ {56,57}
+
+ fenKuang.png
+
+ frame
+ {{720,1152},{236,62}}
+ offset
+ {0,0}
+ rotated
+
sourceColorRect
{{0,0},{236,62}}
sourceSize
{236,62}
+ guanzi.png
+
+ frame
+ {{295,1704},{30,32}}
+ offset
+ {0,0}
+ rotated
+
+ sourceColorRect
+ {{0,0},{30,32}}
+ sourceSize
+ {30,32}
+
gun1.png
frame
- {{604,638},{360,45}}
+ {{597,1014},{360,45}}
offset
{0,0}
rotated
@@ -98,11 +137,11 @@
gun2.png
frame
- {{2,638},{600,45}}
+ {{2,1170},{600,45}}
offset
{0,0}
rotated
-
+
sourceColorRect
{{0,0},{600,45}}
sourceSize
@@ -111,7 +150,7 @@
gun3.png
frame
- {{966,2},{810,45}}
+ {{966,120},{810,45}}
offset
{0,0}
rotated
@@ -124,7 +163,7 @@
icon_kuang0.png
frame
- {{2,1107},{168,168}}
+ {{2,843},{168,168}}
offset
{0,0}
rotated
@@ -137,7 +176,7 @@
icon_kuang1.png
frame
- {{574,776},{274,316}}
+ {{2,1772},{274,316}}
offset
{0,0}
rotated
@@ -150,7 +189,7 @@
icon_kuang2.png
frame
- {{2,863},{242,299}}
+ {{720,1216},{242,299}}
offset
{0,0}
rotated
@@ -163,7 +202,7 @@
icon_kuang3.png
frame
- {{551,1052},{242,296}}
+ {{720,1460},{242,296}}
offset
{0,0}
rotated
@@ -176,7 +215,7 @@
jia.png
frame
- {{926,789},{38,38}}
+ {{926,638},{38,38}}
offset
{0,0}
rotated
@@ -186,10 +225,36 @@
sourceSize
{38,38}
+ jindut00.png
+
+ frame
+ {{36,1013},{540,20}}
+ offset
+ {0,0}
+ rotated
+
+ sourceColorRect
+ {{3,3},{540,20}}
+ sourceSize
+ {546,26}
+
+ jindut02.png
+
+ frame
+ {{49,1742},{546,26}}
+ offset
+ {0,0}
+ rotated
+
+ sourceColorRect
+ {{0,0},{546,26}}
+ sourceSize
+ {546,26}
+
manKuang.png
frame
- {{926,894},{236,62}}
+ {{960,932},{236,62}}
offset
{0,0}
rotated
@@ -202,7 +267,7 @@
rank1.png
frame
- {{928,685},{102,34}}
+ {{926,678},{102,34}}
offset
{0,0}
rotated
@@ -215,7 +280,7 @@
rank2.png
frame
- {{892,1008},{141,32}}
+ {{2,1014},{141,32}}
offset
{0,0}
rotated
@@ -228,7 +293,7 @@
rank3.png
frame
- {{926,860},{66,32}}
+ {{227,1704},{66,32}}
offset
{0,0}
rotated
@@ -241,7 +306,7 @@
rank4.png
frame
- {{926,829},{89,29}}
+ {{327,1704},{89,29}}
offset
{0,0}
rotated
@@ -251,14 +316,27 @@
sourceSize
{89,29}
- staffKuang1.png
+ ruzhiBg.png
frame
- {{303,1063},{198,246}}
+ {{2,638},{922,203}}
offset
{0,0}
rotated
-
+
+ sourceColorRect
+ {{0,0},{922,203}}
+ sourceSize
+ {922,203}
+
+ staffKuang1.png
+
+ frame
+ {{520,1770},{198,246}}
+ offset
+ {0,0}
+ rotated
+
sourceColorRect
{{0,0},{198,246}}
sourceSize
@@ -267,15 +345,41 @@
staffKuang2.png
frame
- {{303,863},{198,246}}
+ {{320,1770},{198,246}}
+ offset
+ {0,0}
+ rotated
+
+ sourceColorRect
+ {{0,0},{198,246}}
+ sourceSize
+ {198,246}
+
+ xiegang.png
+
+ frame
+ {{320,2018},{25,39}}
offset
{0,0}
rotated
sourceColorRect
- {{0,0},{198,246}}
+ {{0,0},{25,39}}
sourceSize
- {198,246}
+ {25,39}
+
+ yuangongka.png
+
+ frame
+ {{36,1035},{95,114}}
+ offset
+ {0,0}
+ rotated
+
+ sourceColorRect
+ {{0,0},{95,114}}
+ sourceSize
+ {95,114}
metadata
@@ -287,7 +391,7 @@
size
{1024,2048}
smartupdate
- $TexturePacker:SmartUpdate:4c876253524b1cd2dadda5c7f0cf6a95$
+ $TexturePacker:SmartUpdate:d0729302cd0db553e503a1fa6a931920$
textureFileName
careerUI.png
diff --git a/assets/career/img/careerUI.png b/assets/career/img/careerUI.png
index 0d10511..40e854f 100644
Binary files a/assets/career/img/careerUI.png and b/assets/career/img/careerUI.png differ
diff --git a/assets/career/prefab/newGame.prefab b/assets/career/prefab/newGame.prefab
index 5a3a8da..d872008 100644
--- a/assets/career/prefab/newGame.prefab
+++ b/assets/career/prefab/newGame.prefab
@@ -49,16 +49,34 @@
},
{
"__id__": 230
+ },
+ {
+ "__id__": 388
+ },
+ {
+ "__id__": 390
+ },
+ {
+ "__id__": 392
+ },
+ {
+ "__id__": 394
+ },
+ {
+ "__id__": 396
+ },
+ {
+ "__id__": 398
}
],
"_active": true,
"_components": [
{
- "__id__": 388
+ "__id__": 400
}
],
"_prefab": {
- "__id__": 389
+ "__id__": 401
},
"_opacity": 255,
"_color": {
@@ -13879,6 +13897,432 @@
"fileId": "02Dy7OMlFNc7owaoS3CsS7",
"sync": false
},
+ {
+ "__type__": "cc.Node",
+ "_name": "rank1",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [],
+ "_prefab": {
+ "__id__": 389
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 0,
+ "height": 0
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ 0,
+ 542,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "58kaXexONCBJS5OcUQnl8Q",
+ "sync": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "rank2",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [],
+ "_prefab": {
+ "__id__": 391
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 0,
+ "height": 0
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ -140,
+ 225,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "cf4EOnC5tBA5YafiQx1p7B",
+ "sync": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "rank3",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [],
+ "_prefab": {
+ "__id__": 393
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 0,
+ "height": 0
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ 140,
+ 225,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "90E4baYrROpJLx354ZZmSI",
+ "sync": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "rank4",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [],
+ "_prefab": {
+ "__id__": 395
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 0,
+ "height": 0
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ -250,
+ -87,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "a70t23avVI4JjcTBOWwv5n",
+ "sync": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "rank5",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [],
+ "_prefab": {
+ "__id__": 397
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 0,
+ "height": 0
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ 0,
+ -87,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "17cq78gqBFg7Obt6aqbf3s",
+ "sync": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "rank6",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [],
+ "_prefab": {
+ "__id__": 399
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 0,
+ "height": 0
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ 250,
+ -87,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "367egRnxNKP5DXdyD/U2z1",
+ "sync": false
+ },
{
"__type__": "cc.Widget",
"_name": "",
diff --git a/assets/career/script/CareerManager.ts b/assets/career/script/CareerManager.ts
index 270098c..73a0472 100644
--- a/assets/career/script/CareerManager.ts
+++ b/assets/career/script/CareerManager.ts
@@ -28,7 +28,6 @@ export default class CareerManager extends cc.Component {
}
start() {
-
}
//调用获取排行榜接口
public getRank() {
@@ -53,7 +52,6 @@ export default class CareerManager extends cc.Component {
//设置头像 处理的逻辑比较多，不用公共类的了
public setPic(pic) {
-
this.phone.node.parent.getChildByName("icon").active = false;
this.phone.node.active = false;
fetch(pic)
@@ -70,7 +68,6 @@ export default class CareerManager extends cc.Component {
});
var self = this;
cc.assetManager.loadRemote(pic, { ext: '.png' }, (err, texture: cc.Texture2D) => {
-
if (texture) {
self.phone.node.active = true;
self.phone.spriteFrame = new cc.SpriteFrame(texture);