Skip to content

Commit

Permalink
Merge branch 'struct-components'
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriel Slomka authored and Gabriel Slomka committed May 12, 2024
2 parents ec56691 + 59b7100 commit f7448df
Show file tree
Hide file tree
Showing 56,183 changed files with 6,360,098 additions and 3,322,381 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file added LisergyClient/.DS_Store
View file
Binary file not shown.
Binary file added LisergyClient/LisergyClient/.DS_Store
View file
Binary file not shown.
Binary file added LisergyClient/LisergyClient/Assets/.DS_Store
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion LisergyClient/LisergyClient/Assets/AddressableAssetsData/AddressableAssetSettings.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 9a87b26c44158f9438dda2dc136db3e0
m_currentHash:
serializedVersion: 2
Hash: a8e025b7e68df66de4e08b93bd94a804
Hash: aad45b0062bbbd5865c041bce90d0f42
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
Expand Down Expand Up @@ -46,6 +46,7 @@ MonoBehaviour:
m_GroupAssets:
- {fileID: 11400000, guid: 7913b7c0b10ed7042ac5c92aadd5cf62, type: 2}
- {fileID: 11400000, guid: 421dcdf785168cf49b7c0f1b96f0a84d, type: 2}
- {fileID: 11400000, guid: b0787109947c5ec45be9beb4c6f2a7c6, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
Expand Down
232 changes: 1 addition & 231 deletions LisergyClient/LisergyClient/Assets/AddressableAssetsData/AssetGroups/MainBundle.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,237 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: 519db5531e882de4d9cae75c63b29d1e
m_SerializeEntries:
- m_GUID: 829af9d339aca1241a0fb1267780cc2d
m_Address: Assets/Addressables/Prefabs/MapObjects/UnitCursor.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 88dda11852ccfb64e9c61040112396ad
m_Address: Assets/Addressables/Prefabs/MapObjects/Cursor.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 02572b032dd09624a841e97aafe3d61f
m_Address: Assets/Addressables/Prefabs/Effects/BattleEffect.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ddec5dce738ae084bbf85a7ee8386fcc
m_Address: Assets/Addressables/Prefabs/Effects/HalfPath.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c7e9585aa9e17894ca1ba9545b5c0cef
m_Address: Assets/Addressables/Prefabs/Buildings/Castle.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d953d3262f9252844910fb6edfbb0140
m_Address: Assets/Addressables/Prefabs/Buildings/dungeon.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b5f02c13c0c54aa4c86167bb884a4477
m_Address: Assets/Addressables/Audio/Sfx/button_click.mp3
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 45badf52542492c448c2d57c23ed939f
m_Address: Assets/Addressables/Prefabs/Tiles/Floor.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 293b467a7c617aa47b3f500f45ed3937
m_Address: Assets/Addressables/Prefabs/Tiles/Fog50.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3c68636528764394dbd1dcd104d7e3f4
m_Address: Assets/Addressables/Prefabs/Tiles/FogBlack.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 29de4f8a7bec6ba4b88180eb8f72f3d2
m_Address: Assets/Addressables/Prefabs/Tiles/FogBorderContainer.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 02f44fe58ea59d144ba53b2733c995d7
m_Address: Assets/Addressables/Prefabs/Tiles/Forest.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 99ec30f192f79e7409293c0de4518795
m_Address: Assets/Addressables/Prefabs/Tiles/Mountain.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6538429612df1f84db785fbf1074a1a0
m_Address: Assets/Addressables/Prefabs/Tiles/Plains.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9a39b1fca5da36142a6d804fc1b9f0b3
m_Address: Assets/Addressables/Prefabs/Tiles/Plane.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fdf332cb9bd89f34dbe9263e4bd26307
m_Address: Assets/Addressables/Prefabs/Tiles/Tree.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 85467e06bec3aeb4eb671696544f94fd
m_Address: Assets/Addressables/Prefabs/Tiles/Water.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 12aae2521d1c4f446bb08b0e77628ede
m_Address: Assets/Addressables/Prefabs/Units/Mage.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f564210fa52875245a297e2c115f82e3
m_Address: Assets/Addressables/Sprites/Badges/alchemy.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 33e68cf508fdadc449bfcb58791d6cba
m_Address: Assets/Addressables/Sprites/Badges/Badge_assassin.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: eace365ae25e0f24790e03fcfeb86b37
m_Address: Assets/Addressables/Sprites/Badges/Badge_barbarian.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 381e4462059564343a1cc7151c9ec212
m_Address: Assets/Addressables/Sprites/Badges/Badge_hunter.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: dfece0cac72b8eb44ab7d00c0c2f261d
m_Address: Assets/Addressables/Sprites/Badges/Badge_mage.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 84e233730bdbca447a97a76257ac9b26
m_Address: Assets/Addressables/Sprites/Badges/Badge_necro.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c3556bb7b79b85e4e969dde0a81b317c
m_Address: Assets/Addressables/Sprites/Badges/Badge_paladin.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 07b006f41c9969f42bfc49859951c94b
m_Address: Assets/Addressables/Sprites/Badges/Badge_priest.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 984e0e0fdaded8e4ab5ae907bab99cd4
m_Address: Assets/Addressables/Sprites/Badges/Badge_rogue.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 105f1d1e6275d2f45bc26011ef2cdd8f
m_Address: Assets/Addressables/Sprites/Badges/Badge_warrior.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f8b63d6546434104da27224db83a102f
m_Address: Assets/Addressables/Sprites/Badges/blacksmith_craft.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 37892fbc7431cf64586f4fed33f2795e
m_Address: Assets/Addressables/Sprites/Badges/carpentry.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7612453751ed3ac4a9e438e2b0ff64d8
m_Address: Assets/Addressables/Sprites/Badges/tailoring.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 43ee29b5a29445a4d8405a256efc8931
m_Address: Assets/Addressables/Sprites/Badges/mining.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: cd1e5cd791405ec468b510ef7b55047e
m_Address: Assets/Addressables/Sprites/Badges/hunting.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 07a51cceb6acc664ea36df43d6e4c32f
m_Address: Assets/Addressables/Sprites/Badges/fishing.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 31d64aef9bd39604e8cbee7590397522
m_Address: Assets/Addressables/Sprites/Badges/farming.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5f28e2ab2bfdc1044be799c0fbe8a7bb
m_Address: Assets/Addressables/Sprites/Badges/diplomacy.png
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 484da347efc34a6458e9fc70ac0579b9
m_Address: Assets/Addressables/UIScreens/LoginScreen.uxml
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 29602cd6413a7334e90aa70311ec28d4
m_Address: Assets/Addressables/UIScreens/PartySelectBar.uxml
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7605a49d87c51514b8b7d44838172917
m_Address: Assets/Addressables/UIScreens/UnitActions.uxml
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9af3c803aeea3fe43983be9aa4b6a64f
m_Address: Assets/Addressables/UISettings/PanelSettings.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5311a5284c977b5409a7dca15b20c7ad
m_Address: Assets/Addressables/UIScreens/Notifications/BattleNotification.uxml
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 74a2f0793cb29bd4cafd65a68762332b
m_Address: Assets/Addressables/UIScreens/Components/PartyButton.uxml
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c2d1057aebdfa034bb0943a31096f9c9
m_Address: Assets/Addressables/UIScreens/Components/RadialProgress.uxml
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 25da62f1c89f5194fb2487e2cec72d9c
m_Address: Assets/Addressables/Prefabs/Units/Rogue.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c8341ebc62abf9440ab0a41087443ccc
m_Address: Assets/Addressables/Prefabs/Units/Knight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d463a6b7fb9464b4bbe666e3244ee5bc
m_Address: Assets/Addressables/UIScreens/BattleScreen.uxml
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: b09defdd2ea25a04a9d7584493f44cd4, type: 2}
m_SchemaSet:
Expand Down
Loading

0 comments on commit f7448df

Please sign in to comment.