Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
468ab2b
MessagePipe: Keyless実装
reigithub Jul 1, 2026
922671c
エネミーシステム(仮)
reigithub Jul 1, 2026
5ffd7e9
WeaponMaster
reigithub Jul 1, 2026
45d77a5
NoiseEvent
reigithub Jul 1, 2026
f284e5c
Addressables登録
reigithub Jul 1, 2026
2fa4fdd
プレイヤー参照(仮)
reigithub Jul 1, 2026
ee90d7c
エネミー仮配置
reigithub Jul 1, 2026
f7d9aa8
プレイヤー攻撃アクション(仮)
reigithub Jul 1, 2026
3c48fd5
NavMeshAreas
reigithub Jul 1, 2026
b94d6c2
Convert to URP: unitychan_tile
reigithub Jul 2, 2026
b33f183
Convert to URP: SkySeries
reigithub Jul 2, 2026
b73e560
Convert to URP: Abandoned_Asylum
reigithub Jul 2, 2026
cff2044
InputThreshold
reigithub Jul 2, 2026
d8a32b8
Low Poly Weapons VOL.1
reigithub Jul 2, 2026
764cc0d
IHorrorInventorySlotInfo
reigithub Jul 3, 2026
4eb00be
rename: HorrorInventorySlotView
reigithub Jul 3, 2026
9005290
rename: namespace Game.Horror.Inventory
reigithub Jul 3, 2026
251ad15
不要フィールド削除
reigithub Jul 3, 2026
7a591b4
テストテーブル削除&再構築
reigithub Jul 3, 2026
7e4daa6
武器を拾う→インベントリ格納
reigithub Jul 3, 2026
a4ad5c9
武器アイコン(仮)登録
reigithub Jul 3, 2026
ad206ce
武器を仮配置
reigithub Jul 3, 2026
09a7144
rename: ContextActions
reigithub Jul 3, 2026
462d348
インベントリサブメニュー翻訳追加
reigithub Jul 3, 2026
bc4342c
ContextActionsLocalizer
reigithub Jul 3, 2026
c5ce929
rename影響箇所
reigithub Jul 3, 2026
51cfa1f
インベントリコンテキストメニュー実装
reigithub Jul 3, 2026
7a58cef
Addressables再登録(ContextActions)
reigithub Jul 3, 2026
3e2b2d7
rename: UITexts
reigithub Jul 4, 2026
cc112ab
アドレス修正
reigithub Jul 4, 2026
0056f80
インベントリUI更新
reigithub Jul 4, 2026
12768fc
Equip/Removeアクション追加
reigithub Jul 4, 2026
94c2489
装備ショートカット登録ダイアログ
reigithub Jul 4, 2026
61228f8
HorrorInventoryHelperに差し替え
reigithub Jul 4, 2026
154e8dc
Smokeアイコン
reigithub Jul 4, 2026
85e23df
ショートカット登録入れ替え
reigithub Jul 4, 2026
8ddb99c
Smokeデータ追加
reigithub Jul 4, 2026
f77d688
Smoke仮置き
reigithub Jul 4, 2026
74ed9f3
MultipleSprite
reigithub Jul 4, 2026
61e3486
Addressables登録: HorrorIcons
reigithub Jul 5, 2026
aa00961
Addressables登録: HorrorWeapons
reigithub Jul 5, 2026
8e2ccd5
HorrorIconService
reigithub Jul 5, 2026
d07deb2
マスタデータ更新: 新アイコン
reigithub Jul 5, 2026
bd29a75
新アイコン実装
reigithub Jul 5, 2026
c81d4f1
アセット追加: Modern GDR
reigithub Jul 5, 2026
5c94d76
アセット追加: Navidtbt/GameWeaponIconPack
reigithub Jul 5, 2026
1298a7f
Addressables.Release
reigithub Jul 5, 2026
69e15cc
HorrorWeaponMaster.EquipDuration
reigithub Jul 5, 2026
97b3cb9
武器の装備状態を永続化
reigithub Jul 5, 2026
60f03a5
rename: _ceilingMask
reigithub Jul 5, 2026
c71786a
rename: UpdateMovementWithGravity/UpdateRotation
reigithub Jul 5, 2026
d9ee4a1
装備セーブデータ統合
reigithub Jul 5, 2026
2a79fe7
武器モデルロード実装
reigithub Jul 5, 2026
a989a65
装備スロット切り替えHUD
reigithub Jul 6, 2026
010e2c4
装備スロットレイアウト調整
reigithub Jul 6, 2026
975e9cf
Crouch割り当て変更
reigithub Jul 6, 2026
554237e
Aimアクション追加
reigithub Jul 6, 2026
b963470
Aimパラメータをマスタデータに追加
reigithub Jul 6, 2026
7e81e25
Aim角度調整
reigithub Jul 6, 2026
c75e78e
Aimアクション実装
reigithub Jul 6, 2026
a5c8548
レティクル状態変化
reigithub Jul 6, 2026
82ca09f
ステート外の更新をステート内に統合
reigithub Jul 6, 2026
79aaeef
マスター調整
reigithub Jul 6, 2026
d122da9
エイム中にジャンプ禁止
reigithub Jul 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ MonoBehaviour:
- 43c5ae5b146034d4982d08120334312b
- 1e0ce9587ad9ff24b901b56d8bb3da6f
- 2f8c2378ebe10394aa5550e1e878ed7c
- 087e715e4321b96479088cfd270e9d06
- 16c0acf7ed6610c46af1cd5348f31a40
- b06c77d92a5c53e4e9009f7b2d7f0d33
- 4a51c88ecef48f04aa0f33b64d432b2b
- 75503b5e72d6e184cbf76e980dd5e5dd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ MonoBehaviour:
m_BuildAddressablesWithPlayerBuild: 0
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
m_GroupAssets:
- {fileID: 11400000, guid: 9f8bc5cae3e38eb4885bc6b785384ffe, type: 2}
- {fileID: 11400000, guid: dee35f80b30fc1644b60014d582f7bc2, type: 2}
- {fileID: 11400000, guid: d7c87174db0eb1a4fbfe8e30ee04c624, type: 2}
- {fileID: 11400000, guid: ab25818c07c811644a9939d8e2391b83, type: 2}
- {fileID: 11400000, guid: 1070842e9f16cc646a8f574ecf2320dc, type: 2}
- {fileID: 11400000, guid: 5d5a71a89720b9c4db48f0b902b5c7a0, type: 2}
- {fileID: 11400000, guid: eb36b54ff6dd7fd46a42e6c4f36d346d, type: 2}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,21 @@ MonoBehaviour:
m_GroupName: CleanVectorIcons
m_GUID: 317cfc82a4a899d439fa6c78d3f55f7a
m_SerializeEntries:
- m_GUID: 062eeb9d5e8ba8f45a9ddfea52518f82
m_Address: T_1_fire_
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 71c2aae20a433fc498da71248e974a9c
m_Address: T_14_key_
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d3590afc6b555c44d8fcd6c5241012ab
m_Address: T_8_bottle_magic_
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: be8c7bfaed8f7eb428b95bd26a52c525, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: HorrorIcons
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
m_GroupName: HorrorIcons
m_GUID: 16c0acf7ed6610c46af1cd5348f31a40
m_SerializeEntries:
- m_GUID: 05e0567213a58c840a3ea79a4409bdfd
m_Address: ModernGDR_Icons_BrightBackground
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 59ba3652eec0b124fa36521af007fb5d
m_Address: Navidtbt_Weapon_Icons_Blue
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: be8c7bfaed8f7eb428b95bd26a52c525, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 5ea9a0c86c09d4c47837e460aaf10df5, type: 2}
- {fileID: 11400000, guid: 6344834549fcfce4d9bc6c6f35db5d30, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b1611d7d32b3037468188d2f5c8ff025
m_Address: HorrorEnemy
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c0b020a3757cd34408a570b82a0c43bf
m_Address: HorrorGameRootController
m_ReadOnly: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 25545f51a6c8d10439ed6f34f00651b3
m_Address: HorrorEquipmentShortcutDialog
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: be8c7bfaed8f7eb428b95bd26a52c525, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: HorrorWeapons
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
m_GroupName: HorrorWeapons
m_GUID: 087e715e4321b96479088cfd270e9d06
m_SerializeEntries:
- m_GUID: 02baef62b1bfedf40bb369fb7542b9e7
m_Address: RPG7
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5a2bf64643e1fb0439ea39c0fc9b00ff
m_Address: RGD-5
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6f1a7354265853f44b0ed5e2e43676ad
m_Address: M1911
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8b0b86b42def11849a8eba21f4a6a684
m_Address: Bennelli_M4
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8b4cba336c093ff41ae9321f9f8433d6
m_Address: Smoke
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ee329c3cd08e58645834d20702d7f6c6
m_Address: AK74
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: be8c7bfaed8f7eb428b95bd26a52c525, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: da1ce9d386ef0d64587f523f52eab1b9, type: 2}
- {fileID: 11400000, guid: 32f13fb75df4d9348a93c7a6f2208f78, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ MonoBehaviour:
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2cc7cf7ec22e69241b4d071651007bf7
m_Address: Assets/Localization/Tables/String/Common Shared Data.asset
m_Address: Assets/Localization/Tables/String/UITexts Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
Expand All @@ -36,7 +36,7 @@ MonoBehaviour:
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f107895dd8568a3429e53377b860ba22
m_Address: Assets/Localization/Tables/String/Interactions Shared Data.asset
m_Address: Assets/Localization/Tables/String/ContextActions Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MonoBehaviour:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 52f563c179512e14191473506eae3aea
m_Address: Options_en
m_Address: UITexts_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
Expand All @@ -41,7 +41,7 @@ MonoBehaviour:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ee3c007d97181474bb3e86bfb7c2f942
m_Address: Interactions_en
m_Address: ContextActions_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ MonoBehaviour:
- Locale-ja
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f0f11cffa6a64e04bbde67676c83fe00
m_Address: Options_ja
m_Address: UITexts_ja
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ja
- Preload
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fe2d28409ae37b34aac88a1b5b8b9caf
m_Address: Interactions_ja
m_Address: ContextActions_ja
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ja
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: HorrorIcons_BundledAssetGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
m_Group: {fileID: 11400000, guid: ab25818c07c811644a9939d8e2391b83, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_StripDownloadOptions: 0
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 51f2c25893d6d51418d21e2c08a24c53
m_LoadPath:
m_Id: 48fee55e77e175c4693cab76d956f60f
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_UseDefaultSchemaSettings: 0
m_SelectedPathPairIndex: 1
m_BundleNaming: 0
m_AssetLoadMode: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: HorrorIcons_ContentUpdateGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.ContentUpdateGroupSchema
m_Group: {fileID: 11400000, guid: ab25818c07c811644a9939d8e2391b83, type: 2}
m_StaticContent: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: HorrorWeapons_BundledAssetGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
m_Group: {fileID: 11400000, guid: 9f8bc5cae3e38eb4885bc6b785384ffe, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_StripDownloadOptions: 0
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 51f2c25893d6d51418d21e2c08a24c53
m_LoadPath:
m_Id: 48fee55e77e175c4693cab76d956f60f
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_UseDefaultSchemaSettings: 0
m_SelectedPathPairIndex: 1
m_BundleNaming: 0
m_AssetLoadMode: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: HorrorWeapons_ContentUpdateGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.ContentUpdateGroupSchema
m_Group: {fileID: 11400000, guid: 9f8bc5cae3e38eb4885bc6b785384ffe, type: 2}
m_StaticContent: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading