Merge branch 'develop' into release

shell/update_deploy.bat

@@ -2,11 +2,11 @@ set deployDir="..\deploy"
 
 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
     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")
 )

worldsrv/player.go

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