Skip to content

Commit

Permalink
提交
Browse files Browse the repository at this point in the history
  • Loading branch information
yanglinbo committed Jul 1, 2016
1 parent bbe55f1 commit 892aab2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion assets/Scene/main.fire
Original file line number Diff line number Diff line change
Expand Up @@ -3403,7 +3403,7 @@
"_position": {
"__type__": "cc.Vec2",
"x": 0,
"y": -240
"y": -230
},
"_skewX": 0,
"_skewY": 0,
Expand Down
2 changes: 1 addition & 1 deletion assets/Script/Common.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ cc.Class({
me.audio_distributeCard = assets;
});
}
this.hand_data['start']['d_chair']=2;

var table_data = this.hand_data;
table_data['table_name']=table_data['table_name']?table_data['table_name']:"未知牌局";
table_data['table_code']=table_data['table_code']?table_data['table_code']:"位置邀请码";
Expand Down
2 changes: 1 addition & 1 deletion assets/Script/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ cc.Class({
chipLabel.lineHeight = this.fontStyle['chip']['lineHeight'];
cn.color = new cc.Color(0,0,0);
cn.opacity = 100;
cn.setPosition(0,-40);
cn.setPosition(0,-30);
chipLabel.string = handPot;
}else{
var chipLabel = table_chips_node.getComponent(cc.Label);
Expand Down

0 comments on commit 892aab2

Please sign in to comment.