Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work/merge5.1.7 h #63

Merged
merged 73 commits into from
Jul 13, 2024
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
60482ac
ゲーム終了時の幽霊化にIsDeadを元に戻す処理を追加
Hyz-sui Mar 15, 2024
bbe0213
Merge pull request #466 from tukasa0001/fix/HaisonAutoMute
Hyz-sui Apr 8, 2024
708e1ef
RpcProtectedMurderPlayer時、他視点へ守護を通知しない
kou-hetare Apr 17, 2024
3ab741c
Merge pull request #475 from tukasa0001/feature/SuppressesGuardianNotice
kou-hetare Apr 17, 2024
25c6b99
Airshipでノーマルスポーンの時SnapToを実行する
kou-hetare Apr 19, 2024
9af6a72
Merge pull request #476 from tukasa0001/fix/AirshipNormalSpawn
kou-hetare Apr 19, 2024
9b2812c
Desyncベントキャンセルが出来なくなっていたため、処理変更
kou-hetare Apr 22, 2024
96849fd
Merge pull request #478 from tukasa0001/fix/OnEnterVent
kou-hetare Apr 27, 2024
a32a843
CanUseKillButton例外の排除
kou-hetare May 11, 2024
74991f7
TaskPanelBehaviourのGetCustomRole失敗排除
kou-hetare May 11, 2024
930d932
シェリフ誤爆前に死因を設定するよう変更
kou-hetare May 11, 2024
89956a6
退出失敗時用の新規エラーを追加
Hyz-sui May 12, 2024
be32ead
エラーメッセージの翻訳を追加
Hyz-sui May 12, 2024
3d14a4c
切断のエラー処理を追加
Hyz-sui May 12, 2024
9184bb0
Merge pull request #480 from tukasa0001/fix/SheriffMissFire
kou-hetare May 12, 2024
14564df
ErrorTextに黒色の背景を追加
Hyz-sui May 12, 2024
2437f77
Fix bug - April Fools mode not sync for clients
Tommy-XL Apr 4, 2024
bfedcc5
Merge pull request #482 from tukasa0001/feature/ErrorTextBg
Hyz-sui Jun 17, 2024
00b3b1b
Merge pull request #483 from tukasa0001/fetch/1312
Hyz-sui Jun 17, 2024
e060d3f
Merge pull request #481 from tukasa0001/fix/OnPlayerLeftPostfix
Hyz-sui Jun 17, 2024
2671fb4
Merge pull request #484 from tukasa0001/fix/ReduceExceptionInLobby
kou-hetare Jun 17, 2024
6521efc
PlayerInfo変更の対応
kou-hetare Jun 18, 2024
aeb6c87
Map変更はデフォルトで出来るので削除
kou-hetare Jun 18, 2024
c8fa970
ゲーム内通知の送り先を変更
kou-hetare Jun 19, 2024
2360f1e
GameSettingsがなくなったため削除
kou-hetare Jun 19, 2024
112c2c2
GameOptionsのVer変更
kou-hetare Jun 19, 2024
9bd9fef
PlayerInfo対応
kou-hetare Jun 19, 2024
929a17c
TempDataをEndGameResultに置き換え
kou-hetare Jun 19, 2024
ae72480
SetNameRPCに増えたNetworkedPlayerInfoのNetIdの書き込みを追加
Hyz-sui Jun 20, 2024
201c188
ゲームオプション V07 -> V08
Hyz-sui Jun 20, 2024
7ca8b89
PlayerOutfitの移動に対応
Hyz-sui Jun 20, 2024
cc93fb1
旧SetRoleがコルーチンとなったCoSetRoleへ移行
Hyz-sui Jun 20, 2024
22cbccb
RpcSetTasksのパッチを修復
Hyz-sui Jun 20, 2024
76f7889
名前変更に追従 RoleOptionSetting#TitleText -> titleText
Hyz-sui Jun 20, 2024
fa65258
バージョン表示を右上へ移動
Hyz-sui Jun 22, 2024
027b889
ロビーのUIを調整
Hyz-sui Jun 22, 2024
1289ba1
ゲーム設定UIを新UIに追従して調整
Hyz-sui Jun 22, 2024
f9316a6
守護天使の無効化を修復
Hyz-sui Jun 23, 2024
35c877e
ChangeTabでTOHタブを隠す処理をPrefixに変更
Hyz-sui Jun 23, 2024
5bec8a9
SetRoleのcanOverride追加漏れ
kou-hetare Jun 24, 2024
10ace44
役職スポーン確率オプションの専用クラスを作成
Hyz-sui Jun 27, 2024
5effb49
役職出現率オプションの作成を新クラスを使ったものに変更
Hyz-sui Jun 27, 2024
2b1503a
ロールオプションの背景色をロール色に,文字色を無職にそれぞれ変更
Hyz-sui Jun 27, 2024
02d50f5
名前の衝突を避けるためOptionItemフォルダをOptionItemsに改名
Hyz-sui Jun 27, 2024
24f94af
余計な空行を削除
Hyz-sui Jun 27, 2024
ddf42e2
メインオプションカテゴリのアイコンを円形のボタンに合うように変更
Hyz-sui Jun 27, 2024
baab7a0
Merge pull request #486 from tukasa0001/feature/NewMainOptionButton
Hyz-sui Jun 28, 2024
07c7674
カスタムロールに新バニラロールを追加
Hyz-sui Jun 29, 2024
8a7ba95
新バニラロールのラッパーを作成
Hyz-sui Jun 29, 2024
8c29802
必要な箇所にバニラロールの分岐を追加
Hyz-sui Jun 29, 2024
497b611
バニラロールの翻訳を追加
Hyz-sui Jun 29, 2024
521cc83
役職設定タイトルの着色を削除
Hyz-sui Jun 29, 2024
a950621
デバッグモード時以外はファントムを無効化
Hyz-sui Jun 29, 2024
f85120c
Merge pull request #485 from tukasa0001/feature/RoleOptionColor
Hyz-sui Jun 29, 2024
5de64db
Merge pull request #487 from tukasa0001/fix/Support20240618-VanillaRoles
Hyz-sui Jun 29, 2024
9bdcf89
Merge pull request #488 from tukasa0001/fix/Support20240618-DisablePh…
Hyz-sui Jun 29, 2024
65fb3f7
プレリリースかどうかのプロパティを作成
Hyz-sui Jun 29, 2024
e949fdf
プレリリースであることを示す表示を追加
Hyz-sui Jun 29, 2024
2e6df0b
カモフラージュのRPCの増えた引数を追加
Hyz-sui Jun 29, 2024
c7e4819
Merge branch 'fix/Support20240618' of https://github.com/tukasa0001/T…
Hyz-sui Jun 29, 2024
c325151
Merge pull request #489 from tukasa0001/feature/Prerelease
Hyz-sui Jun 30, 2024
3eb722c
サポートアモアスバージョンを2024.6.18へ変更
Hyz-sui Jun 30, 2024
b287d5f
readmeのアモアスバージョンを2024.6.18に変更
Hyz-sui Jun 30, 2024
5e94ecb
Merge pull request #490 from tukasa0001/fix/Support20240618
Hyz-sui Jun 30, 2024
60c8511
エラーメッセージの翻訳の表現を調整
Hyz-sui Jun 30, 2024
f733b3f
右上のテキストのzを調整
Hyz-sui Jun 30, 2024
5beb111
バージョンを5.1.7に変更
Hyz-sui Jun 30, 2024
0c76cba
Merge pull request #494 from tukasa0001/change/ErrorMsgTranslation
Hyz-sui Jul 1, 2024
3071410
Merge pull request #493 from tukasa0001/fix/PingCredentialPos
Hyz-sui Jul 1, 2024
7356a02
Merge pull request #492 from tukasa0001/verUp/5.1.7
Hyz-sui Jul 3, 2024
056e237
Merge pull request #491 from tukasa0001/doc/Readme5.1.7
Hyz-sui Jul 3, 2024
fce8043
Merge pull request #1318 from tukasa0001/develop-5.1.7
yurinakira Jul 10, 2024
321f83a
Merge branch 'main' into work/Merge5.1.7H
Hyz-sui Jul 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PlayerInfo対応
kou-hetare committed Jun 19, 2024
commit 9bd9fef96e5ca9e964e1634d533301f16f229f77
25 changes: 14 additions & 11 deletions Modules/AntiBlackout.cs
Original file line number Diff line number Diff line change
@@ -59,23 +59,26 @@ public static void RestoreIsDead(bool doSend = true, [CallerMemberName] string c
public static void SendGameData([CallerMemberName] string callerMethodName = "")
{
logger.Info($"SendGameData is called from {callerMethodName}");
MessageWriter writer = MessageWriter.Get(SendOption.Reliable);
// 書き込み {}は読みやすさのためです。
writer.StartMessage(5); //0x05 GameData
foreach (var playerinfo in GameData.Instance.AllPlayers)
{
writer.Write(AmongUsClient.Instance.GameId);
writer.StartMessage(1); //0x01 Data
MessageWriter writer = MessageWriter.Get(SendOption.Reliable);
// 書き込み {}は読みやすさのためです。
writer.StartMessage(5); //0x05 GameData
{
writer.WritePacked(GameData.Instance.NetId);
GameData.Instance.Serialize(writer, true);
writer.Write(AmongUsClient.Instance.GameId);
writer.StartMessage(1); //0x01 Data
{
writer.WritePacked(playerinfo.NetId);
playerinfo.Serialize(writer, true);

}
writer.EndMessage();
}
writer.EndMessage();
}
writer.EndMessage();

AmongUsClient.Instance.SendOrDisconnect(writer);
writer.Recycle();
AmongUsClient.Instance.SendOrDisconnect(writer);
writer.Recycle();
}
}
public static void OnDisconnect(NetworkedPlayerInfo player)
{
2 changes: 1 addition & 1 deletion Patches/CheckGameEndPatch.cs
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ void SetGhostRole(bool ToGhostImpostor)
// 蘇生
playerInfo.IsDead = false;
// 送信
GameData.Instance.SetDirtyBit(0b_1u << playerId);
playerInfo.MarkDirty();
AmongUsClient.Instance.SendAllStreamedObjects();
}
// ゲーム終了を確実に最後に届けるための遅延
2 changes: 1 addition & 1 deletion Roles/AddOns/Crewmate/Workhorse.cs
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ public static bool OnCompleteTask(PlayerControl pc)
if (AmongUsClient.Instance.AmHost)
{
Add(pc.PlayerId);
GameData.Instance.RpcSetTasks(pc.PlayerId, Array.Empty<byte>()); //タスクを再配布
pc.Data.RpcSetTasks(Array.Empty<byte>()); //タスクを再配布
pc.SyncSettings();
Utils.NotifyRoles();
}
2 changes: 1 addition & 1 deletion Roles/Impostor/Penguin.cs
Original file line number Diff line number Diff line change
@@ -199,7 +199,7 @@ public override void OnFixedUpdate(PlayerControl player)
{
// 先にIsDeadをtrueにする(はしごチェイス封じ)
AbductVictim.Data.IsDead = true;
GameData.Instance.SetDirty();
AbductVictim.Data.MarkDirty();
// ペンギン自身がはしご上にいる場合,はしごを降りてからキルする
if (!AbductVictim.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
{