diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 030ab9a..7882a2e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,27 +30,25 @@ jobs: continue-on-error: false run: | dotnet publish -p:PublishProfile=Win64.pubxml - copy ../DataCollection/gamedata.json "HorseIsleServer/bin/x64/Windows/net5.0/win-x64/publish/gamedata.json" - copy ../DataCollection/HI1.MAP "HorseIsleServer/bin/x64/Windows/net5.0/win-x64/publish/HI1.MAP" - mkdir "HorseIsleServer/bin/x64/Windows/net5.0/win-x64/publish/www" - xcopy /E ../WebInterface "HorseIsleServer/bin/x64/Windows/net5.0/win-x64/publish/www" - + copy ..\DataCollection\gamedata.json "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\gamedata.json" /B /Y + copy ..\DataCollection\HI1.MAP "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\HI1.MAP" /B /Y + mkdir "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\www" + xcopy /E ..\WebInterface "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\www" - name: Build win-x86 continue-on-error: false run: | dotnet publish -p:PublishProfile=Win32.pubxml - copy ../DataCollection/gamedata.json "HorseIsleServer/bin/x86/Windows/net5.0/win-x86/publish/gamedata.json" - copy ../DataCollection/HI1.MAP "HorseIsleServer/bin/x86/Windows/net5.0/win-x86/publish/HI1.MAP" - mkdir "HorseIsleServer/bin/x86/Windows/net5.0/win-x86/publish/www" - xcopy /E ../WebInterface "HorseIsleServer/bin/x86/Windows/net5.0/win-x86/publish/www" - - - name: upload win-x64 + copy ..\DataCollection\gamedata.json "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\gamedata.json" /B /Y + copy ..\DataCollection\HI1.MAP "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\HI1.MAP" /B /Y + mkdir "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\www" + xcopy /E ..\WebInterface "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\www" + - name: Upload win-x64 uses: actions/upload-artifact@v2 with: name: win-x64 path: Horse Isle Server\HorseIsleServer\bin/x64\Windows\net5.0\win-x64\publish\ - - name: upload win-x86 + - name: Upload win-x86 uses: actions/upload-artifact@v2 with: name: win-x86 diff --git a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs index 45a359b..8836bb4 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs @@ -144,16 +144,23 @@ namespace HISP.Server } } } + // Tack Shop Giveaway if(totalMinutesElapsed % (60 * 3) == 0) { TackShopGiveawayEvent = new TackShopGiveaway(); TackShopGiveawayEvent.StartEvent(); } + // Real Time Riddle if(totalMinutesElapsed % 30 == 0) { RiddleEvent = RealTimeRiddle.GetRandomRiddle(); RiddleEvent.StartEvent(); } + // Real Time Quiz + if(totalMinutesElapsed % 75 == 0) + { + + } if (totalMinutesElapsed % 60 == 0) {