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

Merge branch 'develop' into release

This commit is contained in:
sk 2024-10-08 16:11:40 +08:00
parent 055a15b481 d5332ddb34
commit fadd085e36
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/update_deploy.bat
View File

@ -2,11 +2,11 @@ set deployDir="..\deploy"
xcopy .\data\* %deployDir%\data\ /s /e /y xcopy .\data\* %deployDir%\data\ /s /e /y
for /f "tokens=*" %%a in (programs.txt) do ( for /f "tokens=*" %%a in (shell/programs.txt) do (
xcopy .\%%a\%%a %deployDir% /y xcopy .\%%a\%%a %deployDir% /y
del .\%%a\%%a del .\%%a\%%a
) )
for /f "tokens=*" %%f in (exclude.txt) do ( for /f "tokens=*" %%f in (shell/exclude.txt) do (
if exist "%deployDir%\data\%%f" (del "%deployDir%\data\%%f") if exist "%deployDir%\data\%%f" (del "%deployDir%\data\%%f")
) )

2
worldsrv/player.go
View File

@ -2033,6 +2033,7 @@ func (this *Player) ResetPermit() {
// 清理数据 // 清理数据
bag := BagMgrSingleton.GetBagInfo(this.SnId) bag := BagMgrSingleton.GetBagInfo(this.SnId)
if bag != nil { if bag != nil {
if bag.BagItem[common.ItemIDPermit] != nil {
BagMgrSingleton.AddItems(&model.AddItemParam{ BagMgrSingleton.AddItems(&model.AddItemParam{
Platform: this.Platform, Platform: this.Platform,
SnId: this.SnId, SnId: this.SnId,
@ -2046,6 +2047,7 @@ func (this *Player) ResetPermit() {
Operator: "system", Operator: "system",
Remark: "赛季积分清理", Remark: "赛季积分清理",
}) })
}
if model.GameParamData.PermitInitScore > 0 { if model.GameParamData.PermitInitScore > 0 {
bagInfo := BagMgrSingleton.GetBagInfo(this.SnId) bagInfo := BagMgrSingleton.GetBagInfo(this.SnId)