Skip to content

Commit

Permalink
优化+合并LTS的更改
Browse files Browse the repository at this point in the history
  • Loading branch information
mxyx0412 committed Oct 23, 2024
1 parent 0eaa4b8 commit 43b356a
Show file tree
Hide file tree
Showing 32 changed files with 541 additions and 374 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
dotnet_diagnostic.IDE0007.severity = silent
dotnet_diagnostic.IDE0022.severity = silent
dotnet_diagnostic.IDE0023.severity = silent
dotnet_diagnostic.IDE0028.severity = silent
dotnet_diagnostic.IDE0028.severity = none
dotnet_diagnostic.IDE0031.severity = silent
dotnet_diagnostic.IDE0046.severity = silent
dotnet_diagnostic.IDE0061.severity = silent
Expand Down
20 changes: 16 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

| 游戏版本 | 模组版本 | 发布日期 | 链接 |
| ------------------- | -------- | --------- | ------------------------------------------------------------ |
| 2024.8.13 ~ 2024.10.29 | v2.0.0.0 | - | [下载](https://github.com/mxyx-club/TheOtherUs-Edited/releases/download/v2.0.0.0/TheOtherUs.zip) |
| 2024.3.5 ~ 2024.6.4 | v1.0.8.6 | 2024.10.18 | [下载](https://github.com/mxyx-club/TheOtherUs-Edited/releases/download/v1.0.8.6/TheOtherUs.zip) |
| 2024.3.5 ~ 2024.6.4 | v1.0.7.7 | 2024.9.16 | [下载](https://github.com/mxyx-club/TheOtherUs-Edited/releases/download/v1.0.7.7/TheOtherUs.zip) |
| 2024.3.5 ~ 2024.6.4 | v1.0.7.6 | 2024.9.14 | [下载](https://github.com/mxyx-club/TheOtherUs-Edited/releases/download/v1.0.7.6/TheOtherUs.zip) |
| 2024.3.5 ~ 2024.6.4 | v1.0.7.2 | 2024.9.6 | [下载](https://github.com/mxyx-club/TheOtherUs-Edited/releases/download/v1.0.7.2/TheOtherUs.zip) |
Expand All @@ -34,6 +36,20 @@

## 更新日志

## v1.0.8.6:

* 重新添加自动更新
* 更新BepinEx依赖至be.697
* 新增船员职业:大神官
* 添加对本地帽子的支持(请在模组设置中查看)
* 修复色盲文本会被强制显示、变色龙在部分情况不会隐藏色盲文字的问题
* 优化随机出生
* 修复邪恶的设陷师击杀cd
* 可以使用F11键位控制游戏分辨率大小
* 添加 "最小/最大 独立阵营杀手数" 调整选项,如果这两项都是随机,则使用原先的概率分配。

<details>
<summary>点我查看更多更新日志</summary>

### v1.0.7.7:

Expand Down Expand Up @@ -66,10 +82,6 @@
- 追踪者:玩家箭头将以该玩家的颜色显示
- 巴甫洛夫:删除选项 “会议后重置自杀时限” ,默认开启

<details>
<summary>点我查看更多更新日志</summary>


### v1.0.7.2:

- #### 新增内容:
Expand Down
Binary file modified Strings.xlsx
Binary file not shown.
3 changes: 0 additions & 3 deletions TheOtherRoles.sln
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Beta|Any CPU = Beta|Any CPU
Debug|Any CPU = Debug|Any CPU
mxyx-club|Any CPU = mxyx-club|Any CPU
Release|Any CPU = Release|Any CPU
Sunday|Any CPU = Sunday|Any CPU
EndGlobalSection
Expand All @@ -26,8 +25,6 @@ Global
{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Beta|Any CPU.Build.0 = Beta|Any CPU
{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Debug|Any CPU.Build.0 = Release|Any CPU
{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.mxyx-club|Any CPU.ActiveCfg = mxyx-club|Any CPU
{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.mxyx-club|Any CPU.Build.0 = mxyx-club|Any CPU
{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Release|Any CPU.Build.0 = Release|Any CPU
{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Sunday|Any CPU.ActiveCfg = Sunday|Any CPU
Expand Down
7 changes: 6 additions & 1 deletion TheOtherRoles/Buttons/Buttons.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3462,6 +3462,7 @@ public static void createButtonsPostfix(HudManager __instance)
//set location
Jumper.jumpLocation = PlayerControl.LocalPlayer.transform.localPosition;
jumperMarkButton.Timer = jumperMarkButton.MaxTimer;
//jumperJumpButton.Timer = jumperMarkButton.MaxTimer;
},
() =>
{
Expand Down Expand Up @@ -3493,7 +3494,9 @@ public static void createButtonsPostfix(HudManager __instance)
//teleport to location if you have one
PlayerControl.LocalPlayer.NetTransform.RpcSnapTo(Jumper.jumpLocation);
Jumper.Charges--;
if (Jumper.Charges > 0) jumperJumpButton.Timer = jumperJumpButton.MaxTimer;

jumperJumpButton.Timer = jumperJumpButton.MaxTimer;
//jumperMarkButton.Timer = jumperJumpButton.MaxTimer;
},
() =>
{
Expand Down Expand Up @@ -3523,6 +3526,7 @@ public static void createButtonsPostfix(HudManager __instance)
//set location
Escapist.escapeLocation = PlayerControl.LocalPlayer.transform.localPosition;
escapistMarkButton.Timer = escapistMarkButton.MaxTimer;
//escapistEscapeButton.Timer = escapistMarkButton.MaxTimer;
},
() =>
{
Expand Down Expand Up @@ -3552,6 +3556,7 @@ public static void createButtonsPostfix(HudManager __instance)
//set location
PlayerControl.LocalPlayer.NetTransform.RpcSnapTo(Escapist.escapeLocation);
escapistEscapeButton.Timer = escapistEscapeButton.MaxTimer;
//escapistMarkButton.Timer = escapistEscapeButton.MaxTimer;
},
() =>
{
Expand Down
5 changes: 1 addition & 4 deletions TheOtherRoles/CustomCosmetics/CustomHats/CustomHatManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,7 @@ internal static HatData CreateHatBehaviour(CustomHatConfig ch, bool testOnly = f
hat.NoBounce = !ch.Bounce;
hat.ChipOffset = new Vector2(0f, 0.2f);
hat.Free = true;
#if MXYX_CLUB
if (ch.Adaptive && cachedShader != null)
viewData.AltShader = cachedShader;
#endif

var extend = new HatExtension
{
Author = ch.Author ?? "Unknown",
Expand Down
236 changes: 0 additions & 236 deletions TheOtherRoles/CustomCosmetics/CustomHats/Patches/HatParentPatche.cs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#if !MXYX_CLUB
using System;
using System;
using System.IO;
using System.Linq;
using PowerTools;
Expand Down Expand Up @@ -243,5 +242,4 @@ private static bool SetCustomHat(HatParent hatParent)

return false;
}
}
#endif
}
Loading

0 comments on commit 43b356a

Please sign in to comment.