shell/update_deploy.bat

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

worldsrv/player.go

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