Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master

liuzhiwei

2020-12-26 56d95fa59a9f6dc12d0fc0723ea449e5b317f994

1
[[1,"1级金币获取增加","18小时内对战结算金币量+10%",64800,1,1.1,10000,5000,2,"scoreshopgold1"],[2,"2级金币获取增加","18小时内对战结算金币量+15%",64800,1,1.5,15000,5000,2,"scoreshopgold2"],[3,"通行证经验增加","18小时每次对战可获得100点通行证经验",64800,2,100,8000,2000,2,"scoreexp1"]]