Update README.md
Disable ai battle on master branch Clean up dani dojo page a little
This commit is contained in:
parent
13a689b4e2
commit
3782d999f8
88
README.md
88
README.md
@ -27,92 +27,12 @@ This is a server for Taiko no Tatsujin Nijiiro ver 08.18
|
|||||||
|
|
||||||
1. Download [Apache](https://www.apachelounge.com/download/), extract anywhere
|
1. Download [Apache](https://www.apachelounge.com/download/), extract anywhere
|
||||||
|
|
||||||
2. Modify conf/httpd.conf:
|
2. Copy the content in Apache folder to Apache root folder (and replace)
|
||||||
|
|
||||||
```htaccess
|
|
||||||
# example: c:/Apache24
|
|
||||||
Define SRVROOT "full:/path/to/Apache/folder"
|
|
||||||
|
|
||||||
# In loadmodule section, find the following lines and uncomment (remove the # at the beginning), they are by default commented out
|
|
||||||
LoadModule proxy_module modules/mod_proxy.so
|
|
||||||
LoadModule proxy_http_module modules/mod_proxy_http.so
|
|
||||||
LoadModule ssl_module modules/mod_ssl.so
|
|
||||||
LoadModule headers_module modules/mod_headers.so
|
|
||||||
|
|
||||||
# Scroll down to bottom, find this line and uncomment
|
|
||||||
Include conf/extra/httpd-vhosts.conf
|
|
||||||
```
|
|
||||||
|
|
||||||
3. Modify conf/extra/httpd-vhosts.conf, add the following
|
|
||||||
|
|
||||||
```htaccess
|
|
||||||
<VirtualHost *:80>
|
|
||||||
ProxyPreserveHost On
|
|
||||||
ProxyPass / http://127.0.0.1:5000/
|
|
||||||
ProxyPassReverse / http://127.0.0.1:5000/
|
|
||||||
ServerName naominet.jp
|
|
||||||
RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
|
|
||||||
</VirtualHost>
|
|
||||||
|
|
||||||
Listen 10122
|
|
||||||
|
|
||||||
Listen 54430
|
|
||||||
Listen 54431
|
|
||||||
|
|
||||||
<VirtualHost *:10122 *:54430 *:54431>
|
|
||||||
ProxyPreserveHost On
|
|
||||||
ProxyPass / http://127.0.0.1:5000/
|
|
||||||
ProxyPassReverse / http://127.0.0.1:5000/
|
|
||||||
SSLEngine on
|
|
||||||
SSLProtocol all -SSLv3
|
|
||||||
SSLCertificateFile certs/localhost.crt
|
|
||||||
SSLCertificateKeyFile certs/localhost.key
|
|
||||||
ServerName vsapi.taiko-p.jp
|
|
||||||
RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
|
|
||||||
</VirtualHost>
|
|
||||||
```
|
|
||||||
|
|
||||||
4. Modify conf/openssl.cnf, change the start of file to
|
|
||||||
|
|
||||||
```
|
|
||||||
#
|
|
||||||
# OpenSSL example configuration file.
|
|
||||||
# This is mostly being used for generation of certificate requests.
|
|
||||||
#
|
|
||||||
|
|
||||||
# Note that you can include other files from the main configuration
|
|
||||||
# file using the .include directive.
|
|
||||||
#.include filename
|
|
||||||
|
|
||||||
# This definition stops the following lines choking if HOME isn't
|
|
||||||
# defined.
|
|
||||||
HOME = .
|
|
||||||
openssl_conf = default_conf
|
|
||||||
# Extra OBJECT IDENTIFIER info:
|
|
||||||
#oid_file = $ENV::HOME/.oid
|
|
||||||
oid_section = new_oids
|
|
||||||
|
|
||||||
[default_conf]
|
|
||||||
ssl_conf = ssl_sect
|
|
||||||
|
|
||||||
[ssl_sect]
|
|
||||||
system_default = system_default_sect
|
|
||||||
|
|
||||||
[system_default_sect]
|
|
||||||
CipherString = DEFAULT@SECLEVEL=1
|
|
||||||
|
|
||||||
# To use this configuration file with the "-extfile" option of the
|
|
||||||
# "openssl x509" utility, name here the section containing the
|
|
||||||
# X.509v3 extensions to use:
|
|
||||||
# extensions =
|
|
||||||
# (Alternatively, use a configuration file that has only
|
|
||||||
# X.509v3 extensions in its main [= default] section.)
|
|
||||||
```
|
|
||||||
|
|
||||||
5. Copy the cert folder from server release to Apache root folder, then click on the localhost.crt file and import it to trusted root store.
|
|
||||||
|
|
||||||
|
5. Open the certs folder Apache root folder, then click on the localhost.crt file and import it to trusted root store.
|
||||||
|
|
||||||
If everything is correct, run bin/httpd.exe, a command prompt will open (and stay open, if it shut down, probably something is not setup correctly)
|
If everything is correct, run bin/httpd.exe, a command prompt will open (and stay open, if it shut down, probably something is not setup correctly)
|
||||||
|
|
||||||
4. Now run the server, if everything is setup correctly, visit http://localhost:5000, you should be able to see the web ui up and running without errors.
|
4. Now run the server, if everything is setup correctly, visit http://localhost:5000, you should be able to see the web ui up and running without errors.
|
||||||
|
|
||||||
5. Go to game folder, copy the config files (AMConfig.ini and WritableConfig.ini) in the config folder from server release to AMCUS folder and replace the original ones.
|
5. Go to game folder, copy the config files (AMConfig.ini and WritableConfig.ini) in the config folder from server release to AMCUS folder and replace the original ones.
|
||||||
|
@ -36,7 +36,7 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
|
|||||||
{
|
{
|
||||||
Result = 1,
|
Result = 1,
|
||||||
IsDanplay = true,
|
IsDanplay = true,
|
||||||
IsAibattle = true,
|
IsAibattle = false,
|
||||||
IsClose = false,
|
IsClose = false,
|
||||||
DefaultSongFlg = enabledArray,
|
DefaultSongFlg = enabledArray,
|
||||||
AchievementSongBit = enabledArray,
|
AchievementSongBit = enabledArray,
|
||||||
|
@ -31,9 +31,9 @@
|
|||||||
<MudStack Justify="Justify.Center" AlignItems="AlignItems.Center" Spacing="6">
|
<MudStack Justify="Justify.Center" AlignItems="AlignItems.Center" Spacing="6">
|
||||||
@{
|
@{
|
||||||
var danResultState = GetDanResultState(danId);
|
var danResultState = GetDanResultState(danId);
|
||||||
string danClearStateString = GetDanClearStateString(danResultState);
|
var danClearStateString = GetDanClearStateString(danResultState);
|
||||||
}
|
}
|
||||||
<img src=@($"/images/dani_{danResultState.ToString()}.png") style="max-width:150px; width:100%;" />
|
<img src=@($"/images/dani_{danResultState.ToString()}.png") style="max-width:150px; width:100%;" alt="danResultState.ToString()"/>
|
||||||
<MudText Typo="Typo.body1">@danClearStateString</MudText>
|
<MudText Typo="Typo.body1">@danClearStateString</MudText>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudCardContent>
|
</MudCardContent>
|
||||||
@ -262,7 +262,7 @@
|
|||||||
}
|
}
|
||||||
</MudStack>
|
</MudStack>
|
||||||
@{
|
@{
|
||||||
string conditionOperator = ">";
|
var conditionOperator = ">";
|
||||||
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
|
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
|
||||||
{
|
{
|
||||||
conditionOperator = "<";
|
conditionOperator = "<";
|
||||||
@ -359,7 +359,7 @@
|
|||||||
</MudStack>
|
</MudStack>
|
||||||
}
|
}
|
||||||
@{
|
@{
|
||||||
string conditionOperator = ">";
|
var conditionOperator = ">";
|
||||||
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
|
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
|
||||||
{
|
{
|
||||||
conditionOperator = "<";
|
conditionOperator = "<";
|
||||||
|
@ -1,7 +1,4 @@
|
|||||||
using SharedProject.Enums;
|
namespace TaikoWebUI.Pages;
|
||||||
using System.Net.NetworkInformation;
|
|
||||||
|
|
||||||
namespace TaikoWebUI.Pages;
|
|
||||||
|
|
||||||
public partial class DaniDojo
|
public partial class DaniDojo
|
||||||
{
|
{
|
||||||
@ -113,16 +110,14 @@ public partial class DaniDojo
|
|||||||
_ => 0
|
_ => 0
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
return songNumber switch
|
||||||
{
|
{
|
||||||
return songNumber switch
|
0 => data.GoldBorder1,
|
||||||
{
|
1 => data.GoldBorder2,
|
||||||
0 => data.GoldBorder1,
|
2 => data.GoldBorder3,
|
||||||
1 => data.GoldBorder2,
|
_ => 0
|
||||||
2 => data.GoldBorder3,
|
};
|
||||||
_ => 0
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetDanTitle(string title)
|
private static string GetDanTitle(string title)
|
||||||
@ -155,8 +150,8 @@ public partial class DaniDojo
|
|||||||
|
|
||||||
private string GetDanResultIcon(uint danId)
|
private string GetDanResultIcon(uint danId)
|
||||||
{
|
{
|
||||||
var icon = "";
|
string icon;
|
||||||
var notClearIcon = "<image href='/images/dani_NotClear.png' width='24' height='24' style='filter: contrast(0.65)'/>";
|
const string notClearIcon = "<image href='/images/dani_NotClear.png' width='24' height='24' style='filter: contrast(0.65)'/>";
|
||||||
|
|
||||||
if (!bestDataMap.ContainsKey(danId))
|
if (!bestDataMap.ContainsKey(danId))
|
||||||
{
|
{
|
||||||
@ -165,28 +160,14 @@ public partial class DaniDojo
|
|||||||
|
|
||||||
var state = bestDataMap[danId].ClearState;
|
var state = bestDataMap[danId].ClearState;
|
||||||
|
|
||||||
if (state is DanClearState.NotClear)
|
icon = state is DanClearState.NotClear ? notClearIcon : $"<image href='/images/dani_{state}.png' width='24' height='24' />";
|
||||||
{
|
|
||||||
icon = notClearIcon;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
icon = $"<image href='/images/dani_{state}.png' width='24' height='24' />";
|
|
||||||
}
|
|
||||||
|
|
||||||
return icon;
|
return icon;
|
||||||
}
|
}
|
||||||
|
|
||||||
private DanClearState GetDanResultState(uint danId)
|
private DanClearState GetDanResultState(uint danId)
|
||||||
{
|
{
|
||||||
if (bestDataMap.ContainsKey(danId))
|
return bestDataMap.ContainsKey(danId) ? bestDataMap[danId].ClearState : DanClearState.NotClear;
|
||||||
{
|
|
||||||
return bestDataMap[danId].ClearState;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return DanClearState.NotClear;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static uint GetSoulGauge(DanData data, bool isGold)
|
private static uint GetSoulGauge(DanData data, bool isGold)
|
||||||
@ -196,11 +177,6 @@ public partial class DaniDojo
|
|||||||
borders.FirstOrDefault(border => (DanConditionType)border.BorderType == DanConditionType.SoulGauge,
|
borders.FirstOrDefault(border => (DanConditionType)border.BorderType == DanConditionType.SoulGauge,
|
||||||
new DanData.OdaiBorder());
|
new DanData.OdaiBorder());
|
||||||
|
|
||||||
if (isGold)
|
return isGold ? soulBorder.GoldBorderTotal : soulBorder.RedBorderTotal;
|
||||||
{
|
|
||||||
return soulBorder.GoldBorderTotal;
|
|
||||||
}
|
|
||||||
|
|
||||||
return soulBorder.RedBorderTotal;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user