修改
Merge branch 'master' of ssh://github.com/aben402/sanguo into test

Conflicts:
	AppServer/src/main/java/com/ppsea/app/service/SkillService.java
	PBMessage/db/MyBatisGenerator_fcwq_all_res.xml
	PBMessage/src/main/java/com/ppsea/data/dao/ConfigGuardSkillMapper.java
	PBMessage/src/main/java/com/ppsea/data/model/ConfigGuardSkill.java
	PBMessage/src/main/java/com/ppsea/data/model/ConfigGuardSkillExample.java
	PBMessage/src/main/java/com/ppsea/message/profile/PlayerProto.java
	PBMessage/src/main/resources/com/ppsea/data/maps/ConfigGuardSkillMapper.xml
修改
Merge branch 'master' of ssh://github.com/aben402/sanguo into test

Conflicts:
	AppServer/src/main/java/com/ppsea/app/proxy/ProxyHelper.java
	AppServer/src/main/java/com/ppsea/app/server/AppServer.java
	PBMessage/db/MyBatisGenerator_fcwq_all_res.xml
	PBMessage/src/main/java/com/ppsea/data/manager/BaseDBManager.java
	PBMessage/src/main/resources/com/ppsea/data/maps/MapperConfig.xml
修改
bbb
update
gg
Merge branch 'develop' of ssh://git@github.com/aben402/sanguo.git into
develop

Conflicts:
	PBMessage/src/main/java/com/ppsea/message/data/friend/FriendProto.java
	PBMessage/src/main/java/com/ppsea/message/profile/PlayerProto.java
Merge branch 'develop' of ssh://github.com/aben402/sanguo into develop
update
道具修改
update
update
update
Merge branch 'develop'

Conflicts:
	PBMessage/db/MyBatisGenerator_fcwq_all_res.xml
	PBMessage/src/main/java/com/ppsea/data/dao/ConfigSiteMapper.java
	PBMessage/src/main/java/com/ppsea/data/model/ConfigSite.java
	PBMessage/src/main/java/com/ppsea/data/model/ConfigSiteExample.java
	PBMessage/src/main/java/com/ppsea/message/data/achievements/AchievementsProto.java
	PBMessage/src/main/java/com/ppsea/message/data/achievements/AchievementsRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/achievements/AchievementsResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/achievements/StepAchievementsRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/achievements/StepAchievementsResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/achievements/UpAchievementsRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/achievements/UpAchievementsResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/friend/FriendProto.java
	PBMessage/src/main/java/com/ppsea/message/data/gift/CheckGiftRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/gift/ListGiftRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/gift/ListGiftResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/FightUpdateRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/MatchCacheProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/MatchLevelProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/MatchMainProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/MatchPlayerProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/MatchRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/RankResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/RiskMonsterRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/RiskPlayerProto.java
	PBMessage/src/main/java/com/ppsea/message/data/match/RiskResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/AddMultiMissionRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/AddMultiMissionResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/MissionChunkProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/MissionMessageProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/MissionMessageResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/PlayerMissionRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/PlayerMissionResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/PlayerMissionsRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/PlayerMissionsResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/QueryUpdateResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/ReleaseMissionRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/ReleaseMissionResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/UpdateMissionRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/mission/UpdateMissionResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/skill/AddSkillProto.java
	PBMessage/src/main/java/com/ppsea/message/data/skill/SkillProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/FightResultVoProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/MembersMsgProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/PetMsgProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongCreatRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongCreatResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongFightListRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongFightListResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongFightRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongFightResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongFightResultRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongFightResultResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongFightVoProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongFightVoResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongInfoRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongInfoResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongListRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongListResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongMsgProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongSysResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongUpRequestProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongUpResponseProto.java
	PBMessage/src/main/java/com/ppsea/message/data/tong/TongVoProto.java
	PBMessage/src/main/java/com/ppsea/message/profile/PlayerProto.java
	PBMessage/src/main/resources/com/ppsea/data/maps/ConfigSiteMapper.xml