1

2024-11-13 17:47:45 +08:00
parent c4af12acd7
commit 416e3322db
208 changed files with 2591757 additions and 1497 deletions
--- a/Assets/Artists/Arts/Backgrounds/background_menu.jpg
+++ b/Assets/Artists/Arts/Backgrounds/background_menu.jpg
--- a/Assets/Artists/Configs/Asset
+++ b/Assets/Artists/Configs/Asset
@@ -12,7 +12,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 80b507ad25f1af24687db7fa18d953fd, type: 3}
  m_Name: Asset Cache
  m_EditorClassIdentifier: 
-  _assets: []
+  _assets:
+  - {fileID: 6597837662838677036, guid: 2bbcc1e35c6def44294f0e9fe4766c0b, type: 3}
  folders:
    _serializedList:
    - Key: Scenes
--- a/Assets/Artists/Configs/New
+++ b/Assets/Artists/Configs/New
@@ -34,7 +34,7 @@ MonoBehaviour:
  m_LODCrossFadeDitheringType: 1
  m_ShEvalMode: 0
  m_MainLightRenderingMode: 1
-  m_MainLightShadowsSupported: 1
+  m_MainLightShadowsSupported: 0
  m_MainLightShadowmapResolution: 2048
  m_AdditionalLightsRenderingMode: 1
  m_AdditionalLightsPerObjectLimit: 4
@@ -54,7 +54,7 @@ MonoBehaviour:
  m_ShadowDepthBias: 1
  m_ShadowNormalBias: 1
  m_AnyShadowsSupported: 1
-  m_SoftShadowsSupported: 1
+  m_SoftShadowsSupported: 0
  m_ConservativeEnclosingSphere: 1
  m_NumIterationsEnclosingSphere: 64
  m_SoftShadowQuality: 2
@@ -82,7 +82,7 @@ MonoBehaviour:
  m_Textures:
    blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
    bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
-  m_PrefilteringModeMainLightShadows: 3
+  m_PrefilteringModeMainLightShadows: 0
  m_PrefilteringModeAdditionalLight: 3
  m_PrefilteringModeAdditionalLightShadows: 0
  m_PrefilterXRKeywords: 1
--- a/Assets/Artists/Configs/Weather/scriptable_weather_city_crossing_day.asset
+++ b/Assets/Artists/Configs/Weather/scriptable_weather_city_crossing_day.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1ee90b8fd1e6ff14188e5fd9f8502255, type: 3}
+  m_Name: scriptable_weather_city_crossing_day
+  m_EditorClassIdentifier: 
+  lightingDataAsset: {fileID: 112000000, guid: 25d0d5da343038347940bb2d348911de, type: 2}
+  sunLightDirection: {x: 59.99977, y: 237.62167, z: 0.000071716495}
+  sunLightColor: {r: 0.6509433, g: 0.7518754, b: 1, a: 1}
+  sunLightIntensity: 2
+  skyboxMaterial: {fileID: 2100000, guid: 302cf695b2b5abe4a9581ff5d339b6a4, type: 2}
+  fogMode: 2
+  fogColor: {r: 0.72156864, g: 0.8431373, b: 0.882353, a: 1}
+  fogDensity: 0.005
--- a/Assets/Artists/Configs/Weather/scriptable_weather_city_crossing_dusk.asset
+++ b/Assets/Artists/Configs/Weather/scriptable_weather_city_crossing_dusk.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1ee90b8fd1e6ff14188e5fd9f8502255, type: 3}
+  m_Name: scriptable_weather_city_crossing_dusk
+  m_EditorClassIdentifier: 
+  lightingDataAsset: {fileID: 112000000, guid: ed972938a057232409608c2878f30921, type: 2}
+  sunLightDirection: {x: 59.99977, y: 237.62167, z: 0.000071716495}
+  sunLightColor: {r: 1, g: 0.6229734, b: 0.3679244, a: 1}
+  sunLightIntensity: 2
+  skyboxMaterial: {fileID: 2100000, guid: 1a8130968946512468b2ef495b8023bd, type: 2}
+  fogMode: 2
+  fogColor: {r: 0.8941177, g: 0.7294118, b: 0.5372549, a: 1}
+  fogDensity: 0.005
--- a/Assets/Artists/Configs/Weather/scriptable_weather_city_crossing_night.asset
+++ b/Assets/Artists/Configs/Weather/scriptable_weather_city_crossing_night.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1ee90b8fd1e6ff14188e5fd9f8502255, type: 3}
+  m_Name: scriptable_weather_city_crossing_night
+  m_EditorClassIdentifier: 
+  lightingDataAsset: {fileID: 112000000, guid: 3a6e02d860bb96144bdb1a761b896028, type: 2}
+  sunLightDirection: {x: 59.99977, y: 237.62167, z: 0.000071716495}
+  sunLightColor: {r: 0.6509433, g: 0.7518754, b: 1, a: 1}
+  sunLightIntensity: 1
+  skyboxMaterial: {fileID: 2100000, guid: 0d904fa38bb756041b611e213cd27a20, type: 2}
+  fogMode: 2
+  fogColor: {r: 0.31446534, g: 0.31446534, b: 0.31446534, a: 1}
+  fogDensity: 0.005
--- a/Assets/Artists/Configs/scriptable/scriptable_animations.asset
+++ b/Assets/Artists/Configs/scriptable/scriptable_animations.asset
@@ -1,50 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc9361f3d76a86b45a39064e46111d59, type: 3}
-  m_Name: Assets/Artists/Configs/scriptable_animations.asset
-  m_EditorClassIdentifier: 
-  animations:
-    _serializedList:
-    - Key: animation_humanoid_step_up
-      Value: {fileID: 3094330708855449807, guid: 6f77ba973a5a61c4ab15ef8362a5b624, type: 3}
-    - Key: animation_humanoid_run
-      Value: {fileID: 3094330708855449807, guid: 05ab35d27bb28ad49bc9c2b098b821ae, type: 3}
-    - Key: animation_humanoid_idle
-      Value: {fileID: 3094330708855449807, guid: ebf6d636f0bdc7642bca3e831800df09, type: 3}
-    - Key: animation_humanoid_walk
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_crouch
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_crouch_l
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_crouch_f
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_crouch_r
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_crouch_b
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_walk_l
-      Value: {fileID: 3094330708855449807, guid: 53ee308983da34a4d9eae29e5b8ebcf0, type: 3}
-    - Key: animation_humanoid_walk_f
-      Value: {fileID: 3094330708855449807, guid: d18c13a5b4b923244a524a76a303e61d, type: 3}
-    - Key: animation_humanoid_walk_r
-      Value: {fileID: 3094330708855449807, guid: 1cb35aa1eecdc0a44a7574a2f50af956, type: 3}
-    - Key: animation_humanoid_walk_b
-      Value: {fileID: 3094330708855449807, guid: ea1152d3598363b4ba8e5a2aaf1b9590, type: 3}
-    - Key: animation_humanoid_idle_l
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_idle_f
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_idle_r
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
-    - Key: animation_humanoid_idle_b
-      Value: {fileID: -203655887218126122, guid: 078997c74e0171e4eb7d040bd598475c, type: 3}
--- a/Assets/Artists/Configs/scriptable/scriptable_player_animations.asset
+++ b/Assets/Artists/Configs/scriptable/scriptable_player_animations.asset
@@ -0,0 +1,81 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 495d5296549fa86488795de870c7aae4, type: 3}
+  m_Name: scriptable_player_animations
+  m_EditorClassIdentifier: 
+  idleAnimations:
+    _serializedList:
+    - Key:
+        x: 0
+        y: 0
+      Value: {fileID: 3094330708855449807, guid: ebf6d636f0bdc7642bca3e831800df09, type: 3}
+  walkAnimations:
+    _serializedList:
+    - Key:
+        x: 0
+        y: 0
+      Value: {fileID: 3094330708855449807, guid: ebf6d636f0bdc7642bca3e831800df09, type: 3}
+    - Key:
+        x: -1
+        y: 0
+      Value: {fileID: 3094330708855449807, guid: ff44bb82f0146a74fb98ea1824cae44a, type: 3}
+    - Key:
+        x: 0
+        y: 1
+      Value: {fileID: 3094330708855449807, guid: d18c13a5b4b923244a524a76a303e61d, type: 3}
+    - Key:
+        x: 1
+        y: 0
+      Value: {fileID: 3094330708855449807, guid: 6ae6fc1ae59ede345b4fb194814f318f, type: 3}
+    - Key:
+        x: 0
+        y: -1
+      Value: {fileID: 3094330708855449807, guid: ea1152d3598363b4ba8e5a2aaf1b9590, type: 3}
+  crouchAnimations:
+    _serializedList:
+    - Key:
+        x: 0
+        y: 0
+      Value: {fileID: 3094330708855449807, guid: aa30e50360fde394fb96e9e6c0ba8e18, type: 3}
+    - Key:
+        x: -1
+        y: 0
+      Value: {fileID: 3094330708855449807, guid: 9aaaba966ff19b94d85b861b188e3c7c, type: 3}
+    - Key:
+        x: 0
+        y: 1
+      Value: {fileID: 3094330708855449807, guid: 8bb16e2bf48f0ba498b4ee70d2518ae0, type: 3}
+    - Key:
+        x: 1
+        y: 0
+      Value: {fileID: 3094330708855449807, guid: a04e7617c7224c140bb54bc5efa749d8, type: 3}
+    - Key:
+        x: 0
+        y: -1
+      Value: {fileID: 3094330708855449807, guid: c8513a8a84992304cbf5d83a50496982, type: 3}
+  inAirAnimations:
+    _serializedList: []
+  runAnimations:
+    _serializedList:
+    - Key: 1
+      Value: {fileID: 3094330708855449807, guid: 05ab35d27bb28ad49bc9c2b098b821ae, type: 3}
+  knockedAnimations:
+    _serializedList:
+    - Key:
+        x: 0
+        y: 0
+      Value: {fileID: 3094330708855449807, guid: dc16ad01d2a511e458758c191e0184de, type: 3}
+  knockingAnimations:
+  - {fileID: 3094330708855449807, guid: 9b137246d561dc540b25d5d2e248a02e, type: 3}
+  deathAnimations: []
+  stepUpAnimations:
+  - {fileID: 3094330708855449807, guid: 6f77ba973a5a61c4ab15ef8362a5b624, type: 3}
--- a/Assets/Artists/Configs/scriptable/scriptable_player_settings.asset
+++ b/Assets/Artists/Configs/scriptable/scriptable_player_settings.asset
@@ -12,4 +12,5 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: bb5e13efe9398434da88451b0b157d0a, type: 3}
  m_Name: Assets/Artists/Configs/scriptable_player_settings.asset
  m_EditorClassIdentifier: 
