Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
c032ea2eaa
|
@ -65,6 +65,7 @@ public class CBean2Proto {
|
|||
.setItemId(item.getItemId())
|
||||
.setItemNum(itemNum)
|
||||
.setEndingTime(item.getEndingTime())
|
||||
.setNextFlushTime(item.getEndingTime() + getRecoverSpeedByItem(item.getItemId()))
|
||||
.build();
|
||||
return itemProto;
|
||||
}
|
||||
|
@ -366,6 +367,9 @@ public class CBean2Proto {
|
|||
return energyRecoverSpeed[1]*60;
|
||||
}
|
||||
int[] recoveryItemInfo = SGameSetting.getGameSetting().getItemRecoveryMap().get(itemId);
|
||||
if(recoveryItemInfo == null){
|
||||
return 0;
|
||||
}
|
||||
return recoveryItemInfo[2];
|
||||
}
|
||||
|
||||
|
|
|
@ -761,6 +761,7 @@ public class ItemUtil {
|
|||
for(Integer itemId : itemForTimeRecoverys){
|
||||
Item item = itemMap.get(itemId);
|
||||
if(item == null){
|
||||
item = itemMap.get(itemId);
|
||||
MapManager.getTimesRecoveryTicket(user,itemId);
|
||||
itemList.add(CBean2Proto.getItem(item,-1));
|
||||
}
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
package db;
|
||||
|
||||
public class MongoTest {
|
||||
}
|
Loading…
Reference in New Issue