Merge branch 'master_ob2' into cycle_activity_ob2
# Conflicts: # conf/c_database_version.json # conf/hotfix.json # serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java # serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.javamaster_otnew
commit
d5d62aaf00
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"version":"6",
|
"version":"8",
|
||||||
"tables":"SpecialConfig"
|
"tables":"GlobalActivity"
|
||||||
}
|
}
|
|
@ -1,7 +1,4 @@
|
||||||
{
|
{
|
||||||
"version":"9",
|
"version":"5",
|
||||||
"classes":[
|
"classes":[]
|
||||||
{"name":"CBean2Proto.class","fullName":"com.ljsd.jieling.util.CBean2Proto"},
|
|
||||||
{"name":"EquipLogic.class","fullName":"com.ljsd.jieling.logic.equip.EquipLogic"}
|
|
||||||
]
|
|
||||||
}
|
}
|
|
@ -104,7 +104,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
case DAILY_MISSION_REWARD:{
|
case DAILY_MISSION_REWARD:{
|
||||||
dailyMissionIdsType.rewardMission(user,(int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION));
|
dailyMissionIdsType.rewardMission(user,(int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION));
|
||||||
if(!missionTypeEnumListMap.get(GameMisionType.DAILYMISSION).isEmpty()){
|
if(!missionTypeEnumListMap.get(GameMisionType.DAILYMISSION).isEmpty()){
|
||||||
calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]);
|
calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap, parm[0]);
|
||||||
updateString("dailyMissionIdsType",dailyMissionIdsType);
|
updateString("dailyMissionIdsType",dailyMissionIdsType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -490,7 +490,7 @@ public class MissionLoigc {
|
||||||
*/
|
*/
|
||||||
public static void getCowFlySkyMission(User user ,List<CommonProto.UserMissionInfo> missionList){
|
public static void getCowFlySkyMission(User user ,List<CommonProto.UserMissionInfo> missionList){
|
||||||
CowFlySkyMissionType missionType = user.getUserMissionManager().getCowFlySkyMissionType();
|
CowFlySkyMissionType missionType = user.getUserMissionManager().getCowFlySkyMissionType();
|
||||||
CumulationData cumulationData = user.getUserMissionManager().getCumulationData();
|
CumulationData cumulationData = user.getUserMissionManager().getCowFlyCumulationData();
|
||||||
// 进行中
|
// 进行中
|
||||||
Set<Integer> doingMissionIds = missionType.getDoingMissionIds();
|
Set<Integer> doingMissionIds = missionType.getDoingMissionIds();
|
||||||
// 可领取
|
// 可领取
|
||||||
|
|
Loading…
Reference in New Issue