playroom优化
This commit is contained in:
parent
ca0efb53dd
commit
328b101d05
@ -183,7 +183,7 @@ func GetPhysiologyDuration(Id int, Num int) int {
|
||||
Min := gamedata.GetIntValue(v, "Min")
|
||||
Max := gamedata.GetIntValue(v, "Max")
|
||||
if Num >= Min && Num <= Max {
|
||||
return gamedata.GetIntValue(v, "Per")
|
||||
return gamedata.GetIntValue(v, "Per") * 60
|
||||
}
|
||||
}
|
||||
return 0
|
||||
|
||||
@ -183,10 +183,10 @@ func ReqRewardOrder(args []interface{}) error {
|
||||
proto.Unmarshal(buf, req)
|
||||
OrderMod := player.PlayMod.getOrderMod()
|
||||
ChessMod := player.PlayMod.getChessMod()
|
||||
PlayroomMod := player.PlayMod.getPlayroomMod()
|
||||
LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
|
||||
Item, mergeList, OrderType, Star, err := OrderMod.RewardOrder(int(req.OrderId))
|
||||
if OrderType == order.Trigger_type { // playroom触发式订单获取额外道具
|
||||
PlayroomMod := player.PlayMod.getPlayroomMod()
|
||||
Item1 := PlayroomMod.GetReward()
|
||||
Item = item.Merge(Item, Item1)
|
||||
P1, P2 := playroomCfg.GetPremiumItem()
|
||||
@ -195,6 +195,10 @@ func ReqRewardOrder(args []interface{}) error {
|
||||
} else {
|
||||
Star = int(math.Ceil(float64(Star) * 0.6))
|
||||
}
|
||||
Target := GetVisitorPlayer(player)
|
||||
PlayroomMod.Target = Target
|
||||
PlayroomMod.Status = playroom.STATUS_VISIT
|
||||
PlayroomBackData(player)
|
||||
}
|
||||
|
||||
if !OrderMod.CheckSuperOrder() {
|
||||
|
||||
@ -100,6 +100,9 @@ func (p *PlayroomMod) InitData() {
|
||||
if p.MoodInfo == nil {
|
||||
p.MoodInfo = make(map[int]*Mood)
|
||||
}
|
||||
if p.Physiology == nil {
|
||||
p.Physiology = make(map[int]*Physiology)
|
||||
}
|
||||
if p.Reward == nil {
|
||||
p.Reward = make([]*item.Item, 0)
|
||||
}
|
||||
@ -504,7 +507,7 @@ func (p *PlayroomMod) UnLock(Lv int) {
|
||||
if Lv < UnlockLv {
|
||||
return
|
||||
}
|
||||
if p.Physiology == nil {
|
||||
if len(p.Physiology) == 0 {
|
||||
Now := GoUtil.Now()
|
||||
p.Physiology = make(map[int]*Physiology)
|
||||
for k := 1; k <= 5; k++ {
|
||||
@ -512,7 +515,7 @@ func (p *PlayroomMod) UnLock(Lv int) {
|
||||
p.Physiology[k] = &Physiology{Id: k, Num: Max, Time: Now}
|
||||
}
|
||||
}
|
||||
if p.MoodInfo == nil {
|
||||
if len(p.MoodInfo) == 0 {
|
||||
p.MoodInfo = make(map[int]*Mood)
|
||||
for k := 1; k <= 3; k++ {
|
||||
p.MoodInfo[k] = &Mood{Id: k, Num: 100}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user