update proto and fix merge conflicts come from Grasscutters/Grasscutter/pull/226
Protobuf files for Grasscutter