more rearranging scripts.

4 年前 · 7360d6b6
--- a/Assets/BossRoom/Prefabs/Character/CharacterSet.prefab
+++ b/Assets/BossRoom/Prefabs/Character/CharacterSet.prefab
--- a/Assets/BossRoom/Prefabs/Player.prefab
+++ b/Assets/BossRoom/Prefabs/Player.prefab
  - component: {fileID: 4470766618279719912}
  - component: {fileID: -3542424572169399493}
  - component: {fileID: 6970334877957368017}
-  - component: {fileID: 4093145920273822261}
+  - component: {fileID: 4602672899881656135}
  m_Layer: 0
  m_Name: Player
  m_TagString: Untagged
  NetworkRotationY:
    InternalValue: 0
  NetworkMovementSpeed:
+    InternalValue: 0
+  HitPoints:
+    InternalValue: 0
+  Mana:
    InternalValue: 0
 --- !u!114 &4600110157238723776
 MonoBehaviour:
  m_Height: 2
  m_Direction: 1
  m_Center: {x: 0, y: 1, z: 0}
--- !u!114 &4093145920273822261
+--- !u!114 &4602672899881656135
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9520a47fc61d5ab4ca99cdac2d574909, type: 3}
+  m_Script: {fileID: 11500000, guid: 920a440eb254ba348915767fd046027a, type: 3}
-  m_ClientVisuals: {fileID: 6174365277840941608}
 --- !u!1001 &7872000410579295758
 PrefabInstance:
  m_ObjectHideFlags: 0
    - target: {fileID: 7859571076522411967, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_Materials.Array.data[0]
      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 7943089997373843793, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
+      propertyPath: MaxZoomDistance
+      value: 30
      objectReference: {fileID: 0}
    - target: {fileID: 8474587904930755041, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_Materials.Array.data[0]
--- a/Assets/BossRoom/Scenes/DungeonTest.unity
+++ b/Assets/BossRoom/Scenes/DungeonTest.unity
  m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
  m_PrefabInstance: {fileID: 68757788}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &74737831
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1880739843}
-    m_Modifications:
-    - target: {fileID: 120813953115397194, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 451019077418353113, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 71e6e99818013f84f91038ec53cbf5a7, type: 2}
-    - target: {fileID: 1014932751805099524, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1123034451250864999, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1270185926321959616, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: -4327808786972133168, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 1270185926321959616, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1270185926321959616, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 0ff52550ec51425478d16fac3184c0e1, type: 2}
-    - target: {fileID: 1275426192112755703, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 71e6e99818013f84f91038ec53cbf5a7, type: 2}
-    - target: {fileID: 1419159953968822348, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 59aeea6b3cff1b745b6c534ac1bc2bc6, type: 2}
-    - target: {fileID: 1442995880619402305, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 83e9907752fa0454aabda2854e946e5d, type: 2}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 3120583771358966645, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_AABB.m_Center.x
-      value: 0.40047836
-      objectReference: {fileID: 0}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_AABB.m_Center.y
-      value: -4.8396416
-      objectReference: {fileID: 0}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_AABB.m_Center.z
-      value: 0.012645721
-      objectReference: {fileID: 0}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_AABB.m_Extent.x
-      value: 46.541443
-      objectReference: {fileID: 0}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_AABB.m_Extent.y
-      value: 53.8788
-      objectReference: {fileID: 0}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_AABB.m_Extent.z
-      value: 39.495026
-      objectReference: {fileID: 0}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[1]
-      value: 
-      objectReference: {fileID: 360490015}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[3]
-      value: 
-      objectReference: {fileID: 1918514173}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[4]
-      value: 
-      objectReference: {fileID: 567390362}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[5]
-      value: 
-      objectReference: {fileID: 988928323}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[6]
-      value: 
-      objectReference: {fileID: 183948625}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[7]
-      value: 
-      objectReference: {fileID: 859940908}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[8]
-      value: 
-      objectReference: {fileID: 1311104642}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[9]
-      value: 
-      objectReference: {fileID: 1791570132}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[10]
-      value: 
-      objectReference: {fileID: 1674529043}
-    - target: {fileID: 1472037732483017670, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Bones.Array.data[11]
-      value: 
-      objectReference: {fileID: 1015948468}
-    - target: {fileID: 1570920858091160125, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 51238b61d7696bb44950aabe9857b5a3, type: 2}
-    - target: {fileID: 1815729318982098784, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: b6fb463aaf42fa442b15fc3288716f4c, type: 2}
-    - target: {fileID: 1983451975515712793, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 83e9907752fa0454aabda2854e946e5d, type: 2}
-    - target: {fileID: 2027003488746983335, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 7169461090850160920, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 2032362546942396269, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 4518664928318302949, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 2382990831643484516, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2582080506733257300, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 2482120647625105992, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 3003794035877911579, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 9bbeafbf860e64744a97f8241827f4c5, type: 2}
-    - target: {fileID: 3085652567202522198, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 4840104904336195258, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 3143565374616139912, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 5759471141772939928, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 3269992512903255054, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 71e6e99818013f84f91038ec53cbf5a7, type: 2}
-    - target: {fileID: 3736552308919084700, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Name
-      value: CharacterSet
-      objectReference: {fileID: 0}
-    - target: {fileID: 3741846901656975085, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3841853127460988830, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3939530525189870864, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 180
-      objectReference: {fileID: 0}
-    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4214436874509125042, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 8030730824785599427, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 4281006967014396326, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4557750803579274235, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 3179b2e0f923b324cb33c6632c3bd167, type: 2}
-    - target: {fileID: 4590952568586430020, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 459eb5e5d04ffec4fa540f1baa8ffd55, type: 2}
-    - target: {fileID: 4654300203343167303, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: aec61333b49ad744bbf3aa0ea94672a1, type: 2}
-    - target: {fileID: 4659130856917116551, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 1940278193824382384, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 4916965965019151265, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 83e9907752fa0454aabda2854e946e5d, type: 2}
-    - target: {fileID: 4977252199914387162, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 3f18e7390c775ad4c99b67a567332785, type: 2}
-    - target: {fileID: 5038865569814015038, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5236358809792046909, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5306754474248613965, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: -4941161867953274312, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 5404400264780765344, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 71e6e99818013f84f91038ec53cbf5a7, type: 2}
-    - target: {fileID: 5661464935809207397, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: fbe92527c02bb6043831341dd1bcf20e, type: 2}
-    - target: {fileID: 5753437091346049002, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6186891685920142570, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 83e9907752fa0454aabda2854e946e5d, type: 2}
-    - target: {fileID: 6284514463440215511, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: -4641826895877553535, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
-    - target: {fileID: 6554312165410509185, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6821969947724442590, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: aec61333b49ad744bbf3aa0ea94672a1, type: 2}
-    - target: {fileID: 7111671785955215127, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7155621238611783916, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7219764346121959029, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7415691260465069799, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 83e9907752fa0454aabda2854e946e5d, type: 2}
-    - target: {fileID: 7536383864854251866, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7688214084643546559, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 71e6e99818013f84f91038ec53cbf5a7, type: 2}
-    - target: {fileID: 7859571076522411967, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 71e6e99818013f84f91038ec53cbf5a7, type: 2}
-    - target: {fileID: 8178081576640959163, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 5690537b3cf4ec9478a74ed32803892a, type: 2}
-    - target: {fileID: 8312850973723105667, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8312850973723105667, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 0ff52550ec51425478d16fac3184c0e1, type: 2}
-    - target: {fileID: 8444447372055402512, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 3f18e7390c775ad4c99b67a567332785, type: 2}
-    - target: {fileID: 8474587904930755041, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 83e9907752fa0454aabda2854e946e5d, type: 2}
-    - target: {fileID: 8777268618295542602, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 477f90def39714c48a02eb3ad2babe7e, type: 2}
-    - target: {fileID: 8851183620440019083, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8983709352420245827, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: aec61333b49ad744bbf3aa0ea94672a1, type: 2}
-    - target: {fileID: 9162422373336764900, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 21a336530765c4348be349939e333ad7, type: 2}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
--- !u!4 &74737832 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &101971137
 PrefabInstance:
  m_ObjectHideFlags: 0
 Transform:
  m_CorrespondingSourceObject: {fileID: 4437348436208465204, guid: a562db644b9a0ea4ea4318a37cbdf486, type: 3}
  m_PrefabInstance: {fileID: 183289321}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &183948625 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7525387521976179177, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &185005593
 PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7943089997373843793, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7977955482887389211, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_IsActive
      value: 0
  m_CorrespondingSourceObject: {fileID: 2698721903467665021, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3}
  m_PrefabInstance: {fileID: 360423960}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &360490015 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3734616284646950590, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &390332755
 PrefabInstance:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_RootOrder
-      value: 19
+      value: 18
      objectReference: {fileID: 0}
    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_LocalScale.x
      objectReference: {fileID: 0}
    - target: {fileID: 7637464740376934602, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7943089997373843793, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
+      propertyPath: m_Enabled
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7977955482887389211, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
  m_CorrespondingSourceObject: {fileID: 2698721903467665021, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3}
  m_PrefabInstance: {fileID: 541118884}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &567390362 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 9197077968316907432, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &574582705
 PrefabInstance:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
  m_PrefabInstance: {fileID: 656078055}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &684819852
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 684819853}
-  m_Layer: 0
-  m_Name: CameraFocalPoint
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &684819853
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 684819852}
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 0, y: 2.5, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1880739843}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1001 &712138745
 PrefabInstance:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    - target: {fileID: 281597675721526861, guid: 69d1ba255a412e04681ac5eec03e3976, type: 3}
      propertyPath: m_RootOrder
-      value: 18
+      value: 17
      objectReference: {fileID: 0}
    - target: {fileID: 281597675721526861, guid: 69d1ba255a412e04681ac5eec03e3976, type: 3}
      propertyPath: m_LocalPosition.x
  m_Father: {fileID: 0}
  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &859940908 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1135220812264023273, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &863168463
 PrefabInstance:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 2698721903467665021, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3}
  m_PrefabInstance: {fileID: 987957001}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &988928323 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5787538227139311733, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &998092887
 PrefabInstance:
  m_ObjectHideFlags: 0
 Transform:
  m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
  m_PrefabInstance: {fileID: 1007786241}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &1015948468 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1385890853458294598, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1018710908
 PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5655447013084909147, guid: 8b9c63e7d70c5ff48a03aad51e17103c, type: 3}
      propertyPath: m_RootOrder