-  sensitivity: 0.09
+  sensitivity: 1.81
+  gamepadSensitivity: 6
--- a/Assets/Artists/Models/Kumabucks/color_yangdun.mat
+++ b/Assets/Artists/Models/Kumabucks/color_yangdun.mat
@@ -7,24 +7,19 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: colo_yangdun
-  m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3}
+  m_Name: color_yangdun
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSIVE_SIMPLE
-  - _IS_ANGELRING_OFF
-  - _IS_CLIPPING_TRANSMODE
-  - _IS_OUTLINE_CLIPPING_YES
-  - _OUTLINE_NML
+  m_ValidKeywords: []
  m_InvalidKeywords: []
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: -1
  stringTagMap:
    IgnoreProjection: true
-    RenderType: Transparent
+    RenderType: Opaque
  disabledShaderPasses: []
  m_LockedProperties: 
  m_SavedProperties:
--- a/Assets/Artists/Models/Kumabucks/texture_yangdun.png
+++ b/Assets/Artists/Models/Kumabucks/texture_yangdun.png
--- a/Assets/Artists/Models/Kumabucks/yangdun.fbx
+++ b/Assets/Artists/Models/Kumabucks/yangdun.fbx
--- a/Assets/Artists/Prefabs/Player_Base.prefab
+++ b/Assets/Artists/Prefabs/Player_Base.prefab
@@ -178,6 +178,78 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &4604008723045209645
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6230482868901816064}
+  - component: {fileID: 4521177391585727142}
+  m_Layer: 0
+  m_Name: camera_death
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &6230482868901816064
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4604008723045209645}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5012373580952327810}
+  m_Father: {fileID: 5409078068046653646}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4521177391585727142
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4604008723045209645}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ExcludedPropertiesInInspector:
+  - m_Script
+  m_LockStageInInspector: 
+  m_StreamingVersion: 20170927
+  m_Priority: 10
+  m_StandbyUpdate: 2
+  m_LookAt: {fileID: 0}
+  m_Follow: {fileID: 170362110020077398}
+  m_Lens:
+    FieldOfView: 75
+    OrthographicSize: 10
+    NearClipPlane: 0.1
+    FarClipPlane: 5000
+    Dutch: 0
+    ModeOverride: 0
+    LensShift: {x: 0, y: 0}
+    GateFit: 2
+    FocusDistance: 10
+    m_SensorSize: {x: 1, y: 1}
+  m_Transitions:
+    m_BlendHint: 0
+    m_InheritPosition: 0
+    m_OnCameraLive:
+      m_PersistentCalls:
+        m_Calls: []
+  m_LegacyBlendHint: 0
+  m_ComponentOwner: {fileID: 5012373580952327810}
 --- !u!1 &4953658134000561105
 GameObject:
  m_ObjectHideFlags: 0
@@ -250,6 +322,75 @@ MonoBehaviour:
        m_Calls: []
  m_LegacyBlendHint: 0
  m_ComponentOwner: {fileID: 5322233708266222292}
+--- !u!1 &5304755674124373434
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5012373580952327810}
+  - component: {fileID: 3290939858515384911}
+  - component: {fileID: 4824582498268447138}
+  m_Layer: 0
+  m_Name: cm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5012373580952327810
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5304755674124373434}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -41, y: 0, z: -43}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6230482868901816064}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3290939858515384911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5304755674124373434}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &4824582498268447138
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5304755674124373434}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bd6043bde05a7fc4cba197d06915c1e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Damping: {x: 0.1, y: 0.5, z: 0.3}
+  ShoulderOffset: {x: 0.5, y: -0.4, z: 0}
+  VerticalArmLength: 0.4
+  CameraSide: 1
+  CameraDistance: 2
+  CameraCollisionFilter:
+    serializedVersion: 2
+    m_Bits: 1
+  IgnoreTag: 
+  CameraRadius: 0.2
+  DampingIntoCollision: 0
+  DampingFromCollision: 2
 --- !u!1 &6597837662838677036
 GameObject:
  m_ObjectHideFlags: 0
@@ -289,6 +430,7 @@ Transform:
  - {fileID: 3000941450394017340}
  - {fileID: 5898424397362319259}
  - {fileID: 7790705391717203476}
+  - {fileID: 6230482868901816064}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &56232337106050265
@@ -408,22 +550,28 @@ MonoBehaviour:
  _serializedBlackboard: '{"_variables":{"player_view":{"_value":1,"_name":"player_view","_id":"a28d2c46-f3d5-4d32-85f0-cc2c7005f888","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform,
    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"player_model_view":{"_value":2,"_name":"player_model_view","_id":"237bea97-29a1-42f3-9620-74f6682aabe0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform,
    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"player_vault_point":{"_value":3,"_name":"player_vault_point","_id":"f5bf8971-aa2f-49cb-8ce7-13b1097adfc8","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"camera_tps":{"_value":4,"_name":"camera_tps","_id":"e3375d97-0363-4c78-b87b-5f79e26b0553","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera,
-    Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"fps_model":{"_value":[],"_name":"fps_model","_id":"af862b3e-bf88-4482-b175-58a3a89b747c","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer,
+    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"camera_fps":{"_value":4,"_name":"camera_fps","_id":"1a00ab91-c99d-416a-ae42-016334ca51df","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera,
+    Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"camera_tps":{"_value":5,"_name":"camera_tps","_id":"e3375d97-0363-4c78-b87b-5f79e26b0553","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera,
+    Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"fps_model":{"_value":[],"_name":"fps_model","_id":"8312ac1f-8f40-407e-ba8c-7ff940ff0235","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer,
    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]],
-    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"tps_model":{"_value":[5,6,7],"_name":"tps_model","_id":"10388b0b-9298-4c41-9931-18448abe463f","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer,
+    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"tps_model":{"_value":[6,7,8],"_name":"tps_model","_id":"10388b0b-9298-4c41-9931-18448abe463f","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer,
    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]],
    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"layer_interaction":{"_value":{"value":1},"_name":"layer_interaction","_id":"0ff45185-aa6c-4b6f-9575-4f0320c975d9","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.LayerMask,
+    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"camera_death":{"_value":9,"_name":"camera_death","_id":"c17d11ca-5a73-47c3-9b75-acca2f8a20b5","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera,
+    Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"player_model":{"_value":10,"_name":"player_model","_id":"77510471-a7ec-4b6c-be1d-d26d3b3e8d87","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
  _objectReferences:
  - {fileID: 0}
  - {fileID: 5068637431085929427}
  - {fileID: 3000941450394017340}
  - {fileID: 5898424397362319259}
+  - {fileID: 2016646090912036908}
  - {fileID: 7732065237544054777}
  - {fileID: 808002870831096355}
  - {fileID: 6999617879734815103}
  - {fileID: 8508422567226032589}
+  - {fileID: 4521177391585727142}
+  - {fileID: 2396293088462277832}
  _serializedVariables:
  - _json: '{"_value":1,"_name":"player_view","_id":"a28d2c46-f3d5-4d32-85f0-cc2c7005f888","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Transform,
      UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
@@ -440,12 +588,17 @@ MonoBehaviour:
    _references:
    - {fileID: 0}
    - {fileID: 5898424397362319259}
+  - _json: '{"_value":1,"_name":"camera_fps","_id":"1a00ab91-c99d-416a-ae42-016334ca51df","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera,
+      Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+    _references:
+    - {fileID: 0}
+    - {fileID: 2016646090912036908}
  - _json: '{"_value":1,"_name":"camera_tps","_id":"e3375d97-0363-4c78-b87b-5f79e26b0553","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera,
      Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
    _references:
    - {fileID: 0}
    - {fileID: 7732065237544054777}
-  - _json: '{"_value":[],"_name":"fps_model","_id":"af862b3e-bf88-4482-b175-58a3a89b747c","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer,
+  - _json: '{"_value":[],"_name":"fps_model","_id":"8312ac1f-8f40-407e-ba8c-7ff940ff0235","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer,
      UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]],
      mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}'
    _references: []
@@ -460,6 +613,16 @@ MonoBehaviour:
  - _json: '{"_value":{"value":1},"_name":"layer_interaction","_id":"0ff45185-aa6c-4b6f-9575-4f0320c975d9","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.LayerMask,
      UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
    _references: []
+  - _json: '{"_value":1,"_name":"camera_death","_id":"c17d11ca-5a73-47c3-9b75-acca2f8a20b5","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera,
+      Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+    _references:
+    - {fileID: 0}
+    - {fileID: 4521177391585727142}
+  - _json: '{"_value":1,"_name":"player_model","_id":"77510471-a7ec-4b6c-be1d-d26d3b3e8d87","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
+      UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+    _references:
+    - {fileID: 0}
+    - {fileID: 2396293088462277832}
 --- !u!114 &2519517685296362873
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -670,6 +833,11 @@ SkinnedMeshRenderer:
  m_CorrespondingSourceObject: {fileID: -6433774303901412422, guid: c1ca0e46d184c0945b45ad4863c3e66e, type: 3}
  m_PrefabInstance: {fileID: 3278688766353060249}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2396293088462277832 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c1ca0e46d184c0945b45ad4863c3e66e, type: 3}
+  m_PrefabInstance: {fileID: 3278688766353060249}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &3029382626029131378 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c1ca0e46d184c0945b45ad4863c3e66e, type: 3}
--- a/Assets/Artists/Scenes/map_entry.unity
+++ b/Assets/Artists/Scenes/map_entry.unity
@@ -224,7 +224,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1174158329}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: d5a22846b573d5c4685160aed721d514, type: 3}
  m_Name: 
--- a/Assets/Artists/Scenes/map_menu.unity
+++ b/Assets/Artists/Scenes/map_menu.unity
@@ -122,7 +122,7 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1 &91030407
+--- !u!1 &322064944
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -130,78 +130,57 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 91030408}
-  - component: {fileID: 91030411}
-  - component: {fileID: 91030410}
-  - component: {fileID: 91030409}
+  - component: {fileID: 322064945}
+  - component: {fileID: 322064948}
+  - component: {fileID: 322064947}
+  - component: {fileID: 322064946}
  m_Layer: 0
-  m_Name: Image
+  m_Name: button_console
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &91030408
+--- !u!224 &322064945
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 91030407}
+  m_GameObject: {fileID: 322064944}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 514011360}
  m_Father: {fileID: 1826672789}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 228, y: 190}
-  m_SizeDelta: {x: 256, y: 256}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -46.73, y: 444}
+  m_SizeDelta: {x: 64, y: 64}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &91030409
+--- !u!114 &322064946
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 91030407}
+  m_GameObject: {fileID: 322064944}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e9d677f1681015749b15c436eec6d880, type: 3}
+  m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_MovementRange: 50
-  m_DynamicOriginRange: 100
-  m_ControlPath: <Gamepad>/leftStick
-  m_Behaviour: 0
-  m_UseIsolatedInputActions: 0
-  m_PointerDownAction:
-    m_Name: 
-    m_Type: 0
-    m_ExpectedControlType: 
-    m_Id: d7b33c51-dae4-4f1b-9643-00f9a3e9855d
-    m_Processors: 
-    m_Interactions: 
-    m_SingletonActionBindings: []
-    m_Flags: 0
-  m_PointerMoveAction:
-    m_Name: 
-    m_Type: 0
-    m_ExpectedControlType: 
-    m_Id: a38cce37-ecd3-4ecf-bfdc-946c7004aae8
-    m_Processors: 
-    m_Interactions: 
-    m_SingletonActionBindings: []
-    m_Flags: 0
--- !u!114 &91030410
+  m_ControlPath: <Keyboard>/backquote
+--- !u!114 &322064947
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 91030407}
+  m_GameObject: {fileID: 322064944}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -225,13 +204,13 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!222 &91030411
+--- !u!222 &322064948
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 91030407}
+  m_GameObject: {fileID: 322064944}
  m_CullTransparentMesh: 1
 --- !u!1 &435750794
 GameObject:
@@ -246,7 +225,7 @@ GameObject:
  - component: {fileID: 435750797}
  - component: {fileID: 435750796}
  m_Layer: 0
-  m_Name: Image (4)
+  m_Name: button_toggleView
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -263,12 +242,13 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1292158265}
  m_Father: {fileID: 1826672789}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0}
  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -180, y: 439}
+  m_AnchoredPosition: {x: -110, y: 204}
  m_SizeDelta: {x: 64, y: 64}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &435750796
@@ -322,6 +302,156 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 435750794}
  m_CullTransparentMesh: 1
+--- !u!1 &514011359
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 514011360}
+  - component: {fileID: 514011362}
+  - component: {fileID: 514011361}
+  m_Layer: 0
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &514011360
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 514011359}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 322064945}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -24, y: -24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &514011361
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 514011359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 936d4e7e4eff78f4d9d62601cbef1818, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &514011362
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 514011359}
+  m_CullTransparentMesh: 1
+--- !u!1 &526170913
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 526170914}
+  - component: {fileID: 526170916}
+  - component: {fileID: 526170915}
+  m_Layer: 0
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &526170914
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 526170913}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1876037496}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -24, y: -24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &526170915
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 526170913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: f75638302ccf8ba41acbf96be794e86d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &526170916
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 526170913}
+  m_CullTransparentMesh: 1
 --- !u!1 &538493207
 GameObject:
  m_ObjectHideFlags: 0
@@ -491,7 +621,7 @@ MonoBehaviour:
  m_FirstSelected: {fileID: 0}
  m_sendNavigationEvents: 1
  m_DragThreshold: 10
--- !u!1 &1445691558
+--- !u!1 &1292158264
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -499,10 +629,84 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 1445691559}
-  - component: {fileID: 1445691562}
-  - component: {fileID: 1445691561}
-  - component: {fileID: 1445691560}
+  - component: {fileID: 1292158265}
+  - component: {fileID: 1292158267}
+  - component: {fileID: 1292158266}
+  m_Layer: 0
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1292158265
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1292158264}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 435750795}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -32, y: -32}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1292158266
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1292158264}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 3e1e9a9b6a5fcd846b968c314a55da8b, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1292158267
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1292158264}
+  m_CullTransparentMesh: 1
+--- !u!1 &1333630871
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1333630872}
+  - component: {fileID: 1333630874}
+  - component: {fileID: 1333630873}
  m_Layer: 0
  m_Name: Image (1)
  m_TagString: Untagged
@@ -510,67 +714,122 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &1445691559
+--- !u!224 &1333630872
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1445691558}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 1333630871}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
+  m_Father: {fileID: 2042865998}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -32, y: -32}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1333630873
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1333630871}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ba14ff41fff179940a74b985f742b85e, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1333630874
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1333630871}
+  m_CullTransparentMesh: 1
+--- !u!1 &1432788300
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1432788301}
+  - component: {fileID: 1432788304}
+  - component: {fileID: 1432788303}
+  - component: {fileID: 1432788302}
+  m_Layer: 0
+  m_Name: button_run
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1432788301
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1432788300}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1750435635}
  m_Father: {fileID: 1826672789}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0}
  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -244, y: 190}
-  m_SizeDelta: {x: 256, y: 256}
+  m_AnchoredPosition: {x: -110.73, y: 68}
+  m_SizeDelta: {x: 64, y: 64}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1445691560
+--- !u!114 &1432788302
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1445691558}
+  m_GameObject: {fileID: 1432788300}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e9d677f1681015749b15c436eec6d880, type: 3}
+  m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_MovementRange: 50
-  m_DynamicOriginRange: 100
-  m_ControlPath: <Gamepad>/rightStick
-  m_Behaviour: 0
-  m_UseIsolatedInputActions: 0
-  m_PointerDownAction:
-    m_Name: 
-    m_Type: 0
-    m_ExpectedControlType: 
-    m_Id: 64e6a4ff-5f89-444c-819a-73c4d33d1157
-    m_Processors: 
-    m_Interactions: 
-    m_SingletonActionBindings: []
-    m_Flags: 0
-  m_PointerMoveAction:
-    m_Name: 
-    m_Type: 0
-    m_ExpectedControlType: 
-    m_Id: 370cbcf9-a31d-4617-b2f7-8d713d388a68
-    m_Processors: 
-    m_Interactions: 
-    m_SingletonActionBindings: []
-    m_Flags: 0
--- !u!114 &1445691561
+  m_ControlPath: <Keyboard>/leftShift
+--- !u!114 &1432788303
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1445691558}
+  m_GameObject: {fileID: 1432788300}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -594,13 +853,199 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!222 &1445691562
+--- !u!222 &1432788304
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1445691558}
+  m_GameObject: {fileID: 1432788300}
+  m_CullTransparentMesh: 1
+--- !u!1 &1630997671
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1630997672}
+  - component: {fileID: 1630997674}
+  - component: {fileID: 1630997673}
+  - component: {fileID: 1630997675}
+  m_Layer: 0
+  m_Name: joystick_movement
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1630997672
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630997671}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1826672789}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 384, y: 0}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &1630997673
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630997671}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1630997674
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630997671}
+  m_CullTransparentMesh: 1
+--- !u!114 &1630997675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630997671}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d677f1681015749b15c436eec6d880, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MovementRange: 50
+  m_DynamicOriginRange: 100
+  m_ControlPath: <Gamepad>/leftStick
+  m_Behaviour: 0
+  m_UseIsolatedInputActions: 0
+  m_PointerDownAction:
+    m_Name: 
+    m_Type: 0
+    m_ExpectedControlType: 
+    m_Id: 6c601e9e-57bf-4dc1-a122-7df342ca287a
+    m_Processors: 
+    m_Interactions: 
+    m_SingletonActionBindings: []
+    m_Flags: 0
+  m_PointerMoveAction:
+    m_Name: 
+    m_Type: 0
+    m_ExpectedControlType: 
+    m_Id: f3bf22d7-e520-439b-bc16-a053007a2234
+    m_Processors: 
+    m_Interactions: 
+    m_SingletonActionBindings: []
+    m_Flags: 0
+--- !u!1 &1750435634
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1750435635}
+  - component: {fileID: 1750435637}
+  - component: {fileID: 1750435636}
+  m_Layer: 0
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1750435635
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1750435634}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1432788301}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -24, y: -24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1750435636
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1750435634}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 20c29de72b51c9344b5fef47e6472693, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1750435637
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1750435634}
  m_CullTransparentMesh: 1
 --- !u!1 &1826672788
 GameObject:
@@ -633,9 +1078,10 @@ RectTransform:
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 91030408}
-  - {fileID: 1445691559}
+  - {fileID: 1630997672}
  - {fileID: 1876037496}
+  - {fileID: 1432788301}
+  - {fileID: 322064945}
  - {fileID: 2042865998}
  - {fileID: 435750795}
  m_Father: {fileID: 538493212}
@@ -674,10 +1120,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
  m_ReferencePixelsPerUnit: 100
  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 917, y: 412}
  m_ScreenMatchMode: 0
  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
@@ -721,7 +1167,7 @@ GameObject:
  - component: {fileID: 1876037498}
  - component: {fileID: 1876037497}
  m_Layer: 0
-  m_Name: Image (2)
+  m_Name: button_jump
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -738,12 +1184,13 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 526170914}
  m_Father: {fileID: 1826672789}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0}
  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -524, y: 85}
+  m_AnchoredPosition: {x: -256, y: 68}
  m_SizeDelta: {x: 64, y: 64}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1876037497
@@ -810,7 +1257,7 @@ GameObject:
  - component: {fileID: 2042866000}
  - component: {fileID: 2042865999}
  m_Layer: 0
-  m_Name: Image (3)
+  m_Name: button_interactive
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -827,12 +1274,13 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1333630872}
  m_Father: {fileID: 1826672789}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0}
  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -308, y: 439}
+  m_AnchoredPosition: {x: -214, y: 204}
  m_SizeDelta: {x: 64, y: 64}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2042865999
--- a/Assets/Artists/Scripts/Program.cs
+++ b/Assets/Artists/Scripts/Program.cs
@@ -3,7 +3,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
 using BITKit;
+using BITKit.Console;
 using BITKit.Mod;
+using BITKit.Pool;
 using BITKit.UX;
 using BITKit.WorldNode;
 using Cysharp.Threading.Tasks;
@@ -14,6 +16,7 @@ using Microsoft.Extensions.Hosting.Unity;
 using Microsoft.Extensions.Logging;
 using Net.Like.Xue.Tokyo.GameService;
 using Net.Like.Xue.Tokyo.UX;
+using Net.Project.B.Health;
 using Net.Project.B.Interaction;
 using Net.Project.B.WorldNode;
 using Project.B.Animation;
@@ -51,12 +54,21 @@ namespace Net.Like.Xue.Tokyo

                //玩家角色控制器服务
                serviceCollection.AddSingleton<ICharacterService, CharacterService>();
+                
+                //玩家生命值
+                serviceCollection.AddSingleton<IHealthService, HealthService>();
+                //对象池
+                serviceCollection.AddSingleton<IPoolService, UnityPoolService>();
+                //击倒服务
+                serviceCollection.AddSingleton<IKnockedService, KnockedService>();

+                var scriptablePlayerAnimation =await 
+                    ModService.LoadAsset<ScriptablePlayerAnimationFactory>("scriptable_player_animations");
                //玩家动画
-                serviceCollection.AddSingleton<IPlayerAnimationFactory, PlayerAnimationFactory>();
+                serviceCollection.AddSingleton<IPlayerAnimationFactory>(scriptablePlayerAnimation);

                //注册实体工厂
-                serviceCollection.AddProjectBEntitiesFactory();
+                serviceCollection.AddSingleton<IPlayerFactory, YangdunCreateFactory>();

                //注册地图服务
                serviceCollection.AddSingleton<IGameMapService, GameMapService>();
@@ -93,6 +105,7 @@ namespace Net.Like.Xue.Tokyo
                serviceCollection.AddSingleton<UXMap>();
                serviceCollection.AddSingleton<UXLoadingMap>();
                serviceCollection.AddSingleton<UXMenu>();
+                serviceCollection.AddSingleton<UXConsole>();

                //生成玩家
                serviceCollection.AddSingleton<GameSpawnPlayerService>();
@@ -141,7 +154,9 @@ namespace Net.Like.Xue.Tokyo
            //初始化场景高亮
            serviceProvider.GetRequiredService<WorldHighlightService>();

-            Application.targetFrameRate = 60;
+            serviceProvider.GetRequiredService<UXConsole>();
+
+            Application.targetFrameRate = 90;

            await destroyCancellationToken.WaitUntilCanceled();
        }
--- a/Assets/Artists/Scripts/UX/UXHud.cs
+++ b/Assets/Artists/Scripts/UX/UXHud.cs
@@ -93,7 +93,7 @@ namespace Net.Like.Xue.Tokyo.UX
            var point = _minimapCamera.WorldToViewportPoint(_mainCamera.transform.position);

            _miniPlayer.style.left = _minimapContainer.layout.width * point.x - _miniPlayer.layout.width / 2;
-            _miniPlayer.style.top = _minimapContainer.layout.height * point.y - _miniPlayer.layout.height / 2;
+            _miniPlayer.style.top = _minimapContainer.layout.height * (1-point.y) - _miniPlayer.layout.height / 2;
        }
    }

--- a/Assets/Artists/Scripts/UX/UXMap.cs
+++ b/Assets/Artists/Scripts/UX/UXMap.cs
@@ -41,7 +41,7 @@ namespace Net.Like.Xue.Tokyo.UX
            var point = _minimapCamera.WorldToViewportPoint(_mainCamera.transform.position);
            
            _miniPlayer.style.left = _minimapContainer.layout.width * point.x - _miniPlayer.layout.width / 2;
-            _miniPlayer.style.top = _minimapContainer.layout.height * point.y - _miniPlayer.layout.height / 2;
+            _miniPlayer.style.top = _minimapContainer.layout.height * (1-point.y) - _miniPlayer.layout.height / 2;
        }
    }

