Merge branch 'master_prb_gn' into master_test_gn
commit
a2fc1eda05
|
@ -11,12 +11,12 @@ public class ConsumerMaterialDataManager implements BaseDataManager{
|
||||||
@Override
|
@Override
|
||||||
public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
|
public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
|
||||||
CumulationData.Result result = null;
|
CumulationData.Result result = null;
|
||||||
Map<Integer, Integer> consumeMaterialMapTmp = (Map<Integer, Integer>) parm[0];
|
Map<Integer, Long> consumeMaterialMapTmp = (Map<Integer, Long>) parm[0];
|
||||||
Integer count =null;
|
Long count =null;
|
||||||
if(missionType == MissionType.USER_CONSUMER_GEM){
|
if(missionType == MissionType.USER_CONSUMER_GEM){
|
||||||
count = consumeMaterialMapTmp.get(Global.GEM);
|
count = consumeMaterialMapTmp.get(Global.GEM);
|
||||||
if(count!=null){
|
if(count!=null){
|
||||||
data.setConsumeGem(data.getConsumeGem() + count);
|
data.setConsumeGem(data.getConsumeGem() + count.intValue());
|
||||||
result = new CumulationData.Result(missionType);
|
result = new CumulationData.Result(missionType);
|
||||||
}
|
}
|
||||||
}else if(missionType == MissionType.USER_CONSUMER_STAMINA){
|
}else if(missionType == MissionType.USER_CONSUMER_STAMINA){
|
||||||
|
|
Loading…
Reference in New Issue