Merge branch 'master_test_gn_zf' into master_test_gn

lvxinran 2021-06-17 02:44:58 +08:00
commit 45b5757a1d
1 changed files with 1 additions and 1 deletions

View File

@ -76,7 +76,7 @@ public class ChampinGetHandler extends BaseHandler {
} }
} }
if (fightResult != -1) { if (fightResult != -1&&arenaRecord.getFightData()!=null) {
builder1.setFightData(CommonProto.FightData.parseFrom(arenaRecord.getFightData())); builder1.setFightData(CommonProto.FightData.parseFrom(arenaRecord.getFightData()));
} }