-      value: 21
+      value: 20
      objectReference: {fileID: 0}
    - target: {fileID: 5655447013084909147, guid: 8b9c63e7d70c5ff48a03aad51e17103c, type: 3}
      propertyPath: m_LocalPosition.x
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7943089997373843793, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7977955482887389211, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_IsActive
      value: 0
  m_Father: {fileID: 1466735135}
  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1311104642 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1564428037941116370, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1337879773
 GameObject:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_RootOrder
-      value: 20
+      value: 19
      objectReference: {fileID: 0}
    - target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_LocalScale.x
      objectReference: {fileID: 0}
    - target: {fileID: 7637464740376934602, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7943089997373843793, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
+      propertyPath: m_Enabled
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7977955482887389211, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
 Transform:
  m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3}
  m_PrefabInstance: {fileID: 1670529199}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &1674529043 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8064768189409072093, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1679471646
 PrefabInstance:
  m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3}
  m_PrefabInstance: {fileID: 1781903722}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &1791570132 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8495415076674091646, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1811674342 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 4437348436208465204, guid: 51e054801a6c982478ce4048ba254272, type: 3}
  m_Father: {fileID: 0}
  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1880739840
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1880739843}
-  - component: {fileID: 1880739842}
-  - component: {fileID: 1880739841}
-  m_Layer: 0
-  m_Name: AvatarMovementFramework
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1880739841
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1880739840}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cffed25df0931424cbdf62ca740aded2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  TurnSpeed: 80
-  WalkSpeed: 2
-  RunSpeed: 4
-  StrafeSpeed: 1
-  MinZoomDistance: 7
-  MaxZoomDistance: 17
-  ZoomSpeed: 7
-  VirtualCam: {fileID: 2097550084}
--- !u!143 &1880739842
-CharacterController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1880739840}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Height: 2
-  m_Radius: 0.5
-  m_SlopeLimit: 45
-  m_StepOffset: 0.3
-  m_SkinWidth: 0.08
-  m_MinMoveDistance: 0.001
-  m_Center: {x: 0, y: 1, z: 0}
--- !u!4 &1880739843
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1880739840}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -10.71, y: 0, z: -20.63}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 74737832}
-  - {fileID: 684819853}
-  m_Father: {fileID: 0}
-  m_RootOrder: 16
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1893158275
 PrefabInstance:
  m_ObjectHideFlags: 0
 Transform:
  m_CorrespondingSourceObject: {fileID: 2698721903467665021, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3}
  m_PrefabInstance: {fileID: 1901970686}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &1918514173 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1569872458223715547, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
-  m_PrefabInstance: {fileID: 74737831}
  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1932736816
 PrefabInstance:
  m_StreamingVersion: 20170927
  m_Priority: 10
  m_StandbyUpdate: 2
-  m_LookAt: {fileID: 684819853}
-  m_Follow: {fileID: 684819853}
+  m_LookAt: {fileID: 0}
+  m_Follow: {fileID: 0}
  m_Lens:
    FieldOfView: 60
    OrthographicSize: 5
  m_Children:
  - {fileID: 1100829053}
  m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 58.859, y: 152.798, z: 30.058}
 --- !u!114 &2097550086
 MonoBehaviour:
--- a/Assets/BossRoom/Scripts/Client/ClientCharacterVisualization.cs
+++ b/Assets/BossRoom/Scripts/Client/ClientCharacterVisualization.cs
    [RequireComponent(typeof(NetworkCharacterState))]
    public class ClientCharacterVisualization : NetworkedBehaviour
    {
-        private NetworkCharacterState networkCharacterState;
+        private NetworkCharacterState m_NetState;
+        private CinemachineVirtualCamera m_MainCamera;
-        /// <summary>
-        /// The GameObject which visually represents the character is a child object of the character GameObject. This needs to be the case to support host mode.
-        /// In host mode <see cref="MonoBehaviour.transform"/> is the transform which is relevant for gameplay.
-        /// <see cref="m_ClientVisuals"/> is the visual representation on the client side which has interpolated position values.
-        /// </summary>
-        [SerializeField] private Transform m_ClientVisuals;
+        public float MinZoomDistance = 3;
+        public float MaxZoomDistance = 30;
+        public float ZoomSpeed = 3;

        /// <inheritdoc />
        public override void NetworkStart()
                return;
            }

-            networkCharacterState.DoActionEvent += this.PerformActionFX;
+            m_NetState = this.transform.parent.gameObject.GetComponent<NetworkCharacterState>();
+            m_NetState.DoActionEventClient += this.PerformActionFX;
+
+            GetComponent<ModelSwap>();
+            
+            //GetComponents<ModelSwap>
            
            if (IsLocalPlayer)
            {

        void Awake()
        {
-            networkCharacterState = GetComponent<NetworkCharacterState>();
-            m_ClientVisualsAnimator = m_ClientVisuals.GetComponent<Animator>();
+            m_ClientVisualsAnimator = GetComponent<Animator>();
-            m_ClientVisuals.position = networkCharacterState.NetworkPosition.Value;
+            transform.position = m_NetState.NetworkPosition.Value;
-            m_ClientVisuals.rotation = Quaternion.Euler(0, networkCharacterState.NetworkRotationY.Value, 0);
+            transform.rotation = Quaternion.Euler(0, m_NetState.NetworkRotationY.Value, 0);
-                m_ClientVisualsAnimator.SetFloat("Speed", networkCharacterState.NetworkMovementSpeed.Value);
+                m_ClientVisualsAnimator.SetFloat("Speed", m_NetState.NetworkMovementSpeed.Value);
+
+            float scroll = Input.GetAxis("Mouse ScrollWheel");
+            if (scroll != 0 && m_MainCamera )
+            {
+                ZoomCamera(scroll);
+            }
+
-            CinemachineVirtualCamera cam = (CinemachineVirtualCamera)FindObjectOfType(typeof(CinemachineVirtualCamera));
-            if (cam)
+            m_MainCamera = (CinemachineVirtualCamera)FindObjectOfType(typeof(CinemachineVirtualCamera));
+            if (m_MainCamera)
-                cam.Follow = m_ClientVisuals.transform;
-                cam.LookAt = m_ClientVisuals.transform;
+                m_MainCamera.Follow = transform;
+                m_MainCamera.LookAt = transform;
+            }
+        }
+
+        private void ZoomCamera(float scroll)
+        {
+            CinemachineComponentBase[] components = m_MainCamera.GetComponentPipeline();
+            foreach (CinemachineComponentBase component in components)
+            {
+                if (component is CinemachineFramingTransposer)
+                {
+                    CinemachineFramingTransposer c = (CinemachineFramingTransposer)component;
+                    c.m_CameraDistance += -scroll * ZoomSpeed;
+                    if (c.m_CameraDistance < MinZoomDistance)
+                        c.m_CameraDistance = MinZoomDistance;
+                    if (c.m_CameraDistance > MaxZoomDistance)
+                        c.m_CameraDistance = MaxZoomDistance;
+                }
            }
        }
    }
--- a/Assets/BossRoom/Scripts/Server/Game/Character/ServerCharacter.cs
+++ b/Assets/BossRoom/Scripts/Server/Game/Character/ServerCharacter.cs
            if (!IsServer) { this.enabled = false; }
            else
            {
-                this.NetState.DoActionEvent += this.OnActionPlayRequest;
+                this.NetState = GetComponent<NetworkCharacterState>();
+                this.NetState.DoActionEventServer += this.OnActionPlayRequest;
            }
        }

--- a/Assets/BossRoom/Scripts/Shared/NetworkCharacterState.cs
+++ b/Assets/BossRoom/Scripts/Shared/NetworkCharacterState.cs
        // ACTION SYSTEM

        /// <summary>
-        /// This event is raised on the server when an action request arrives, and on the client after the server
-        /// has broadcast an action play.
+        /// This event is raised on the server when an action request arrives
-        public event Action<BossRoom.ActionRequestData> DoActionEvent;
+        public event Action<BossRoom.ActionRequestData> DoActionEventServer;
+
+        /// <summary>
+        /// This event is raised on the client when an action is being played back. 
+        /// </summary>
+        public event Action<BossRoom.ActionRequestData> DoActionEventClient;

        /// <summary>
        /// Client->Server RPC that sends a request to play an action. 
        [ClientRPC]
        private void RecvDoActionClient(ulong clientId, Stream stream )
        {
-            RecvDoAction(clientId, stream);
-
+            ActionRequestData data = RecvDoAction(clientId, stream);
+            DoActionEventClient?.Invoke(data);
-            RecvDoAction(clientId, stream);
+            ActionRequestData data = RecvDoAction(clientId, stream);
+            DoActionEventServer?.Invoke(data);
-        private void RecvDoAction(ulong clientId, Stream stream )
+        private ActionRequestData RecvDoAction(ulong clientId, Stream stream )
        {
            ActionRequestData data = new ActionRequestData();

                }
            }

-            DoActionEvent?.Invoke(data);
+            return data;
        }


--- a/Assets/BossRoom/Scripts/Client/Game/Character/ModelSwap.cs
+++ b/Assets/BossRoom/Scripts/Client/Game/Character/ModelSwap.cs
            }
        }

+        public void SetModel(int modelIndex)
+        {
+            m_ModelIndex = modelIndex;
+            ModelSwitch();
+        }
+


        // Update is called once per frame
--- a//Assets/BossRoom/Scripts/Client/Game/Character/ModelSwap.cs
+++ b//Assets/BossRoom/Scripts/Client/Game/Character/ModelSwap.cs
--- a//Assets/BossRoom/Scripts/Client/Game/Character/ModelSwap.cs.meta
+++ b//Assets/BossRoom/Scripts/Client/Game/Character/ModelSwap.cs.meta