OldBlueWater/BlueWater/Assets
NTG 2cba165516 Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG
# Conflicts:
#	BlueWater/Assets/01.Scenes/99.art_Tycoon.meta
#	BlueWater/Assets/01.Scenes/99.art_Tycoon.unity.meta
#	BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for SW2 Underwater Integration.unitypackage.meta
#	BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta
#	BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta
#	BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta
2024-01-14 17:06:38 +09:00
..
01.Scenes Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG 2024-01-14 17:06:38 +09:00
02.Scripts #111 대포 로직 변경 중 2024-01-11 16:17:29 +09:00
03.Images 스프라이트 토끼 주인공, NPC 이미지 파일들 03.Images\Characters\Npcs 폴더에 복붙 2024-01-14 15:46:00 +09:00
03.Materials [HOTFIX] 1st. everything and spum merge error fix 2024-01-12 13:32:11 +09:00
04.Fonts Closes #65 WorkBtn - WorkClean, WorkEngine 2023-12-05 15:20:20 +09:00
05.Prefabs Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG 2024-01-14 17:06:38 +09:00
07.Animation Closes #70 #79 #87 2024-01-03 06:39:53 +09:00
08.Models #70 물고기 Ai 작업 2023-12-29 14:59:04 +09:00
09.BehaviorTree #43 FieldBoss01 Test.ver007 2023-12-05 15:08:22 +09:00
10.Shaders #70 물고기 Ai 작업 2023-12-29 14:59:04 +09:00
AddressableAssetsData art02 2024-01-11 20:26:21 +09:00
AllIn1SpriteShader art02 2024-01-11 20:26:21 +09:00
AssetKits #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
AstarPathfindingProject art02 2024-01-11 20:26:21 +09:00
Behavior Designer Closes #70 #79 #87 2024-01-03 06:39:53 +09:00
Behavior Designer Formations art02 2024-01-11 20:26:21 +09:00
Behavior Designer Movement art02 2024-01-11 20:26:21 +09:00
Behavior Designer Tactical art02 2024-01-11 20:26:21 +09:00
Blobcreate art02 2024-01-11 20:26:21 +09:00
Cube World Set URP - Proto Series art02 2024-01-11 20:26:21 +09:00
Distant Lands 스펌 캐릭터들 스프라이트 생성 2024-01-14 01:32:43 +09:00
Doozy Closes #65 WorkBtn - WorkClean, WorkEngine 2023-12-05 15:20:20 +09:00
EasyGridBuilder Pro art02 2024-01-11 20:26:21 +09:00
Editor #45 Housing system with Grid builder asset 2023-11-01 18:25:09 +09:00
Editor Default Resources [ASSETS] Update all assets (Dialog, SPUM, SW2) 2024-01-04 13:53:13 +09:00
Epic Toon FX art02 2024-01-11 20:26:21 +09:00
Feel [HOTFIX] 1st. everything and spum merge error fix 2024-01-12 13:32:11 +09:00
FlatKit #42 플레이어 수동 제어 변경 2023-10-25 16:32:57 +09:00
Gizmos [ASSETS] Update all assets (Dialog, SPUM, SW2) 2024-01-04 13:53:13 +09:00
Hand_Painted_Boats [ASSETS] Pirate_Ship_Pack In Hand_Painted_Boats 2024-01-11 16:25:49 +09:00
Islands art01 2024-01-11 20:24:26 +09:00
LostTemple-BuiltInRP art02 2024-01-11 20:26:21 +09:00
Low Poly Modular Terrain Pack art02 2024-01-11 20:26:21 +09:00
Lowpoly Style art02 2024-01-11 20:26:21 +09:00
Mnostva_Art art02 2024-01-11 20:26:21 +09:00
NWH Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG 2024-01-14 17:06:38 +09:00
PixelHeroes spum 캐릭터들 업데이트 2023-09-27 14:41:24 +09:00
Plugins Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG 2024-01-14 17:06:38 +09:00
Polybrush Data #37 Npc Idle Action, Order Action Dialogue System 2023-10-18 11:36:56 +09:00
PolygonNature art02 2024-01-11 20:26:21 +09:00
PolygonPirates art02 2024-01-11 20:26:21 +09:00
polyperfect art02 2024-01-11 20:26:21 +09:00
RayFire art02 2024-01-11 20:26:21 +09:00
Resources 스펌 캐릭터들 스프라이트 생성 2024-01-14 01:32:43 +09:00
RipcordDevelopment #11 Background material change, Mouse cursor change 2023-08-31 01:55:43 +09:00
Scenes #13 Test Map 2023-08-14 01:13:03 +09:00
Settings art02 2024-01-11 20:26:21 +09:00
Spine Spine 런타임 에셋 추가 2023-11-01 16:39:12 +09:00
Spine Examples art02 2024-01-11 20:26:21 +09:00
SPUM 스펌 캐릭터들 스프라이트 생성 2024-01-14 01:32:43 +09:00
StylizedWater2 #111 대포 로직 변경 중 2024-01-11 16:17:29 +09:00
TextMesh Pro [UNITY] unity version update 23.2.3f1 2024-01-03 15:34:33 +09:00
Toon Queen Worm Pack art02 2024-01-11 20:26:21 +09:00
ToonyTinyPeople art02 2024-01-11 20:26:21 +09:00
TutorialInfo BlueWater First Push 2023-08-01 13:03:57 +09:00
UltimateCleanGUIPack Closes #48 Basic Building System 2023-12-04 10:32:34 +09:00
Unity.VisualScripting.Generated Closed #33 Inship Basic Environment and #36 Start Ai 2023-10-12 10:09:31 +09:00
01.Scenes.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
02.Scripts.meta #6 Default Gerstner Wave 2023-08-03 10:03:08 +09:00
03.Images.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
03.Materials.meta #6 Water And Ship 2023-08-02 14:36:11 +09:00
04.Fonts.meta 1. Add Navigation Package 2023-08-01 15:39:04 +09:00
05.Prefabs.meta 1. Add Navigation Package 2023-08-01 15:39:04 +09:00
06.Sounds.meta 1. Add Navigation Package 2023-08-01 15:39:04 +09:00
07.Animation.meta 1. Add Navigation Package 2023-08-01 15:39:04 +09:00
08.Models.meta closed #22 AI 방패막기 애니메이션 추가 2023-08-17 11:56:45 +09:00
09.BehaviorTree.meta Behavior Tree 테스트 중 2023-09-11 16:16:02 +09:00
10.Shaders.meta Spine 런타임 에셋 추가 2023-11-01 16:39:12 +09:00
AddressableAssetsData.meta #2 Add Crest Water 2023-08-01 14:46:51 +09:00
AllIn1SpriteShader.meta #13 Now card effect on when card on ground, add asset All 1n One 2023-08-12 04:57:41 +09:00
AssetKits.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
AstarPathfindingProject.meta Add AStar Asset 2023-08-01 15:49:57 +09:00
Behavior Designer Formations.meta [Asset] Add Behavior Designer 2023-09-26 15:12:44 +09:00
Behavior Designer Movement.meta [Asset] Add Behavior Designer 2023-09-26 15:12:44 +09:00
Behavior Designer Tactical.meta [Asset] Add Behavior Designer 2023-09-26 15:12:44 +09:00
Behavior Designer.meta Add Asset "Behavior Designer" 2023-09-11 12:34:42 +09:00
Blobcreate.meta #10 Add Projectile Asset 2023-08-10 17:23:04 +09:00
BlueWater Dialogue Database (Auto-Backup).asset #37 Npc Conversation, order action 2023-10-23 12:12:13 +09:00
BlueWater Dialogue Database (Auto-Backup).asset.meta #37 Npc Conversation, order action 2023-10-23 12:12:13 +09:00
BlueWater Dialogue Database.asset Closes #53 Prison -> Jail, Now Player Can Order Go To Jail NPC, And Bark 2023-11-24 11:15:02 +09:00
BlueWater Dialogue Database.asset.meta Closed #33 Inship Basic Environment and #36 Start Ai 2023-10-12 10:09:31 +09:00
BlueWaterCinemachine.asset #37 OrderToPrisonState, RestorePreviousState and Light setting 2023-10-26 17:52:06 +09:00
BlueWaterCinemachine.asset.meta #37 OrderToPrisonState, RestorePreviousState and Light setting 2023-10-26 17:52:06 +09:00
Cube World Set URP - Proto Series.meta #5 Add Cube World, Doozy, LostTemple Asset 2023-08-02 15:08:03 +09:00
DefaultVolumeProfile.asset art02 2024-01-11 20:26:21 +09:00
DefaultVolumeProfile.asset.meta [HOTFIX] 1st. everything and spum merge error fix 2024-01-12 13:32:11 +09:00
Distant Lands.meta [Asset] Add Cozy Weather 2023-09-13 14:07:40 +09:00
Doozy.meta #5 Add Cube World, Doozy, LostTemple Asset 2023-08-02 15:08:03 +09:00
EasyGridBuilder Pro.meta #45 Housing system with Grid builder asset 2023-11-01 18:25:09 +09:00
Editor Default Resources.meta Closed #33 Inship Basic Environment and #36 Start Ai 2023-10-12 10:09:31 +09:00
Editor.meta #45 Housing system with Grid builder asset 2023-11-01 18:25:09 +09:00
Epic Toon FX.meta #21 Projectile asset and fire canon 2023-09-04 12:20:01 +09:00
Feel.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FlatKit.meta #11 Shader Change 2023-08-05 01:02:49 +09:00
Gizmos.meta Add Asset "Behavior Designer" 2023-09-11 12:34:42 +09:00
Hand_Painted_Boats.meta [ASSETS] Pirate_Ship_Pack In Hand_Painted_Boats 2024-01-11 16:25:49 +09:00
InputSystem.inputsettings.asset #13 Input name change and add infobox of variable 2023-08-11 02:47:30 +09:00
InputSystem.inputsettings.asset.meta #13 Input name change and add infobox of variable 2023-08-11 02:47:30 +09:00
Islands.meta 로우 폴리 베드노스 맵 테스트 씬 추가 2023-08-03 17:00:22 +09:00
LostTemple-BuiltInRP.meta #5 Add Cube World, Doozy, LostTemple Asset 2023-08-02 15:08:03 +09:00
Low Poly Modular Terrain Pack.meta #13 Test Map 2023-08-14 01:13:03 +09:00
Lowpoly Style.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
Mnostva_Art.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
New Terrain.asset #13 Test Map 2023-08-14 01:13:03 +09:00
New Terrain.asset.meta #13 Test Map 2023-08-14 01:13:03 +09:00
NWH.meta #98 New Ocean Material and Wave System 2023-12-19 11:31:29 +09:00
PixelHeroes.meta [Asset] PixelHeroes, SPUM 2023-09-26 15:24:34 +09:00
Plugins.meta Add GUI Pack, Ordin Asset 2023-08-05 01:53:27 +09:00
Polybrush Data.meta #37 Npc Idle Action, Order Action Dialogue System 2023-10-18 11:36:56 +09:00
PolygonNature.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
PolygonPirates.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
polyperfect.meta #11 Shader Change 2023-08-05 01:02:49 +09:00
RayFire.meta #21 Ready for canon shot and destroy object 2023-08-22 14:31:24 +09:00
Readme.asset BlueWater First Push 2023-08-01 13:03:57 +09:00
Readme.asset.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
Resources.meta [Asset] PixelHeroes, SPUM 2023-09-26 15:24:34 +09:00
RipcordDevelopment.meta #11 Background material change, Mouse cursor change 2023-08-31 01:55:43 +09:00
Scenes.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
Settings.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
Spine Examples.meta Spine 런타임 에셋 추가 2023-11-01 16:39:12 +09:00
Spine.meta Spine 런타임 에셋 추가 2023-11-01 16:39:12 +09:00
SPUM.meta [Asset] PixelHeroes, SPUM 2023-09-26 15:24:34 +09:00
StylizedWater2.meta #45 Housing Object and new inship house 2023-11-13 15:48:15 +09:00
test 1.asset #37 OrderToPrisonState, RestorePreviousState and Light setting 2023-10-26 17:52:06 +09:00
test 1.asset.meta #37 OrderToPrisonState, RestorePreviousState and Light setting 2023-10-26 17:52:06 +09:00
test_Renderer.asset #37 OrderToPrisonState, RestorePreviousState and Light setting 2023-10-26 17:52:06 +09:00
test_Renderer.asset.meta #37 OrderToPrisonState, RestorePreviousState and Light setting 2023-10-26 17:52:06 +09:00
test.asset art02 2024-01-11 20:26:21 +09:00
test.asset.meta #37 OrderToPrisonState, RestorePreviousState and Light setting 2023-10-26 17:52:06 +09:00
TextMesh Pro.meta #68 #95 Table and Wall 2023-12-21 15:37:20 +09:00
Toon Queen Worm Pack.meta #21 Canon ready 2023-08-30 14:17:26 +09:00
ToonyTinyPeople.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
TutorialInfo.meta BlueWater First Push 2023-08-01 13:03:57 +09:00
UltimateCleanGUIPack.meta Add GUI Pack, Ordin Asset 2023-08-05 01:53:27 +09:00
Unity.VisualScripting.Generated.meta Closed #33 Inship Basic Environment and #36 Start Ai 2023-10-12 10:09:31 +09:00
UniversalRenderPipelineGlobalSettings 1.asset [HOTFIX] 1st. everything and spum merge error fix 2024-01-12 13:32:11 +09:00
UniversalRenderPipelineGlobalSettings 1.asset.meta [HOTFIX] 1st. everything and spum merge error fix 2024-01-12 13:32:11 +09:00
UniversalRenderPipelineGlobalSettings.asset art03 2024-01-11 20:30:44 +09:00
UniversalRenderPipelineGlobalSettings.asset.meta BlueWater First Push 2023-08-01 13:03:57 +09:00

fileFormatVersion: 2
guid: 8105016687592461f977c054a80ce2f2
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: