Merge pull request #37 from Ziden/feature/battle-animations

Battle animation scene testing

LisergyClient/LisergyClient/.editorconfig

@@ -0,0 +1,72 @@
+[*.cs]
+
+# CS1998: Async method lacks 'await' operators and will run synchronously
+dotnet_diagnostic.CS1998.severity = silent
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_braces = true:silent
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_indent_labels = one_less_than_current
+
+[*.{cs,vb}]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
+dotnet_style_null_propagation = true:suggestion

LisergyClient/LisergyClient/Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -9,13 +9,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
   m_Name: AddressableAssetSettings
-  m_EditorClassIdentifier: Unity.Addressables.Editor:UnityEditor.AddressableAssets.Settings:AddressableAssetSettings
-  m_DefaultGroup: 519db5531e882de4d9cae75c63b29d1e
+  m_EditorClassIdentifier: 
+  m_DefaultGroup: 9a87b26c44158f9438dda2dc136db3e0
   m_currentHash:
     serializedVersion: 2
-    Hash: 00000000000000000000000000000000
+    Hash: a8e025b7e68df66de4e08b93bd94a804
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_BundleLocalCatalog: 0
@@ -45,7 +45,7 @@ MonoBehaviour:
   m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
   m_GroupAssets:
   - {fileID: 11400000, guid: 7913b7c0b10ed7042ac5c92aadd5cf62, type: 2}
-  - {fileID: 11400000, guid: b0787109947c5ec45be9beb4c6f2a7c6, type: 2}
+  - {fileID: 11400000, guid: 421dcdf785168cf49b7c0f1b96f0a84d, type: 2}
   m_BuildSettings:
     m_CompileScriptsInVirtualMode: 0
     m_CleanupStreamingAssetsAfterBuilds: 1
@@ -54,33 +54,33 @@ MonoBehaviour:
   m_ProfileSettings:
     m_Profiles:
     - m_InheritedParent: 
-      m_Id: 08408b22073436d43a9a60990eaef15f
+      m_Id: 25571d70a71e26844a2b7227121b6f94
       m_ProfileName: Default
       m_Values:
-      - m_Id: 8777a8b17b64f1942871fc4eeb24dfeb
+      - m_Id: 7321a0d1cd948b04a9ac67f205af5380
         m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
-      - m_Id: fbb286d2befdb8741b3314a8f363b6e3
+      - m_Id: 846cc7b242dc6cb488725faf8bc5258b
         m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
-      - m_Id: 8fc059d9e13d735418280698ba95c30c
+      - m_Id: 9ddc6d755d793e845b73daaa2df4e58d
         m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
-      - m_Id: 7977f5e175685774d91c75621da138e5
+      - m_Id: cf34a58ed0fa302409ac1a5641e574a1
         m_Value: ServerData/[BuildTarget]
-      - m_Id: eae06dd956b12054cad7e4c1eda3dc45
+      - m_Id: 91cf5c8ce3ed2f943a7760c6eea89474
         m_Value: http://[PrivateIpAddress]:[HostingServicePort]
     m_ProfileEntryNames:
-    - m_Id: 8777a8b17b64f1942871fc4eeb24dfeb
+    - m_Id: 7321a0d1cd948b04a9ac67f205af5380
       m_Name: BuildTarget
       m_InlineUsage: 0
-    - m_Id: fbb286d2befdb8741b3314a8f363b6e3
+    - m_Id: 846cc7b242dc6cb488725faf8bc5258b
       m_Name: Local.BuildPath
       m_InlineUsage: 0
-    - m_Id: 8fc059d9e13d735418280698ba95c30c
+    - m_Id: 9ddc6d755d793e845b73daaa2df4e58d
       m_Name: Local.LoadPath
       m_InlineUsage: 0
-    - m_Id: 7977f5e175685774d91c75621da138e5
+    - m_Id: cf34a58ed0fa302409ac1a5641e574a1
       m_Name: Remote.BuildPath
       m_InlineUsage: 0
-    - m_Id: eae06dd956b12054cad7e4c1eda3dc45
+    - m_Id: 91cf5c8ce3ed2f943a7760c6eea89474
       m_Name: Remote.LoadPath
       m_InlineUsage: 0
     m_ProfileVersion: 1
@@ -99,7 +99,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 664e9f645afa0004b97c59de681ec2d0, type: 2}
   - {fileID: 11400000, guid: 8070c3fa0167944488e167e68d97f5c8, type: 2}
   - {fileID: 11400000, guid: 519a4d18065b1f54786ae1e8a7656136, type: 2}
-  m_ActiveProfileId: 08408b22073436d43a9a60990eaef15f
+  - {fileID: 11400000, guid: c9f9921353e85f847b43f4c8bd487389, type: 2}
+  m_ActiveProfileId: 25571d70a71e26844a2b7227121b6f94
   m_HostingServicesManager:
     m_HostingServiceInfos: []
     m_Settings: {fileID: 11400000}

LisergyClient/LisergyClient/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_GroupName: Built In Data
   m_Data:
     m_SerializedData: []
-  m_GUID: fb8610348842e7d4986a3b3400cfe391
+  m_GUID: 63dadf79469a11c4c9fce6b159f01983
   m_SerializeEntries:
   - m_GUID: Resources
     m_Address: Resources

LisergyClient/LisergyClient/Assets/AddressableAssetsData/AssetGroups/MainBundle.asset

@@ -222,11 +222,6 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 903a090fb95dfe446b41ebed063f6e8b
-    m_Address: Assets/Addressables/Sprites/Faces.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 74a2f0793cb29bd4cafd65a68762332b
     m_Address: Assets/Addressables/UIScreens/Components/PartyButton.uxml
     m_ReadOnly: 0
@@ -237,6 +232,21 @@ MonoBehaviour:
     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_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: b09defdd2ea25a04a9d7584493f44cd4, type: 2}
   m_SchemaSet: