pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sdk' into online

Browse Source
This commit is contained in:
hahwu 2025-09-11 23:23:58 +08:00
commit 7e401735f0
5 changed files with 65 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/RegisterNetworkFunc.go
View File

@ -3365,9 +3365,9 @@ func ReqPlayroomInfo(player *Player, buf []byte) error {
}
RandList = GoUtil.UniqueInts(RandList)
if len(RandList) == 0 {
PlayroomMod.SetGameReward(Star, Star, Star)
PlayroomMod.SetGameReward3(Star)
} else if len(RandList) == 1 {
PlayroomMod.SetGameReward(RandList[0], Star, Star)
PlayroomMod.SetGameReward2(RandList[0], Star)
} else {
ChessList := GoUtil.RandSliceNum(RandList, 2)
PlayroomMod.SetGameReward(ChessList[0], ChessList[1], Star)

324
src/server/game/mod/compensation/compensation.go
View File

File diff suppressed because one or more lines are too long

9
src/server/game/mod/order/Order.go
View File

@ -27,6 +27,7 @@ type OrderMod struct {
OrderPool map[int]*Order // 订单池
FinishOrder []int // 已完成订单
IsCharge bool // 是否充值
AutoEmit []string // 自动发射器
}
type Order struct {
@ -212,6 +213,14 @@ func (o *OrderMod) TriggerOrder(lv int, Type string, Emit []int, EnergyMul int)
o.OrderList[v.Id] = orderInfo
} else {
o.addFixOrder(v.Id, v.MergeList, Type, v.Items)
if v.Id == 78 {
o.Retire("D")
o.AutoEmit = append(o.AutoEmit, "D")
}
if v.Id == 79 {
o.Retire("I")
o.AutoEmit = append(o.AutoEmit, "I")
}
}
}
}

4
src/server/game/mod/order/OrderFunc.go
View File

@ -391,6 +391,10 @@ func getEmitSeries(o *OrderMod, Emit []int) string {
if o.EmitShuffle == nil {
o.EmitShuffle = make([]string, 0)
for _, v := range Emit {
EmitId := mergeDataCfg.GetEmitId(v)
if GoUtil.InStringArray(EmitId, o.AutoEmit) {
continue
}
EmitProduct := mergeDataCfg.GetEmitProduceType(v)
if len(EmitProduct) == 0 || EmitProduct[0] == "" {
continue

14
src/server/game/mod/playroom/playroom.go
View File

@ -627,6 +627,16 @@ func (p *PlayroomMod) SetGameReward(Chess1, Chess2, Star int) {
p.GameReward[2] = &item.Item{Id: Chess2, Num: 1}
p.GameReward[3] = &item.Item{Id: item.ITEM_STAR_ID, Num: Star}
}
func (p *PlayroomMod) SetGameReward2(Chess1, Star int) {
p.GameReward[1] = &item.Item{Id: Chess1, Num: 1}
p.GameReward[2] = &item.Item{Id: item.ITEM_STAR_ID, Num: Star}
p.GameReward[3] = &item.Item{Id: item.ITEM_STAR_ID, Num: Star}
}
func (p *PlayroomMod) SetGameReward3(Star int) {
p.GameReward[1] = &item.Item{Id: item.ITEM_STAR_ID, Num: Star}
p.GameReward[2] = &item.Item{Id: item.ITEM_STAR_ID, Num: Star}
p.GameReward[3] = &item.Item{Id: item.ITEM_STAR_ID, Num: Star}
}
func (p *PlayroomMod) SetGameRewardFlip(N1, N2, N3 int) {
p.GameReward[1] = &item.Item{Id: item.ITEM_STAR_ID, Num: N1}
@ -959,9 +969,9 @@ func (p *PlayroomMod) PlayroomDressSet(DressSet map[int]int) ([]int, map[int]int
if Id == 0 {
continue
}
dressInfo, ok := p.NewDress[Type]
dressInfo, ok := p.NewDress[Id]
if !ok {
return nil, nil, fmt.Errorf("dress type not found")
return nil, nil, fmt.Errorf("dress Id not found")
}
if dressInfo.EndTime < GoUtil.Now() && dressInfo.EndTime != 0 {
return nil, nil, fmt.Errorf("dress timeout")