--- a/Assets/Artists/Scripts/Weather/Net.Like.Xue.Tokyo.Weather.Unity.asmdef
+++ b/Assets/Artists/Scripts/Weather/Net.Like.Xue.Tokyo.Weather.Unity.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "Net.Like.Xue.Tokyo.Weather.Unity",
+    "rootNamespace": "",
+    "references": [
+        "GUID:14fe60d984bf9f84eac55c6ea033a8f4"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
--- a/Assets/Artists/Scripts/Weather/ScriptableWeather.cs
+++ b/Assets/Artists/Scripts/Weather/ScriptableWeather.cs
@@ -0,0 +1,62 @@
+using System.Collections;
+using System.Collections.Generic;
+using BITKit;
+using UnityEngine;
+
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+namespace Net.Like.Xue.Tokyo.Weather
+{
+    public class ScriptableWeather : ScriptableObject
+    {
+        #if UNITY_EDITOR
+        [SerializeField] private LightingDataAsset lightingDataAsset;
+        #endif
+        [SerializeField] private Vector3 sunLightDirection = new Vector3(0, 1, 0);
+        [SerializeField] private Color sunLightColor;
+        [SerializeField] private float sunLightIntensity = 1;
+        [SerializeField] private Material skyboxMaterial;
+        [SerializeField] private FogMode fogMode;
+        [SerializeField] private Color fogColor;
+        [SerializeField] private float fogDensity;
+
+        [BIT]
+        public void Save()
+        {
+#if UNITY_EDITOR
+            lightingDataAsset = Lightmapping.lightingDataAsset;
+            #endif
+
+            sunLightDirection = RenderSettings.sun.transform.eulerAngles;
+            sunLightIntensity = RenderSettings.sun.intensity;
+            sunLightColor = RenderSettings.sun.color;
+
+            skyboxMaterial = RenderSettings.skybox;
+            
+            fogMode = RenderSettings.fogMode;
+            fogColor = RenderSettings.fogColor;
+            fogDensity = RenderSettings.fogDensity;
+#if UNITY_EDITOR
+            EditorUtility.SetDirty(this);
+            #endif
+        }
+
+        [BIT]
+        public void Load()
+        {
+#if UNITY_EDITOR
+            Lightmapping.lightingDataAsset = lightingDataAsset;
+            #endif
+            RenderSettings.sun.transform.eulerAngles = sunLightDirection;
+            RenderSettings.sun.intensity = sunLightIntensity;
+            RenderSettings.skybox = skyboxMaterial;
+            RenderSettings.fogMode = fogMode;
+            RenderSettings.fogColor = fogColor;
+            RenderSettings.fogDensity = fogDensity;
+        }
+    }
+
+}
+
--- a/Assets/Artists/Scripts/WorldOptimizeService.cs
+++ b/Assets/Artists/Scripts/WorldOptimizeService.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using MeshCombineStudio;
+using NGS.AdvancedCullingSystem.Dynamic;
+using UnityEngine;
+
+namespace Net.Like.Xue.Tokyo
+{
+    public class WorldOptimizeService : MonoBehaviour
+    {
+        [SerializeField] private Transform[] sources;
+        [SerializeField] private Camera minimapCamera;
+        private void Awake()
+        {
+            GetComponent<MeshCombiner>().onCombiningReady += OnReady;
+        }
+        private void OnReady(MeshCombiner meshcombiner)
+        {
+            minimapCamera.Render();
+            minimapCamera.enabled = false;
+            
+            
+            var controller = gameObject.AddComponent<DC_Controller>();
+            controller.AddCamera(Camera.main,3000);
+            foreach (var x in sources)
+            {
+                foreach (var renderer in x.GetComponentsInChildren<MeshRenderer>())
+                {
+                    if (renderer.gameObject.activeInHierarchy)
+                        controller.AddObjectForCulling(renderer);
+                }
+            }
+        
+        }
+    }
+
+}
--- a/Assets/Artists/Scripts/YangdunCreateFactory.cs
+++ b/Assets/Artists/Scripts/YangdunCreateFactory.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Animancer;
+using BITKit;
+using BITKit.Entities;
+using BITKit.GameSocket;
+using BITKit.WorldNode;
+using Cinemachine;
+using Cysharp.Threading.Tasks;
+using Lightbug.CharacterControllerPro.Core;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
+using Net.Project.B.Health;
+using Net.Project.B.Interaction;
+using Net.Project.B.Inventory;
+using Net.Project.B.Weapon;
+using NodeCanvas.Framework;
+using Project.B.Animation;
+using Project.B.CharacterController;
+using Project.B.Entities;
+using UnityEngine;
+using YooAsset;
+using Object = UnityEngine.Object;
+namespace Net.Like.Xue.Tokyo
+{
+    public class YangdunCreateFactory : IPlayerFactory
+    {
+          private readonly ILogger<PlayerFactory> _logger;
+        private readonly IServiceCollection _serviceCollection;
+        private readonly IServiceProvider _serviceProvider;
+        private readonly IWorldNodeService _worldNodeService;
+        private const string PlayerPath = "Player_Base";
+        private readonly List<(IEntity entity,GameObject go)> _entities = new();
+        private readonly IHealthService _healthService;
+        private GameObject _playerPrefab;
+        private readonly InputActionGroup _inputActionGroup=new();
+
+        private UniTaskCompletionSource<WorldInfoPlayerStart> _waitPlayerStart=new();
+
+        public YangdunCreateFactory(IServiceProvider serviceProvider, IServiceCollection serviceCollection, IWorldNodeService worldNodeService, ILogger<PlayerFactory> logger, IHealthService healthService)
+        {
+            _serviceProvider = serviceProvider;
+            _serviceCollection = serviceCollection;
+            _worldNodeService = worldNodeService;
+            _logger = logger;
+            _healthService = healthService;
+
+            _worldNodeService.OnNodeRegistered += OnNodeRegistered;
+            
+            _healthService.OnHealthChanged+=OnHealthChanged;
+        }
+
+        private void OnNodeRegistered(IWorldNode obj)
+        {
+            if(obj is not WorldInfoPlayerStart infoPlayerStart)return;
+            _waitPlayerStart.TrySetResult(infoPlayerStart);
+        }
+
+        public async UniTask<IEntity> CreateAsync(string addressablePath)
+        {
+            await UniTask.SwitchToMainThread();
+            if (_playerPrefab is not null)
+            {
+                return await Create(addressablePath);
+            }
+            var asyncHandle = YooAssets.LoadAssetAsync<GameObject>(PlayerPath);
+            await asyncHandle;
+            _playerPrefab = asyncHandle.AssetObject as GameObject;
+            
+            return await Create(addressablePath);
+        }
+
+        public event Func<string, IEntity,UniTask> OnEntityCreate;
+        public event Func<string, IEntity,UniTask> OnEntityCreated;
+
+        private async UniTask<IEntity> Create(string addressablePath = null)
+        {
+            var entity = new Entity();
+
+            var startNode = await _waitPlayerStart.Task;
+            var startTransform = startNode.WorldObject.As<GameObject>().transform;
+
+            _waitPlayerStart = new();
+            
+            var go = Object.Instantiate(_playerPrefab,startTransform.position,startTransform.rotation);
+
+            entity.ServiceCollection.Add(_serviceCollection);
+
+            go.GetCancellationTokenOnDestroy().Register(entity.Dispose);
+
+            entity.ServiceCollection.AddSingleton<IEntity>(entity);
+
+            entity.ServiceCollection.AddSingleton(go);
+            entity.ServiceCollection.AddSingleton(go.transform);
+
+            entity.ServiceCollection.AddSingleton(go.GetComponent<IBlackboard>());
+            
+            entity.ServiceCollection.AddSingleton(go.GetComponent<CharacterActor>());
+            entity.ServiceCollection.AddSingleton(go.GetComponentInChildren<CinemachineVirtualCameraBase>());
+            entity.ServiceCollection.AddSingleton<IAnimancerComponent>(go.GetComponent<AnimancerComponent>());
+
+            entity.ServiceCollection.AddSingleton<IPlayerCharacterController, PlayerCharacterController>();
+            entity.ServiceCollection.AddSingleton<ICharacterController>(x=>x.GetRequiredService<IPlayerCharacterController>().CharacterController);
+
+            entity.ServiceCollection.AddSingleton(_inputActionGroup);
+            
+            
+            entity.ServiceCollection.AddSingleton<ICharacterStateWalk, CharacterWalkState>();
+            entity.ServiceCollection.AddSingleton<ICharacterStateIdle, CharacterIdleState>();
+            entity.ServiceCollection.AddSingleton<ICharacterStateCrouched, CharacterCrouchedState>();
+            entity.ServiceCollection.AddSingleton<ICharacterStateRun, CharacterRunState>();
+            entity.ServiceCollection.AddSingleton<ICharacterSprint, CharacterSprintState>();
+            entity.ServiceCollection.AddSingleton<ICharacterStateStepUp, CharacterStepUpState>();
+            entity.ServiceCollection.AddSingleton<ICharacterKnocked, CharacterKnockedState>();
+
+            entity.ServiceCollection.AddSingleton<PlayerCameraController>();
+            entity.ServiceCollection.AddSingleton<PlayerModelController>();
+
+            entity.ServiceCollection.AddSingleton<PlayerAnimancerController>();
+
+            entity.ServiceCollection.AddSingleton(_serviceProvider.GetRequiredService<IWorldInteractionService>());
+            entity.ServiceCollection.AddSingleton<PlayerInteractionController>();
+
+
+            await OnEntityCreate.UniTaskFunc(addressablePath,entity);
+
+            entity.ServiceProvider.GetRequiredService<ICharacterStateWalk>();
+
+            entity.ServiceProvider.GetRequiredService<PlayerInteractionController>();
+            
+            var characterController = entity.ServiceProvider.GetRequiredService<ICharacterController>();
+            
+            characterController.TransitionState<ICharacterStateWalk>();
+            
+            entity.ServiceProvider.GetRequiredService<PlayerAnimancerController>();
+
+            entity.ServiceProvider.GetRequiredService<PlayerCameraController>();
+            
+            entity.ServiceProvider.GetRequiredService<PlayerModelController>();
+
+            
+            await OnEntityCreated.UniTaskFunc(addressablePath,entity);
+            
+            _entities.Add(new ValueTuple<IEntity, GameObject>(entity,go));
+            
+            _logger.LogInformation($"Player Created. {entity.Id}");
+            
+            
+            return entity;
+        }
+
+        public async void Dispose()
+        {
+            await UniTask.SwitchToMainThread();
+            foreach (var (entity, go) in _entities)
+            {
+                if (entity is IDisposable disposable)
+                {
+                    disposable.Dispose();
+                }
+                if (go)
+                    Object.Destroy(go);
+            }
+            _healthService.OnHealthChanged-=OnHealthChanged;
+        }
+        private void OnHealthChanged(int arg1, int arg2, int arg3, object arg4)
+        {
+            _inputActionGroup.allowInput.SetDisableElements(this,arg3<0);
+        }
+    }
+
+}
--- a/Assets/Artists/UX/Style.uss
+++ b/Assets/Artists/UX/Style.uss
@@ -20,3 +20,9 @@
    flex-grow: 1;
    transition-duration: 0.2s;
 }
+
+.level-button:focus {
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+    flex-grow: 1;
+    transition-duration: 0.2s;
+}
--- a/Assets/Artists/UX/ux_console.uxml
+++ b/Assets/Artists/UX/ux_console.uxml
@@ -0,0 +1,4 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <ui:Template name="BITConsole" src="project://database/Assets/BITKit/Unity/UX/BITConsole.uxml?fileID=9197481963319205126&amp;guid=b42b9a148466f1f41a27bfc482972943&amp;type=3#BITConsole" />
+    <ui:Instance template="BITConsole" name="BITConsole" picking-mode="Ignore" style="flex-grow: 1;" />
+</ui:UXML>
--- a/Assets/Artists/UX/ux_hud.uxml
+++ b/Assets/Artists/UX/ux_hud.uxml
@@ -6,4 +6,12 @@
        </ui:VisualElement>
    </ui:VisualElement>
    <ui:Label tabindex="-1" text="互动" parse-escape-sequences="true" display-tooltip-when-elided="true" name="interaction-tips" class="flex-center tl" style="top: 32px; background-color: rgba(0, 0, 0, 0.78); padding-top: 4px; padding-right: 8px; padding-bottom: 4px; padding-left: 8px;" />
+    <ui:VisualElement picking-mode="Ignore" class="root">
+        <ui:VisualElement style="margin-top: auto; margin-right: auto; margin-bottom: 16px; margin-left: auto; flex-direction: row; align-items: center; background-color: rgba(0, 0, 0, 0.78); width: 256px;">
+            <ui:VisualElement style="width: 64px; height: 64px; background-image: url(&quot;project://database/Assets/Artists/Arts/Avatars/avatar_player.jpg?fileID=2800000&amp;guid=dc1a7b7a5cc9437438280932e8b541a0&amp;type=3#avatar_player&quot;);" />
+            <ui:VisualElement style="flex-grow: 1; margin-top: 5px; margin-right: 5px; margin-bottom: 5px; margin-left: 5px;">
+                <ui:Label tabindex="-1" text="羊顿爵士" parse-escape-sequences="true" display-tooltip-when-elided="true" class="tl" style="flex-grow: 1;" />
+            </ui:VisualElement>
+        </ui:VisualElement>
+    </ui:VisualElement>
 </ui:UXML>
--- a/Assets/Artists/UX/ux_loading_map.uxml
+++ b/Assets/Artists/UX/ux_loading_map.uxml
@@ -2,7 +2,7 @@
    <Style src="project://database/Assets/BITKit/Unity/UX/Common/Common.uss?fileID=7433441132597879392&amp;guid=a3a69d3518fd02b489e721f3c5b0b539&amp;type=3#Common" />
    <ui:VisualElement class="root" style="background-image: url(&quot;project://database/Assets/Artists/Arts/Backgrounds/background_menu.jpg?fileID=21300000&amp;guid=5abe2ac5974a6104fbf483cf5f3f19eb&amp;type=3#background_menu&quot;); background-color: rgb(0, 0, 0); -unity-background-image-tint-color: rgba(255, 255, 255, 0.32);" />
    <ui:VisualElement class="flex-center" style="min-width: 256px;">
-        <ui:ProgressBar value="48.2" name="load-progress" style="background-color: rgba(255, 255, 255, 0.21);" />
+        <ui:ProgressBar value="48.2" name="load-progress" style="background-color: rgba(255, 255, 255, 0.21); height: 4px; width: 512px;" />
        <ui:VisualElement style="flex-direction: row; justify-content: space-between;">
            <ui:Label tabindex="-1" text="map_tokyo" parse-escape-sequences="true" display-tooltip-when-elided="true" name="map-label" class="tl" />
            <ui:Label tabindex="-1" text="加载中..." parse-escape-sequences="true" display-tooltip-when-elided="true" name="load_step-label" />
--- a/Assets/Artists/UX/ux_menu.uxml
+++ b/Assets/Artists/UX/ux_menu.uxml
@@ -1,12 +1,12 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
    <Style src="project://database/Assets/BITKit/Unity/UX/Common/Common.uss?fileID=7433441132597879392&amp;guid=a3a69d3518fd02b489e721f3c5b0b539&amp;type=3#Common" />
    <Style src="project://database/Assets/Artists/UX/Style.uss?fileID=7433441132597879392&amp;guid=506d41b7c5d56a44bb5845e69055a5eb&amp;type=3#Style" />
-    <ui:VisualElement class="root" style="background-image: url(&quot;project://database/Assets/Artists/Arts/Backgrounds/background_menu.jpg?fileID=21300000&amp;guid=5abe2ac5974a6104fbf483cf5f3f19eb&amp;type=3#background_menu&quot;); -unity-background-scale-mode: scale-and-crop; background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgba(255, 255, 255, 0.51);" />
+    <ui:VisualElement class="root" style="background-image: url(&quot;project://database/Assets/Artists/Arts/Backgrounds/background_menu.jpg?fileID=21300000&amp;guid=5abe2ac5974a6104fbf483cf5f3f19eb&amp;type=3#background_menu&quot;); -unity-background-scale-mode: scale-and-crop; background-color: rgb(0, 0, 0); -unity-background-image-tint-color: rgba(255, 255, 255, 0.35);" />
    <ui:VisualElement name="level-container" style="flex-direction: row; flex-grow: 1;">
        <ui:Button view-data-key="map_city_crossing" class="level-button" style="background-image: url(&quot;project://database/Assets/Artists/Arts/Textures/texture_akiba.jpg?fileID=21300000&amp;guid=4f4c68ed2c65cee4d98fa5dc45e00c8b&amp;type=3#texture_akiba&quot;);" />
        <ui:Button view-data-key="map_suburbs" class="level-button" style="background-image: url(&quot;project://database/Assets/Artists/Arts/Textures/texture_suburb.jpg?fileID=21300000&amp;guid=8de2e8ea76d2fbb4f946bfb49bab55fd&amp;type=3#texture_suburb&quot;);" />
        <ui:Button view-data-key="map_street" class="level-button" style="background-image: url(&quot;project://database/Assets/Artists/Arts/Textures/texture_street.jpg?fileID=21300000&amp;guid=4b7dac409ae6a5849b3088d55792c00b&amp;type=3#texture_street&quot;);" />
-        <ui:VisualElement style="flex-grow: 1; background-color: rgb(22, 22, 22);">
+        <ui:VisualElement style="flex-grow: 1;">
            <ui:VisualElement class="flex-center">
                <ui:Label tabindex="-1" text="立课学日语" parse-escape-sequences="true" display-tooltip-when-elided="true" class="tl" />
                <ui:Label tabindex="-1" text="选择入口" parse-escape-sequences="true" display-tooltip-when-elided="true" />