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

River Jiang

2020-10-21 c1d12cdfd23933a0db431a70ff5e145924864782

1
[[1,1],[2,1],[3,1],[4,2],[5,1],[6,1],[7,1],[8,1],[9,1],[10,1],[11,2],[12,1],[13,1],[14,1]]