Merge remote-tracking branch 'tech-mkt/main'

UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/BardHare_TransitionTable.asset

   m_EditorClassIdentifier: 
   _transitions:
   - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
-    ToState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
+    ToState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}
+    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
-      Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2}
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
-      Condition: {fileID: 11400000, guid: 11d32529e8bdbc24e81d7b578426352c, type: 2}
+      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ad97f6f8066c4d4499492813bfed08d3, type: 2}
       Operator: 0
   - FromState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
     ToState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
     - ExpectedResult: 0
       Condition: {fileID: 11400000, guid: 87426477fd21a254d8cd4ff826d4ee29, type: 2}
       Operator: 0
-  - FromState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}
-    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
-      Operator: 0
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
-      Operator: 0
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: ad97f6f8066c4d4499492813bfed08d3, type: 2}
-      Operator: 0
   - FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
     ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
     Conditions:
       Operator: 1
     - ExpectedResult: 0
       Condition: {fileID: 11400000, guid: f7264f99aeb6a8046b637306314556da, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
-    ToState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
       Operator: 0
   - FromState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
     ToState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/EndConversation.asset

   _actions:
   - {fileID: 11400000, guid: 89d1557bcc9b8d74784a87e6517f81f1, type: 2}
   - {fileID: 11400000, guid: 098a951ce0fcb154bb9cb4900665dd9b, type: 2}
-  - {fileID: 11400000, guid: 6f2fd87f078fefb48ad59ba0e24df91e, type: 2}