Conflict resolve

2026-05-17 11:25:21 +02:00
parent f800e78f14
commit c8d8b6b802
6 changed files with 798 additions and 126 deletions
--- a/Assets/GameManager/GameManager_Input.cs
+++ b/Assets/GameManager/GameManager_Input.cs
--- a/Assets/Materials.meta
+++ b/Assets/Materials.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 579723ff3377eaf4a9e50b2d20bbb490
+guid: 2230bf768ecb84610af77bea6cdd7074
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Material.mat.meta
+++ b/Material.mat.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 14e7660f277f5414ab8b483f12ca6e3a
+guid: 7142a58f80866aba3ae4ffeb79d5f67c
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/_Recovery.meta
+++ b/Assets/_Recovery.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d8e0b736547e8cf4f98d5f7832d39867
+guid: b9c8f9e5bbf063b4fb1152966129a495
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/host
+++ b/Assets/host
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6279204888b22964e9ddee5def64f698
+guid: 0f6331bfef5b3a00cb6f84141e60f9c4
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/main
+++ b/Assets/main
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 73f88b8c97995af4eab9d0126a697831
+guid: 43d195e24415843378eb1b53e9e1da18
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}