Skip to content

Commit 63eeeab

Browse files
Refactor the tilemap menu (#1355)
* Little cleanup * Split Place() into two with input acitons * Place action is performed on release * Rewrite tile construction menu script * Implement dragging * Implement correct placing * Implement deleting * Fix stuff, implement square form * Rearrange stuff * Fix everything, rearrenge methods into regions, rename GhostManager to BuildGhost * Add comments, resize menu * Add comment * Move methods into helpers * Reimplement restrained rotations * Remove redundant dependencies * make it work * activate ghosts * add material database * renaming * set rotation correctly * add last registered direction * fix merge errors * fix broken body parts * big refactor * another bunch of refactoring * some encapsulation * more splitting * some doc and renaming * some more refactoring * doc and clean up * doc * clean up, doc and renaming * set up missing value * fix hand bugging due to bad merge * refresh hologram after adding them * move handle load and handle save to tilemapmenusaveandloadtabs * Rename stuff, beutify code, move handlers * Move input logic --------- Co-authored-by: Mechar418 <[email protected]>
1 parent ad4e1ea commit 63eeeab

39 files changed

+1248
-892
lines changed

Assets/Content/Addressables/AddressableAssetSettings.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ MonoBehaviour:
5252
- {fileID: 11400000, guid: dd394b793b56e43418a2c11a61130663, type: 2}
5353
- {fileID: 11400000, guid: d640c8e212e7a5349999a9ddd6ffb5b5, type: 2}
5454
- {fileID: 11400000, guid: d700978032e12a647b8734863a0bf7c2, type: 2}
55+
- {fileID: 11400000, guid: 2caa591261a883b4183d04829ce705fd, type: 2}
5556
m_BuildSettings:
5657
m_CompileScriptsInVirtualMode: 0
5758
m_CleanupStreamingAssetsAfterBuilds: 1

Assets/Content/Addressables/AssetGroups/BodyParts.asset

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ MonoBehaviour:
8181
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanLiver.prefab
8282
m_ReadOnly: 0
8383
m_SerializedLabels: []
84-
- m_GUID: ea5b9b571f8df3948b52b7023aa66c99
85-
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanHeart.prefab
86-
m_ReadOnly: 0
87-
m_SerializedLabels: []
8884
- m_GUID: 1e304f9a331c2ba419514ef8afb8a13c
8985
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanIntestineLarge.prefab
9086
m_ReadOnly: 0
@@ -97,6 +93,10 @@ MonoBehaviour:
9793
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanBrain.prefab
9894
m_ReadOnly: 0
9995
m_SerializedLabels: []
96+
- m_GUID: fccdc78a6cf916047ba52f2877f755e5
97+
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanHeart.prefab
98+
m_ReadOnly: 0
99+
m_SerializedLabels: []
100100
m_ReadOnly: 0
101101
m_Settings: {fileID: 11400000, guid: ddc57d0f5f9fb874e8a26db0c5b215e0, type: 2}
102102
m_SchemaSet:
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
13+
m_Name: Materials
14+
m_EditorClassIdentifier:
15+
m_GroupName: Materials
16+
m_Data:
17+
m_SerializedData: []
18+
m_GUID: ca573a7d9c8fb1044a5ceb85f048f213
19+
m_SerializeEntries:
20+
- m_GUID: ed5a1263eb564c94abc6407ac0919ea7
21+
m_Address: Assets/Content/WorldObjects/World/VFX/Construction/DeleteConstruction.mat
22+
m_ReadOnly: 0
23+
m_SerializedLabels: []
24+
- m_GUID: e9b99cfb2e59ffa40a062c2f4b88b729
25+
m_Address: Assets/Content/WorldObjects/World/VFX/Construction/InvalidConstruction.mat
26+
m_ReadOnly: 0
27+
m_SerializedLabels: []
28+
- m_GUID: 6d2a18aa72cbaf94694dce9f8451160b
29+
m_Address: Assets/Content/WorldObjects/World/VFX/Construction/ValidConstruction.mat
30+
m_ReadOnly: 0
31+
m_SerializedLabels: []
32+
m_ReadOnly: 0
33+
m_Settings: {fileID: 11400000, guid: ddc57d0f5f9fb874e8a26db0c5b215e0, type: 2}
34+
m_SchemaSet:
35+
m_Schemas:
36+
- {fileID: 11400000, guid: 84c038900429ad74e9cf6f6d27f33ade, type: 2}
37+
- {fileID: 11400000, guid: b22abbf9f6bc06c4491b5c4a8258a702, type: 2}

Assets/Content/Addressables/AssetGroups/Materials.asset.meta

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
13+
m_Name: Materials_BundledAssetGroupSchema
14+
m_EditorClassIdentifier:
15+
m_Group: {fileID: 11400000, guid: 2caa591261a883b4183d04829ce705fd, type: 2}
16+
m_InternalBundleIdMode: 1
17+
m_Compression: 1
18+
m_IncludeAddressInCatalog: 1
19+
m_IncludeGUIDInCatalog: 1
20+
m_IncludeLabelsInCatalog: 1
21+
m_InternalIdNamingMode: 0
22+
m_CacheClearBehavior: 0
23+
m_IncludeInBuild: 1
24+
m_BundledAssetProviderType:
25+
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
26+
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
27+
m_ForceUniqueProvider: 0
28+
m_UseAssetBundleCache: 1
29+
m_UseAssetBundleCrc: 1
30+
m_UseAssetBundleCrcForCachedBundles: 1
31+
m_UseUWRForLocalBundles: 0
32+
m_Timeout: 0
33+
m_ChunkedTransfer: 0
34+
m_RedirectLimit: -1
35+
m_RetryCount: 0
36+
m_BuildPath:
37+
m_Id: 56790a984472fbe4a809c1ab1b0e4c79
38+
m_LoadPath:
39+
m_Id: 8abc09617b79e8b4994b07cc672cbbe5
40+
m_BundleMode: 0
41+
m_AssetBundleProviderType:
42+
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
43+
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
44+
m_BundleNaming: 0
45+
m_AssetLoadMode: 0

Assets/Content/Addressables/AssetGroups/Schemas/Materials_BundledAssetGroupSchema.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
13+
m_Name: Materials_ContentUpdateGroupSchema
14+
m_EditorClassIdentifier:
15+
m_Group: {fileID: 11400000, guid: 2caa591261a883b4183d04829ce705fd, type: 2}
16+
m_StaticContent: 0

Assets/Content/Addressables/AssetGroups/Schemas/Materials_ContentUpdateGroupSchema.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Content/Data/BodyParts.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ MonoBehaviour:
3232
- {fileID: 1705603677127675533, guid: a019475d05ec8824494b0fa88e2282d8, type: 3}
3333
- {fileID: 5774385816057912484, guid: 2bc6f6a968d5ba04c919ba56d0ccdab4, type: 3}
3434
- {fileID: 5774385816057912484, guid: d75ff9a3ac207a84487ec1ee73a676fc, type: 3}
35-
- {fileID: 2302397424301738637, guid: ea5b9b571f8df3948b52b7023aa66c99, type: 3}
3635
- {fileID: 5774385816057912484, guid: 1e304f9a331c2ba419514ef8afb8a13c, type: 3}
3736
- {fileID: 5774385816057912484, guid: 071581df025e1ba49a8a75eb39611ff6, type: 3}
3837
- {fileID: 5774385816057912484, guid: 7579883b8dd8801448a176adace4860b, type: 3}
38+
- {fileID: 2302397424301738637, guid: fccdc78a6cf916047ba52f2877f755e5, type: 3}

Assets/Content/Data/Items.asset

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,3 @@ MonoBehaviour:
6060
- {fileID: 726792282085660869, guid: 4635651592391df41b6b2413afdb76c3, type: 3}
6161
- {fileID: 7723921361698481624, guid: f549f4153ef612c4586c46ea280e0e94, type: 3}
6262
- {fileID: 8712940276313799639, guid: 1a2f912be4bc1b948a2b22ffde517cdc, type: 3}
63-
- {fileID: 5774385816057912484, guid: 7579883b8dd8801448a176adace4860b, type: 3}
64-
- {fileID: 6632297082311541152, guid: e60ba1e09be8316448e419ecbdfb64a6, type: 3}
65-
- {fileID: 6958959792659314810, guid: 94aaf82bb6ab002418e01d9cc7c6eaaa, type: 3}
66-
- {fileID: 5562010227207703736, guid: 4a9d34a6cf84ef045a740513d8ae30b1, type: 3}
67-
- {fileID: 2207730063960764759, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
68-
- {fileID: 7546631754298856378, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
69-
- {fileID: 3470038122221450171, guid: ecaf79b0a74bdb443a350e88daa94a66, type: 3}
70-
- {fileID: 8256619991674398311, guid: 242a937784a622f4f8a6e6d097e0737c, type: 3}
71-
- {fileID: 1888615333292121711, guid: 06b6be83779804245b7f6411fe07b851, type: 3}
72-
- {fileID: 832941577213411195, guid: 432a4ad70e41e5c4f8f913f76fe0e66c, type: 3}
73-
- {fileID: 8006468508714419156, guid: cc54bc74b2f4c2349b1f84b501b0a091, type: 3}
74-
- {fileID: 1705603677127675533, guid: a019475d05ec8824494b0fa88e2282d8, type: 3}
75-
- {fileID: 8304480218026041231, guid: a8b265034e3f79344a6067b406e1bff6, type: 3}
76-
- {fileID: 2302397424301738637, guid: ea5b9b571f8df3948b52b7023aa66c99, type: 3}

0 commit comments

Comments
 (0)