integration

bad other team code on another branch
2025-01-28 23:58:50 +01:00 · 2025-01-28 23:58:50 +01:00 · 521a62973a
commit 521a62973a
parent 7925fd966a
278 changed files with 11344 additions and 0 deletions
--- a/Assets/Prefabs/Ducks/Variants/GreenDuck.prefab
+++ b/Assets/Prefabs/Ducks/Variants/GreenDuck.prefab
@ -0,0 +1,102 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &7062600534622895795
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3.308
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.013
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.14
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 178271972790075877, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2803147189421613720, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: m_Name
+      value: GreenDuck
+      objectReference: {fileID: 0}
+    - target: {fileID: 5478768619500298181, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: f3e75548b01b0f9229dddaee7cc7a52b, type: 2}
+    - target: {fileID: 6008069295620554618, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: cost
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 6008069295620554618, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: damage
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6008069295620554618, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: attackMode
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6008069295620554618, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      propertyPath: baseHealth
+      value: 20
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 2803147189421613720, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: -9203566887026358481}
+  m_SourcePrefab: {fileID: 100100000, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+--- !u!1 &4964552560111410219 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2803147189421613720, guid: e11f2a345a4be2d1bacd91460520892e, type: 3}
+  m_PrefabInstance: {fileID: 7062600534622895795}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &-9203566887026358481
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4964552560111410219}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8e5cb8ce6f5d03c4789dc12c8b7dac85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  range: 0.75
+  damage: 2
+  cooldown: 3
--- a/Assets/Prefabs/Ducks/Variants/GreenDuck.prefab.meta
+++ b/Assets/Prefabs/Ducks/Variants/GreenDuck.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e1c94fe0d464f1e088ef69b05b3abb32
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: