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

订单奖励的猫币数量异常

Browse Source
This commit is contained in:
hahwu 2026-03-02 14:37:53 +08:00
parent 698aec8556
commit 766bcfd30b
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/message_handler.go
View File

@ -827,7 +827,7 @@ func (player *Player) AddOrder() {
NewChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+PreheatStep+1, ChessColor)
Items, ok := order.PreheatItems[OrderMod.PreheatStep[ChessColor]]
if !ok {
Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId}, ChessMod.GetOrderEmit()))}
Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId}, ChessMod.GetStarEmitList()))}
}
OrderMod.AddPreheatOrder([]int{NewChessId}, order.DIFF_LOW, order.Preheat_type, Items)
}
@ -869,7 +869,7 @@ func (player *Player) FixOrderBug() {
OrderMod.PreheatStep[k]++
Items, ok := order.PreheatItems[OrderMod.PreheatStep[k]]
if !ok {
Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId}, ChessMod.GetOrderEmit()))}
Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId}, ChessMod.GetStarEmitList()))}
}
OrderMod.AddPreheatOrder([]int{NewChessId}, order.DIFF_LOW, order.Preheat_type, Items)
}
@ -997,7 +997,7 @@ func (player *Player) CreateNormalOrder() {
if v.Type != order.COMFORT_TYPE {
continue
}
Star := order.GetOrderStar(v.MergeId, ChessMod.GetOrderEmit())
Star := order.GetOrderStar(v.MergeId, ChessMod.GetStarEmitList())
Star = int(float64(Star)*float64(OrderFactor)/1000) * 10
v.Items = []*item.Item{{Id: item.ITEM_STAR_ID, Num: Star}}
OrderMod.OrderList[k] = v

9
src/server/game/mod/chess/Chess.go
View File

@ -304,7 +304,14 @@ func (cb *ChessBorad) emitListToSlice(retireFilter bool) []int {
for _, v := range EM {
result = append(result, v)
}
return result
// if !retireFilter {
// for k, v := range cb.Honor {
// if v == 1 {
// result = append(result, k)
// }
// }
// }
return GoUtil.UniqueInts(result)
}
func (cb *ChessBorad) GetStarEmitList() []int {

1
src/server/game/mod/order/order_func.go
View File

@ -390,6 +390,7 @@ func getChesslvRange(Emit int, EnergyMul int, IsCharge bool) (int, int) {
// 根据类型获取发射器id
func GetEmitByColor(Emit []int, color string) int {
sort.Ints(Emit)
for _, v := range Emit {
Produce := mergeDataCfg.GetEmitProduceChessType(v)
for _, c := range Produce {

23
src/server/test/chess_test.go Normal file
View File

@ -0,0 +1,23 @@
package test
import (
"fmt"
"server/game"
"server/game/mod/order"
"testing"
)
func TestGetStarEmitList(t *testing.T) {
p1 := new(game.Player)
p1.InitPlayer("3625212")
ChessMod := p1.GetChessMod()
EM := ChessMod.GetStarEmitList()
OrderMod := p1.GetOrderMod()
OrderMod.OrderList = map[int]order.Order{
1: {
MergeId: []int{25, 25},
},
}
p1.InitOrderItem()
fmt.Printf("%v\n", EM)
}