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.java
master_otnew
grimm 2024-03-05 18:36:47 +08:00
commit d5d62aaf00
4 changed files with 6 additions and 9 deletions

View File

@ -1,4 +1,4 @@
{ {
"version":"6", "version":"8",
"tables":"SpecialConfig" "tables":"GlobalActivity"
} }

View File

@ -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"}
]
} }

View File

@ -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);
} }
} }

View File

@ -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();
// 可领取 // 可领取