tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:1c80a7374157c289cf2d051e2fb224ff7a28a88c
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
...
compare: tl_server_2:fb4a82d26f16f9ac999201c37a0f78959f23ec18
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

6 Commits
1c80a73741 ... fb4a82d26f

Author SHA1 Message Date
by fb4a82d26f 等级榜修改 2024-05-13 11:09:29 +08:00
by 469a8279fc 等级榜删除无用代码 2024-05-13 11:09:29 +08:00
by 528bccfe0b 玩家等级榜log输出error修改 2024-05-13 11:09:28 +08:00
kxdd 45b05b1fe5 记牌器时间计算bug 2024-05-13 11:07:04 +08:00
sk c09c059b79 重置水池 2024-05-08 18:48:27 +08:00
sk 7219ddaed8 重置水池 2024-05-08 18:34:02 +08:00
9 changed files with 114 additions and 143 deletions
Show Stats Expand all files Collapse all files

36
data/DB_GameCoinPool.dat
View File

@ -77,24 +77,24 @@
:ôà–€°¤¼‹ýÿÿÿ €ÐÛÃô(€È¯ %0d8 @œÿÿÿÿÿÿÿÿHàùÿÿÿÿÿÿÿP
;õà–€ðµ­¹ñÿÿÿ €<>ÊÒÆ(€èí¡º0d8 @œÿÿÿÿÿÿÿÿHàùÿÿÿÿÿÿÿP
;öà–€À×µåÅÿÿÿ €À¨Êš:(€ ·‡é0d8 @œÿÿÿÿÿÿÿÿHàùÿÿÿÿÿÿÿP
ÑÛ·€›îÀ–± €ÚÄ XÈ` ÝŒ
ÒÛ·€ŽÎ€áë €„¯_XÈ`À¤ÿ
ÓÛ·€Æ†<C386>€åšw €”ëÜXÈ`À¶üš
ÔÛ·€Œ<E282AC>ž€Êµî €¨Ö¹XÈ`€íøµ
᩸€›îÀ–± €ÚÄ XÈ` ÝŒ
⩸€ŽÎ€áë €„¯_XÈ`À¤ÿ
㩸€Æ†<C386>€åšw €”ëÜXÈ`À¶üš
䩸€Œ<E282AC>ž€Êµî €¨Ö¹XÈ`€íøµ
ñ÷¸€›îÀ–± €ÚÄ XÈ` ÝŒ
ò÷¸€ŽÎ€áë €„¯_XÈ`À¤ÿ
ó÷¸€Æ†<C386>€åšw €”ëÜXÈ`À¶üš
ô÷¸€Œ<E282AC>ž€Êµî €¨Ö¹XÈ`€íøµ
<08>ƹ€›îÀ–± €„¯_XÈ` ÝŒ
‚ƹ€Æ†<C386>€åšw €”ëÜXÈ`À¶üš
ƒÆ¹€Œ<E282AC>ž€Êµî €¨Ö¹XÈ`€íøµ
‘”º€›îÀ–± €„¯_XÈ` ÝŒ
’”º€Æ†<C386>€åšw €”ëÜXÈ`À¶üš
“”º€Œ<E282AC>ž€Êµî €¨Ö¹XÈ`€íøµ
ׁ<EFBFBD>·€<>־€בכ €„¯_Xָ`ְ₪<D6B0>
ׂ<>·€<><E282AC><EFBFBD>€ֺµמ €¨ײ¹Xָ`€םרµ
׃<>·€¼ֱ– €ע‹¨ €ָ¯ %Xָ`€¡<E282AC><C2A1>
װ<EFBFBD>·€ר‚­€ה—׀ €<><E282AC>ְJXָ`€ֲ¸›
ב©¸€<>־€בכ €„¯_Xָ`ְ₪<D6B0>
ג©¸€<><E282AC><EFBFBD>€ֺµמ €¨ײ¹Xָ`€םרµ
ד©¸€¼ֱ– €ע‹¨ €ָ¯ %Xָ`€¡<E282AC><C2A1>
ה©¸€ר‚­€ה—׀ €<><E282AC>ְJXָ`€ֲ¸›
סק¸€<>־€בכ €„¯_Xָ`ְ₪<D6B0>
עק¸€<><E282AC><EFBFBD>€ֺµמ €¨ײ¹Xָ`€םרµ
ףק¸€¼ֱ– €ע‹¨ €ָ¯ %Xָ`€¡<E282AC><C2A1>
פק¸€ר‚­€ה—׀ €<><E282AC>ְJXָ`€ֲ¸›
<08>ֶ¹€<>־€בכ €¨ײ¹Xָ`ְ₪<D6B0>
‚ֶ¹€¼ֱ– €ע‹¨ €ָ¯ %Xָ`€¡<E282AC><C2A1>
ƒֶ¹€ר‚­€ה—׀ €<><E282AC>ְJXָ`€ֲ¸›
‘”÷€<>־€בכ €¨ײ¹Xָ`ְ₪<D6B0>
’”÷€¼ֱ– €ע‹¨ €ָ¯ %Xָ`€¡<E282AC><C2A1>
“”÷€ר‚­€ה—׀ €<><E282AC>ְJXָ`€ֲ¸›
¡âº€›îÀ–± €ÚÄ XÈ` ÝŒ
¢âº€ŽÎ€áë €„¯_XÈ`À¤ÿ
£âº€Æ†<C386>€åšw €”ëÜXÈ`À¶üš

146
data/DB_GameCoinPool.json
View File

@ -860,78 +860,70 @@
},
{
"Id": 3010001,
"InitValue": 6000000,
"LowerLimit": 5000000,
"UpperLimit": 20000000,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"CtrlRate": 200,
"InitNovicValue": 6500000
"InitNovicValue": 65000000
},
{
"Id": 3010002,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
"InitNovicValue": 650000000
},
{
"Id": 3010003,
"InitValue": 300000000,
"LowerLimit": 250000000,
"UpperLimit": 1000000000,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 325000000
"InitNovicValue": 3250000000
},
{
"Id": 3010004,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
"InitNovicValue": 6500000000
},
{
"Id": 3020001,
"InitValue": 6000000,
"LowerLimit": 5000000,
"UpperLimit": 20000000,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"CtrlRate": 200,
"InitNovicValue": 6500000
"InitNovicValue": 65000000
},
{
"Id": 3020002,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
"InitNovicValue": 650000000
},
{
"Id": 3020003,
"InitValue": 300000000,
"LowerLimit": 250000000,
"UpperLimit": 1000000000,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 325000000
"InitNovicValue": 3250000000
},
{
"Id": 3020004,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
"InitNovicValue": 6500000000
},
{
"Id": 3030001,
"InitValue": 6000000,
"LowerLimit": 5000000,
"UpperLimit": 20000000,
"CtrlRate": 200,
"InitNovicValue": 6500000
},
{
"Id": 3030002,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
@ -939,68 +931,76 @@
"InitNovicValue": 65000000
},
{
"Id": 3030003,
"InitValue": 300000000,
"LowerLimit": 250000000,
"UpperLimit": 1000000000,
"Id": 3030002,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 325000000
"InitNovicValue": 650000000
},
{
"Id": 3030003,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 3250000000
},
{
"Id": 3030004,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
"InitNovicValue": 6500000000
},
{
"Id": 3040001,
"InitValue": 6000000,
"LowerLimit": 5000000,
"UpperLimit": 200000000,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 6500000
"InitNovicValue": 65000000
},
{
"Id": 3040002,
"InitValue": 300000000,
"LowerLimit": 250000000,
"UpperLimit": 1000000000,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 325000000
"InitNovicValue": 3250000000
},
{
"Id": 3040003,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
"InitNovicValue": 6500000000
},
{
"Id": 3050001,
"InitValue": 6000000,
"LowerLimit": 5000000,
"UpperLimit": 200000000,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 6500000
"InitNovicValue": 65000000
},
{
"Id": 3050002,
"InitValue": 300000000,
"LowerLimit": 250000000,
"UpperLimit": 1000000000,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 325000000
"InitNovicValue": 3250000000
},
{
"Id": 3050003,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
"InitNovicValue": 6500000000
},
{
"Id": 3060001,

6
data/DB_PropExchange.dat
View File

@ -1,5 +1,5 @@
6Ó†Ô†Õ†Ö†׆"¡<>À„=
.и<EFBFBD>й<>к<>л<EFBFBD>"Ё<>Р<>=
Wд<EFBFBD>е<>ж<>з<>л<>г<>и<>й<>к<EFBFBD>" Ё<><10>­т
]м<EFBFBD>д<>ж<>з<>и<>л<>г<>е<>й<>к<EFBFBD>"Ђ<>є
.к<EFBFBD>л<>и<>й<EFBFBD>"Ё<>Р<>=
Wж<EFBFBD>й<>к<>л<>г<>д<>е<>з<>и<EFBFBD>" Ё<><10>­т
]з<EFBFBD>м<>ж<>и<>й<>к<>л<>г<>д<>е<EFBFBD>"Ђ<>є

BIN
data/DB_Task.dat
View File

Binary file not shown.

15
gamesrv/base/coinpoolmanager.go
View File

@ -449,15 +449,16 @@ func (this *CoinPoolManager) ResetCoinPool(wgRcp *server.WGResetCoinPool) {
if setting, exist := this.CoinPoolSetting[key]; exist {
switch wgRcp.GetPoolType() {
case 1: //水池
value := int64(wgRcp.GetValue())
value := wgRcp.GetValue()
if value == -1 {
initValue := setting.GetInitValue()
if initValue != 0 { //初始化水池
value = int64(initValue)
value = initValue
}
}
this.CoinPool.Store(key, value)
logger.Logger.Infof("$$$$$$$$金币池 %v 重置金币 %v.$$$$$$$$", key, value)
case 2: //营收池
value := int64(wgRcp.GetValue())
if value == -1 {
@ -482,6 +483,16 @@ func (this *CoinPoolManager) ResetCoinPool(wgRcp *server.WGResetCoinPool) {
}
this.ProfitPool.Store(key, value)
logger.Logger.Infof("$$$$$$$$营收池 %v 重置金币 %v.$$$$$$$$", key, value)
case 8: // 新手池
value := wgRcp.GetValue()
if value == -1 {
initValue := setting.GetInitNoviceValue()
if initValue != 0 { //初始化水池
value = initValue
}
}
this.NoviceCoinPool.Store(key, value)
logger.Logger.Infof("$$$$$$$$新手金币池 %v 重置金币 %v.$$$$$$$$", key, value)
}
}
}

14
model/rank.go
View File

@ -235,20 +235,6 @@ type FindPlayerLevelReply struct {
List *PlayerLevelInfo
}
func FindPlayerLevel(args *FindPlayerLevelArgs) (*FindPlayerLevelReply, error) {
if rpcCli == nil {
logger.Logger.Error("model.FindPlayerLevel rpcCli == nil")
return nil, nil
}
ret := new(FindPlayerLevelReply)
err := rpcCli.CallWithTimeout("GamePlayerListSvc.FindPlayerLevel", args, ret, time.Second*30)
if err != nil {
logger.Logger.Error("FindPlayerLevel error:", err)
return ret, err
}
return ret, nil
}
func FindPlayerLevelList(args *FindPlayerLevelListArgs) (*FindPlayerLevelListReply, error) {
if rpcCli == nil {
logger.Logger.Error("model.FindPlayerLevelList rpcCli == nil")

34
ranksrv/action_gatesrv.go
View File

@ -420,7 +420,7 @@ func CSPlayerLevelRank(s *netlib.Session, d *rankproto.GateTransmit, packetId in
Name: v.Name,
Level: v.Level,
ModId: v.ModId,
Rank: i,
Rank: i + start,
}
ranks = append(ranks, r)
i++
@ -443,37 +443,7 @@ func CSPlayerLevelRank(s *netlib.Session, d *rankproto.GateTransmit, packetId in
}
}
}
if me == nil {
var err error
var ret *model.FindPlayerLevelReply
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
startTs, endTs := rank.StartEndTs()
ret, err = model.FindPlayerLevel(&model.FindPlayerLevelArgs{
Platform: d.Platform,
StartTs: startTs,
EndTs: endTs,
SnId: d.Snid,
})
if err != nil {
logger.Logger.Errorf("FindWinCoinTienlen error: %v", err)
}
return nil
}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
if err == nil && ret.List != nil {
me = &rankproto.PlayerLevelRankInfo{
SnId: ret.List.SnId,
Name: ret.List.Name,
Rank: -1,
Level: ret.List.Level,
ModId: ret.List.ModId,
}
}
send()
})).Start()
} else {
send()
}
send()
})
return nil
}

6
worldsrv/player.go
View File

@ -4652,7 +4652,11 @@ func (this *Player) AddItemRecExpireTime(itemId int32, num, add int64, gainWay i
if this.ItemRecExpireTime == 0 {
this.ItemRecExpireTime = time.Now().Unix() + int64(itemData.Time)*3600*num
} else {
this.ItemRecExpireTime += int64(itemData.Time) * 3600 * num
if this.ItemRecExpireTime >= time.Now().Unix() {
this.ItemRecExpireTime += int64(itemData.Time) * 3600 * num
} else {
this.ItemRecExpireTime = time.Now().Unix() + int64(itemData.Time)*3600*num
}
}
}

BIN
xlsx/DB_GameCoinPool.xlsx
View File

Binary file not shown.