BlueCabinetGames/GeoSusGame
8
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict resolve

Browse Source
This commit is contained in:
trubkokrtek
2026-05-17 11:25:21 +02:00
parent f800e78f14
commit c8d8b6b802
6 changed files with 798 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

914
Assets/GameManager/GameManager_Input.cs
View File

File diff suppressed because it is too large Load Diff

2
Assets/Materials.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 579723ff3377eaf4a9e50b2d20bbb490 guid: 2230bf768ecb84610af77bea6cdd7074
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

2
Assets/New Material.mat.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 14e7660f277f5414ab8b483f12ca6e3a guid: 7142a58f80866aba3ae4ffeb79d5f67c
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0

2
Assets/_Recovery.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d8e0b736547e8cf4f98d5f7832d39867 guid: b9c8f9e5bbf063b4fb1152966129a495
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

2
Assets/host a join.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6279204888b22964e9ddee5def64f698 guid: 0f6331bfef5b3a00cb6f84141e60f9c4
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

2
Assets/main menu.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 73f88b8c97995af4eab9d0126a697831 guid: 43d195e24415843378eb1b53e9e1da18
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}