Merge branch 'b_c' of http://git.izouma.com/panhui/mobileCyberGamesApp into b_c

lib/model/PlayerInfo.dart

@@ -14,7 +14,7 @@ class PlayerInfo {
   int userId; //用户id
   int statusFlag; //状态 0加入 1准备 2开始 3结束 4结算 6未比赛 9.解析失败 7.超时 
   UserInfo userInfo;
-  int bonus;//奖金
+  num bonus;//奖金
   GameInfo gameInfo;
   HouseInfo houseInfo;
   int rank;//名次

lib/model/PlayerInfo.g.dart

@@ -13,7 +13,7 @@ PlayerInfo _$PlayerInfoFromJson(Map<String, dynamic> json) {
       json['userId'] as int,
       json['statusFlag'] as int,
       json['userInfo'] == null ? null : UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>),
-      json['bonus'] as int,
+      json['bonus'] as num,
       json['gameInfo'] == null ? null : GameInfo.fromJson(json['gameInfo'] as Map<String, dynamic>),
       json['houseInfo'] == null ? null : HouseInfo.fromJson(json['houseInfo'] as Map<String, dynamic>),
       json['rank'] as int,

lib/widget/SuccessfulReception.dart

@@ -8,7 +8,7 @@ import '../widget/LinearButton.dart';
 
 class SuccessfulReception extends StatefulWidget {
   SuccessfulReception({Key key, this.money, this.playerId}) : super(key: key);
-  final int money;
+  final num money;
   final int playerId;
   @override
   SuccessfulReceptionState createState() => SuccessfulReceptionState();

pubspec.yaml

@@ -1,7 +1,7 @@
 name: wanna_battle
 description: A new Flutter project.
 
-version: 1.0.1+4
+version: 1.0.3+2
 
 environment:
   sdk: ">=2.1.0 <3.0.0"