Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

build.bat

@@ -1,7 +1,5 @@
 @echo off
 
-call shell/build.bat
+for /f %%i in (programs.txt) do (
-
+    start "%%i" cmd /c "build_sub.bat %%i"
-if %errorcode% neq 0 (
-    pause
 )

build_linux.bat

@@ -2,10 +2,4 @@ set CGO_ENABLED=0
 set GOOS=linux
 set GOARCH=amd64
 
-@echo off
+call build.bat
-
-call shell/build.bat
-
-if %errorcode% neq 0 (
-    pause
-)

build_sub.bat

@@ -1,10 +1,11 @@
+@echo off
+
 cd %1
-echo ========= Build %1 =========
 go fmt
 go vet
 go build -v
+
 if %errorlevel% neq 0 (
     echo Build failed %1.
-    set errorcode=1
+    pause
-)
+)
-cd ..

clean.bat

@@ -1,6 +1,6 @@
 @echo off
 
-for /f "tokens=*" %%a in (shell/programs.txt) do (
+for /f "tokens=*" %%a in (programs.txt) do (
     if exist "%%a\*.log" del /q "%%a\*.log"
     if exist "%%a\*.log.*" del /q "%%a\*.log.*"
 

close.bat

@@ -1,6 +1,6 @@
 @echo off
 
-for /f %%i in (shell/programs.txt) do (
+for /f %%i in (programs.txt) do (
     taskkill /F /IM %%i.exe
 )
 

deploy.bat

@@ -1,36 +0,0 @@
-@echo off
-set work_path=%cd%
-git checkout develop
-
-call shell/gen_data.bat
-
-call shell/gen_go.bat
-
-call shell/update_public.bat
-
-git add .
-git commit -m "update develop"
-
-git checkout release
-
-git merge develop
-
-git add .
-git reset public
-git commit -m "update release"
-
-set CGO_ENABLED=0
-set GOOS=linux
-set GOARCH=amd64
-go env -w GO111MODULE=off
-call shell/build.bat
-
-rem copy
-cd %work_path%
-call shell/update_deploy.bat
-
-git checkout develop
-pause
-
-
-

gamesrv/fortuneox/scenepolicy_fortuneox.go

@@ -406,7 +406,10 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player,
 				var data assemble.GameEnd
 				if err == nil {
 					data = assemble.DataToCli(Response).(assemble.GameEnd)
-					respinStatus := data.Results[0].ArrSpins[0].Special.(SpinLock).ReSpinStatus
+					var respinStatus int
+					if data.Results[0].ArrSpins[0].Special != nil {
+						respinStatus = data.Results[0].ArrSpins[0].Special.(SpinLock).ReSpinStatus
+					}
 					if respinStatus == 0 || respinStatus == 1 {
 						//第一次触发或者正常模式
 						//logger.Logger.Trace("=============addcoin1111  ", -data.TotalBet)

gen_data.bat

@@ -10,7 +10,7 @@ go build
 xlsx2proto.exe
 
 cd ../../
-%protoc% --proto_path=./protocol/server --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=../../ pbdata.proto
+%protoc% --proto_path=. --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=../../ protocol/server/pbdata.proto
 
 cd ./tools/xlsx2binary
 go build

protocol/webapi/webapi.pb.go

@@ -101,6 +101,7 @@ func (TagCode) EnumDescriptor() ([]byte, []int) {
 	return file_protocol_webapi_webapi_proto_rawDescGZIP(), []int{0}
 }
 
+// 保持和 shop.proto 中的 OpResultCode 一样
 type ExchangeCreateCode int32
 
 const (

shell/build.bat

@@ -1,7 +0,0 @@
-@echo off
-
-for /f %%i in (shell/programs.txt) do (
-    call shell/build_sub.bat %%i
-)
-
-echo "build complete!"

startup.bat

@@ -2,7 +2,7 @@ set GODEBUG=gctrace=1
 @echo off
 setlocal enabledelayedexpansion
 
-for /f "tokens=*" %%a in (shell/programs.txt) do (
+for /f "tokens=*" %%a in (programs.txt) do (
     set program=%%a/%%a.exe
 
     if exist "!program!" (

update_deploy.bat

@@ -4,12 +4,12 @@ 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")
 )