From c3ff0dc8effa3c6800610cacfdf322de94725171 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Fri, 8 Nov 2024 10:40:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/action_server.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/worldsrv/action_server.go b/worldsrv/action_server.go index f62a53b..b169f39 100644 --- a/worldsrv/action_server.go +++ b/worldsrv/action_server.go @@ -117,14 +117,14 @@ func init() { } } //更新玩家等级排行榜 - mq.Write(&model.PlayerLevelInfo{ - SnId: p.SnId, - Name: p.Name, - Level: p.Level, - Exp: p.Exp, - ModId: p.PlayerData.GetRoleId(), - Platform: p.Platform, - }) + //mq.Write(&model.PlayerLevelInfo{ + // SnId: p.SnId, + // Name: p.Name, + // Level: p.Level, + // Exp: p.Exp, + // ModId: p.PlayerData.GetRoleId(), + // Platform: p.Platform, + //}) //比赛场不处理下面的内容 if !scene.IsMatchScene() && !scene.IsCustom() { // 破产检测 From 8fd017f1b06019d9aeb5840d4f5e8415a7d3c673 Mon Sep 17 00:00:00 2001 From: tomas Date: Fri, 8 Nov 2024 10:40:38 +0800 Subject: [PATCH 2/6] freespin sts fix --- gamesrv/fortunedragon/scenepolicy_fortunedragon.go | 5 +++++ gamesrv/slotspkg/assemble/datatocli.go | 1 + gamesrv/slotspkg/assemble/difgame.go | 1 + gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go | 8 ++++++++ gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go | 1 + gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go | 8 ++++++++ 6 files changed, 24 insertions(+) diff --git a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go index 1877f77..d21a993 100644 --- a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go +++ b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go @@ -393,6 +393,7 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play playerEx.BetMode = params[3] //playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunedragon.NowByte) + //logger.Logger.Trace("=====================init===== playerEx.Coin===", playerEx.Coin) //get data Response, err := slots.SlotsMgrSington.Play(playerEx.SlotsSession, &base.SpinReq{ @@ -408,6 +409,7 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play if err == nil { data = assemble.DataToCli(Response).(assemble.GameEnd) if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { + //logger.Logger.Trace("=====================AddCoin=====TotalBet===", -data.TotalBet) //第一次触发或者正常模式 playerEx.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName()) playerEx.totalBet = int64(data.TotalBet) @@ -429,6 +431,7 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play gameEndStr = string(pi) if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 { + //logger.Logger.Trace("=====================AddCoin=====RoundReward===", data.RoundReward) playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName()) //免费游戏结束或者正常模式 sceneEx.StaticsLaba(&base.StaticLabaParam{ @@ -448,6 +451,8 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play } playerEx.SlotsSession.SetCoin(int64(data.FinalCoin) * fortunedragon.NowByte) + //logger.Logger.Trace("=====================end===== playerEx.Coin===", playerEx.Coin) + //logger.Logger.Trace("=====================end===== data.FinalCoin===", data.FinalCoin) pack := &protocol.SCFortuneDragonBilled{ OpRetCode: proto.Int32(0), diff --git a/gamesrv/slotspkg/assemble/datatocli.go b/gamesrv/slotspkg/assemble/datatocli.go index fa3bc95..cd915f4 100644 --- a/gamesrv/slotspkg/assemble/datatocli.go +++ b/gamesrv/slotspkg/assemble/datatocli.go @@ -103,6 +103,7 @@ func response2NodeTree(NodeTree *shared.LiteNodeTree) *shared.Result { res.TotalRewardBase = ass[0].LineReward ///line_win res.TotalReward = ass[0].Reward ///total_win + res.FreeStatus = customFortune.FreeStatus res.FreeNumTrigger = customFortune.FreeNumTrigger res.FreeNumMax = customFortune.FreeNumMax res.FreeNum = customFortune.FreeSpinNum diff --git a/gamesrv/slotspkg/assemble/difgame.go b/gamesrv/slotspkg/assemble/difgame.go index fc874fc..721eec1 100644 --- a/gamesrv/slotspkg/assemble/difgame.go +++ b/gamesrv/slotspkg/assemble/difgame.go @@ -7,6 +7,7 @@ import ( ) type CustomFortune struct { + FreeStatus int `json:"fss"` //free状态 FreeSpinNum int64 `json:"fsn"` //剩余freespin FreeNumMax int64 `json:"fnm"` //总次数 FreeNumTrigger int64 `json:"fnt"` //新增freespin diff --git a/gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go b/gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go index 3b830c8..c2db338 100644 --- a/gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go +++ b/gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go @@ -17,6 +17,7 @@ func (p *PluginSpecial) Theme() string { // Special type Special struct { + FreeStatus int `json:"fss,omitempty"` //free状态 FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin FreeNumMax int64 `json:"fnm,omitempty"` //总次数 FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin @@ -39,5 +40,12 @@ func (p *PluginSpecial) AfterSpin(m intf.Master) { sp.FreeSpinNum = Fortune.FreeSpinNum sp.FreeNumMax = Fortune.FreeNumMax sp.FreeNumTrigger = Fortune.FreeNumTrigger + if Fortune.FreeNumTrigger > 0 { + sp.FreeStatus = 1 + } else if Fortune.FreeSpinNum == 0 { + sp.FreeStatus = 3 + } else { + sp.FreeStatus = 0 + } } } diff --git a/gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go b/gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go index 4f162f7..01ab40e 100644 --- a/gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go +++ b/gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go @@ -9,6 +9,7 @@ const ( ) type CustomFortune struct { + FreeStatus int `json:"fss"` FreeSpinNum int64 `json:"fsn"` //剩余freespin FreeNumMax int64 `json:"fnm"` //总次数 FreeNumTrigger int64 `json:"fnt"` //新增freespin diff --git a/gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go b/gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go index 20b810b..7c0b1cd 100644 --- a/gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go +++ b/gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go @@ -17,6 +17,7 @@ func (p *PluginSpecial) Theme() string { // Special type Special struct { + FreeStatus int `json:"fss,omitempty"` //free状态 FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin FreeNumMax int64 `json:"fnm,omitempty"` //总次数 FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin @@ -50,5 +51,12 @@ func (p *PluginSpecial) AfterSpin(m intf.Master) { sp.FreeSpinNum = Fortune.FreeSpinNum sp.FreeNumMax = Fortune.FreeNumMax sp.FreeNumTrigger = Fortune.FreeNumTrigger + if Fortune.FreeNumTrigger > 0 { + sp.FreeStatus = 1 + } else if Fortune.FreeSpinNum == 0 { + sp.FreeStatus = 3 + } else { + sp.FreeStatus = 0 + } } } From bab26915f2e390e69cadd1916caae5fda64773eb Mon Sep 17 00:00:00 2001 From: tomas Date: Fri, 8 Nov 2024 10:44:37 +0800 Subject: [PATCH 3/6] ox fix --- gamesrv/fortuneox/scenepolicy_fortuneox.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gamesrv/fortuneox/scenepolicy_fortuneox.go b/gamesrv/fortuneox/scenepolicy_fortuneox.go index a73b222..b219411 100644 --- a/gamesrv/fortuneox/scenepolicy_fortuneox.go +++ b/gamesrv/fortuneox/scenepolicy_fortuneox.go @@ -406,7 +406,8 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player, var data assemble.GameEnd if err == nil { data = assemble.DataToCli(Response).(assemble.GameEnd) - if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { + respinStatus := data.Results[0].ArrSpins[0].Special.(SpinLock).ReSpinStatus + if respinStatus == 0 || respinStatus == 1 { //第一次触发或者正常模式 //logger.Logger.Trace("=============addcoin1111 ", -data.TotalBet) playerEx.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName()) @@ -428,7 +429,6 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player, } pi, _ := json.Marshal(data) gameEndStr = string(pi) - respinStatus := data.Results[0].ArrSpins[0].Special.(SpinLock).ReSpinStatus if respinStatus == 0 || respinStatus == 3 { //logger.Logger.Trace("===win==========addcoin222 ", data.RoundReward) playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName()) From 211cd3dfccc448d3e6b8e4824acb33309c3669ac Mon Sep 17 00:00:00 2001 From: tomas Date: Fri, 8 Nov 2024 11:26:50 +0800 Subject: [PATCH 4/6] respin fix val --- gamesrv/fortuneox/scenepolicy_fortuneox.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gamesrv/fortuneox/scenepolicy_fortuneox.go b/gamesrv/fortuneox/scenepolicy_fortuneox.go index b219411..35f4165 100644 --- a/gamesrv/fortuneox/scenepolicy_fortuneox.go +++ b/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) From 0932715970a6992a92896803a78b5dd20b703085 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Fri, 8 Nov 2024 11:16:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.bat | 6 ++--- build_linux.bat | 8 +----- shell/build_sub.bat => build_sub.bat | 9 ++++--- clean.bat | 2 +- close.bat | 2 +- data/DB_PropExchange.dat | Bin 384 -> 384 bytes data/DB_Task.dat | Bin 5519 -> 5519 bytes deploy.bat | 36 --------------------------- shell/exclude.txt => exclude.txt | 0 gen_data.bat | 2 +- shell/programs.txt => programs.txt | 0 protocol/webapi/webapi.pb.go | 1 + shell/build.bat | 7 ------ startup.bat | 2 +- update_deploy.bat | 4 +-- 15 files changed, 15 insertions(+), 64 deletions(-) rename shell/build_sub.bat => build_sub.bat (57%) delete mode 100644 deploy.bat rename shell/exclude.txt => exclude.txt (100%) rename shell/programs.txt => programs.txt (100%) delete mode 100644 shell/build.bat diff --git a/build.bat b/build.bat index df5c7ff..292476e 100644 --- a/build.bat +++ b/build.bat @@ -1,7 +1,5 @@ @echo off -call shell/build.bat - -if %errorcode% neq 0 ( - pause +for /f %%i in (programs.txt) do ( + start "%%i" cmd /c "build_sub.bat %%i" ) \ No newline at end of file diff --git a/build_linux.bat b/build_linux.bat index 43531c2..70dfd6b 100644 --- a/build_linux.bat +++ b/build_linux.bat @@ -2,10 +2,4 @@ set CGO_ENABLED=0 set GOOS=linux set GOARCH=amd64 -@echo off - -call shell/build.bat - -if %errorcode% neq 0 ( - pause -) +call build.bat diff --git a/shell/build_sub.bat b/build_sub.bat similarity index 57% rename from shell/build_sub.bat rename to build_sub.bat index 919bd76..266357f 100644 --- a/shell/build_sub.bat +++ b/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 -) -cd .. \ No newline at end of file + pause +) \ No newline at end of file diff --git a/clean.bat b/clean.bat index 80e5a52..3749439 100644 --- a/clean.bat +++ b/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.*" diff --git a/close.bat b/close.bat index 25709d5..4b8a912 100644 --- a/close.bat +++ b/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 ) diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index d82a96a50ad2d2990640ca9d15e38e5b3423eb15..804f10646fe2eaa8171cfa2bf4475d6bf342eea8 100644 GIT binary patch literal 384 zcmd-w<6snElw#w!*2WB`uS4m}Q2Gj#z6zq1I5-yevI!h$vE|a^U;?YZ1(m-IrEfs# zn`r98IUwev+k>JW=nk+wKpJK*y7^#tDRF|`(XjRr3s)=$3)mqrjW7#f2E!bN?je{* a!43sl2(#!8*x~FPi+~>e!py}$TL=JT;yg6~ literal 384 zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUweP%>mj6(+5@uMW Vn8WXY9nQ|N2>2lUsNM7@0QDWD{aUQ?a0zZSo#= z6R0Q?Oy4Y?$&4JPf)G<4EEn>En9Drbox^ Date: Fri, 8 Nov 2024 11:32:36 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9.gitlab-ci.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e529e9..8eb8846 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ build-job: echo "编译 $line" go build -v cd .. - done < shell/programs.txt + done < ./programs.txt save-job: stage: save @@ -77,7 +77,7 @@ save-job: do echo "删除 $line 配置" rm ./temp/data/$line - done < ./shell/exclude.txt + done < ./exclude.txt # 拷贝可执行程序 - echo '拷贝可执行程序' - | @@ -85,7 +85,7 @@ save-job: do echo "拷贝 $line" mv ./$line/$line ./temp/$line - done < ./shell/programs.txt + done < ./programs.txt sync_job: stage: sync