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
..
AudioManager.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
BurstAotSettings_StandaloneWindows.json	BlueWater First Push	2023-08-01 13:03:57 +09:00
ClusterInputManager.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
CommonBurstAotSettings.json	BlueWater First Push	2023-08-01 13:03:57 +09:00
DynamicsManager.asset	#7 Add NavMeshAgent and layer	2023-08-03 14:32:17 +09:00
EditorBuildSettings.asset	#2 Add Crest Water	2023-08-01 14:46:51 +09:00
EditorSettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
GraphicsSettings.asset	#6 InputAction, #5 Add Quibli Asset	2023-08-02 18:12:26 +09:00
InputManager.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
MemorySettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
NavMeshAreas.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
PackageManagerSettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
Physics2DSettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
PresetManager.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
ProjectSettings.asset	#6 Default Gerstner Wave	2023-08-03 10:03:08 +09:00
ProjectVersion.txt	#2 Add Crest Water	2023-08-01 14:46:51 +09:00
QualitySettings.asset	#6 InputAction, #5 Add Quibli Asset	2023-08-02 18:12:26 +09:00
SceneTemplateSettings.json	BlueWater First Push	2023-08-01 13:03:57 +09:00
ShaderGraphSettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
TagManager.asset	#7 Add NavMeshAgent and layer	2023-08-03 14:32:17 +09:00
TimeManager.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
UnityConnectSettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
URPProjectSettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
VersionControlSettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
VFXManager.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00
XRSettings.asset	BlueWater First Push	2023-08-01 13:03:57 +09:00