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

Merge branch 'develop' into audit

Browse Source
This commit is contained in:
hahwu 2025-07-10 11:32:02 +08:00
commit d242e154df
7 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go
View File

@ -218,6 +218,21 @@ func GetProgressRewardRand(Lv int) map[int]int {
return r
}
func GetJackpotIdByType(Type int) int {
data, err := gamedata.GetData(CFG_LIMITED_TIME_EVENT_JACKPOT)
if err != nil {
log.Debug("GetJackpotIdByType err:%v", err)
return 0
}
for k, v := range data {
Id := GoUtil.Int(k)
if Type == gamedata.GetIntValue(v, "Type") {
return Id
}
}
return 0
}
// 获取进度选择数量
func GetProgressSelectNum(Lv int) int {
data, err := gamedata.GetData(CFG_LIMITED_TIME_EVENT_BONUS)
@ -297,6 +312,15 @@ func GetPaybackDay() int {
return gamedata.GetIntValue(data, "Value")
}
func GetHighRollerNeedEnergy() int {
data, err := gamedata.GetDataByKey(CFG_LIMITED_TIME_EVENT_CONST, "High_Roller_Need_Energy")
if err != nil {
log.Debug("GetHighRollerNeedEnergy err:%v", err)
return 0
}
return gamedata.GetIntValue(data, "Value")
}
// 招财猫
func GetMoneyCat(Id int) (float64, int) {

17
src/server/conf/order/orderCfg.go
View File

@ -84,6 +84,23 @@ func GetStartOrderByStep(id int) []*gamedata.StartOrderData {
return ret
}
func GetStartOrderById(id int) *gamedata.StartOrderData {
data, err := gamedata.GetData(CFG_START_ORDER)
if err != nil {
return nil
}
v, ok := data[strconv.Itoa(id)]
if !ok {
return nil
}
stepVal := gamedata.GetIntValue(v, "step")
return &gamedata.StartOrderData{
Id: id,
Step: int(stepVal),
MergeList: gamedata.GetIntSliceValue(v, "merge_id_list"),
}
}
func GetMaxStep() int {
data, err := gamedata.GetData(CFG_START_ORDER)
if err != nil {

1
src/server/game/GameLogic.go
View File

@ -920,6 +920,7 @@ func Destroy() {
G_GameLogicPtr.VarMgr.SaveData()
G_GameLogicPtr.MLogManager.Close()
}
log.Debug("服务器下线完成")
}
func GeneratedCode(Phone string) (string, error) {

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

@ -2840,7 +2840,7 @@ func ReqSelectLimitEvent(player *Player, buf []byte) error {
proto.Unmarshal(buf, req)
LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
BaseMod := player.PlayMod.getBaseMod()
Items, slot_reward, slot_order_number, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.Level)
Items, slot_reward, slot_order_number, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy())
if err != nil {
player.SendErrClienRes(&msg.ResSelectLimitEvent{
Code: msg.RES_CODE_FAIL,

6
src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
View File

@ -344,7 +344,7 @@ func (l *LimitedTimeEventMod) AddProgress(Lv int) {
}
// 选择进度奖励
func (l *LimitedTimeEventMod) SelectProgressReward(Id, Lv int) ([]*item.Item, map[int]int, int, error) {
func (l *LimitedTimeEventMod) SelectProgressReward(Id, Lv, Energy int) ([]*item.Item, map[int]int, int, error) {
RewardId, ok := l.ProgressReward[Id]
if !ok {
return nil, nil, 0, fmt.Errorf("RewardId not exist")
@ -362,6 +362,10 @@ func (l *LimitedTimeEventMod) SelectProgressReward(Id, Lv int) ([]*item.Item, ma
SelectNum := limitedTimeEventCfg.GetProgressSelectNum(Lv)
BonusLv := limitedTimeEventCfg.GetBonusLv(Lv)
RandMap := limitedTimeEventCfg.GetProgressRewardRand(BonusLv)
// 体力小于200 high roller事件不进池子
if Energy < limitedTimeEventCfg.GetHighRollerNeedEnergy() {
delete(RandMap, limitedTimeEventCfg.GetJackpotIdByType(EVENT_TYPE_HIGH_ROLLER))
}
n := 0
r := make([]int, 0)
LastOption := l.LastOption

0
src/server/teLog/log.2024-11-27
View File

8
src/server/teLog/log.2024-11-28
View File

@ -1,8 +0,0 @@
{"#account_id":"wmz123456","#distinct_id":"wmz123456","#type":"track","#time":"2024-11-28 11:34:46.831","#event_name":"asset_change","#uuid":"b717face-ad39-11ef-8528-00155d43b6ac","properties":{"#lib":"Golang","#lib_version":"2.0.3","change_after":229,"change_num":50,"change_type":"consume","item_id":100001}}
{"#account_id":"wmz123456","#distinct_id":"wmz123456","#type":"track","#time":"2024-11-28 12:06:37.167","#event_name":"asset_change","#uuid":"29be1c8a-ad3e-11ef-a6e1-00155d43b6ac","properties":{"#lib":"Golang","#lib_version":"2.0.3","change_after":279,"change_num":50,"change_type":"consume","item_id":100001}}
{"#account_id":"wmz123456","#distinct_id":"wmz123456","#type":"track","#time":"2024-11-28 16:06:14.301","#event_name":"asset_change","#uuid":"a32e8eea-ad5f-11ef-a370-00155d43b6ac","properties":{"#lib":"Golang","#lib_version":"2.0.3","change_after":1031,"change_num":100,"change_type":"consume","item_id":100001}}
{"#account_id":"wmz123456","#distinct_id":"wmz123456","#type":"track","#time":"2024-11-28 16:09:48.323","#event_name":"asset_change","#uuid":"22bfd41f-ad60-11ef-b379-00155d43b6ac","properties":{"#lib":"Golang","#lib_version":"2.0.3","change_after":1031,"change_num":100,"change_type":"consume","item_id":100001}}
{"#account_id":"wmz123456","#distinct_id":"wmz123456","#type":"track","#time":"2024-11-28 16:10:15.334","#event_name":"buy_energy_diamond","#uuid":"32d952d0-ad60-11ef-b379-00155d43b6ac","properties":{"#lib":"Golang","#lib_version":"2.0.3","diamond_cost":0,"energy_num":100}}
{"#account_id":"wmz123456","#distinct_id":"wmz123456","#type":"track","#time":"2024-11-28 16:51:30.266","#event_name":"asset_change","#uuid":"f605fd74-ad65-11ef-9f0f-00155d43b6ac","properties":{"#lib":"Golang","#lib_version":"2.0.3","change_after":1231,"change_num":200,"change_type":"consume","item_id":100001}}
{"#account_id":"wmz123456","#distinct_id":"wmz123456","#type":"track","#time":"2024-11-28 16:52:24.927","#event_name":"asset_change","#uuid":"169a8a7c-ad66-11ef-9f0f-00155d43b6ac","properties":{"#lib":"Golang","#lib_version":"2.0.3","change_after":1431,"change_num":200,"change_type":"consume","item_id":100001}}
{"#account_id":"wmz123456","#distinct_id":"wmz123456","#type":"track","#time":"2024-11-28 16:54:29.999","#event_name":"asset_change","#uuid":"6127238e-ad66-11ef-a970-00155d43b6ac","properties":{"#lib":"Golang","#lib_version":"2.0.3","change_after":1631,"change_num":200,"change_type":"consume","item_id":100001}}