14 Commits

Author	SHA1	Message	Date
M1_IDMhan	f47cabc061	#13 Remove redundant water materials, optimize Toon Water Material 2 and NavMesh settings, add new prefabs to main scene	2023-08-10 10:31:12 +09:00
M1_IDMhan	b65931de1a	#13 AssaultMode Boat Prefabs, Card Ani Change	2023-08-09 16:47:55 +09:00
M1_IDMhan	749d3dc633	#13 Assault Mode Test	2023-08-09 01:58:35 +09:00
M1_IDMhan	68b2e11b1a	#13 Assasult Mode Test	2023-08-08 16:08:41 +09:00
NTG	6051afd27c	Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG	2023-08-08 01:13:34 +09:00
M1_IDMhan	174619aeee	Add GUI Pack, Ordin Asset	2023-08-05 01:53:27 +09:00
M1_IDMhan	551b0ac8ed	#11 Shader Change	2023-08-05 01:02:49 +09:00
NTG_Lenovo	bd465b9f89	Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG ... # Conflicts: # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility.meta # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs # BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs.meta	2023-08-03 14:33:33 +09:00
NTG_Lenovo	bd9c1a6cef	#7 Add NavMeshAgent and layer ... fixed aiPrefab	2023-08-03 14:32:17 +09:00
NTG_Lenovo	c86dc6b7b2	#7 Add rigidbody and collider of aiPrefab ... Additional commit content - Set aiStat for testing - Add ai interface script - Add layer and fix physics setting	2023-08-03 12:38:50 +09:00
M1_IDMhan	3973258f79	#6 Default Gerstner Wave	2023-08-03 10:03:08 +09:00
M1_IDMhan	ddcb3e31b0	#6 InputAction, #5 Add Quibli Asset	2023-08-02 18:12:26 +09:00
M1_IDMhan	e7a8d13457	#2 Add Crest Water	2023-08-01 14:46:51 +09:00
M1_IDMhan	37c2da9b9c	BlueWater First Push	2023-08-01 13:03:57 +09:00