iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg

Browse Source 
# Conflicts:
#	Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta
#	Assets/Icons - Picto Total Pack/PNG/Style2_CasualGame(320)/Before(v1.0)/Before_(v1.0).unitypackage.meta
#	Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta
#	Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta
#	Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta
#	Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta
#	Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta
This commit is contained in:
Nam Tae Gun 2024-06-13 15:55:09 +09:00
commit 66ee152be1
6 changed files with 24296 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19716
Assets/01.Scenes/99.Combat.unity Normal file
View File

File diff suppressed because one or more lines are too long

7
Assets/01.Scenes/99.Combat.unity.meta Normal file
View File

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

1
Assets/04.Materials/TransparentLit.mat
View File

@ -38,6 +38,7 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3

4763
Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab
View File

File diff suppressed because it is too large Load Diff

59
Assets/05.Prefabs/Props/Environment/Bush01.prefab Normal file
View File

@ -0,0 +1,59 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &8423093241502773175
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3210918493867778633, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
propertyPath: m_Name
value: BasePropsOpaqueLit
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e985c83e28c6c974788e1324afc1706b, type: 3}

7
Assets/05.Prefabs/Props/Environment/Bush01.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 33d204c504259424fa44b92c62d27dc3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: