mcutegs2/M-Gameton-06
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'art' into dev

Browse Source 
# Conflicts:
#	Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta
#	Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/MapReferenceScene.unity
#	Gameton-06/ProjectSettings/TagManager.asset
This commit is contained in:
aube.lee
2025-02-13 11:28:53 +09:00
parent 636160f492 f985e5f40c
commit eb371d10ea
36 changed files with 862309 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26887
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/Jiho.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/Jiho.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 13680a75558741248a7104c2613cf978
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LHB_scene.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 07c2e70991189b34e9068dbd230af901
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

74917
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LHB_scene/MapReferenceScene 1.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LHB_scene/MapReferenceScene 1.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8f0c180617f83374cae3c9227138b5b3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 42fbbf74b450b1c449d4005e5290751e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/LH_scene.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b24e8fcd5fd766c4b8921b60724f0d7b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

168093
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/LH_scene/Stage2.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/LH_scene/Stage2.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: acc1cf56fe047e8489f9d44e592fde04
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

74917
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/MapReferenceScene 1.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/MapReferenceScene 1.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 133cd31c5561abe4f8d27af194baf21c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

108778
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/MapReferenceScene 2.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/MapReferenceScene 2.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ae7fe779eedde034abb4b71300d5c48d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

58964
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/MapReferenceScene.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/LH_scene/MapReferenceScene.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9f2eca95960329d40b29f74d084043f6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

57628
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/MapReferenceScene sunho.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/MapReferenceScene sunho.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 30507c5066bfa3a4e98b95da7926bc57
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

52328
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/MapReferenceScene.unity
View File

File diff suppressed because it is too large Load Diff

56112
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/Stage 3-1 MindungmeoriMap.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/Stage 3-1 MindungmeoriMap.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 85d851437b62a91418b5346771250dd9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

57274
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/Stage 3-2 MindungmeoriMap 1.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/Stage 3-2 MindungmeoriMap 1.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e5189ae540e98124b8a235a1df1a5f40
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

95311
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/ddudududu.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/ddudududu.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: afbb13431c7c4b34e9c517629066ad3a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

30735
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/sunho.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/sunho.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ace6214f2df01dc498b982f0a87b0096
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: