Merge branch 'develop' into sdk
This commit is contained in:
commit
98b4e71f58
@ -3012,6 +3012,7 @@ func ReqGetInviteReward(player *Player, buf []byte) error {
|
|||||||
"item_id": Items,
|
"item_id": Items,
|
||||||
"register_score": InviteMod.GetIndex,
|
"register_score": InviteMod.GetIndex,
|
||||||
"player_id": Str,
|
"player_id": Str,
|
||||||
|
"is_npc": len(InviteMod.InviteList) == 1,
|
||||||
})
|
})
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,6 +3,7 @@ package test
|
|||||||
import (
|
import (
|
||||||
"server/game"
|
"server/game"
|
||||||
friendTreasure "server/game/mod/friend_treasure.go"
|
friendTreasure "server/game/mod/friend_treasure.go"
|
||||||
|
GoUtil "server/game_util"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -27,3 +28,10 @@ func TestFriendTreasure(t *testing.T) {
|
|||||||
t.Errorf("EndGame error: expected friend item num 22, got %d", FriendItemNum)
|
t.Errorf("EndGame error: expected friend item num 22, got %d", FriendItemNum)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFriendTreasureLimit(t *testing.T) {
|
||||||
|
player := new(game.Player)
|
||||||
|
player.InitPlayerByUid(100001)
|
||||||
|
m := GoUtil.FormatStarItemNum(200, player.GetOrderFactor())
|
||||||
|
t.Logf("m:%d", m)
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user