Commit Graph

22 Commits

Author SHA1 Message Date
MinhHai 64c2fc234a create task window 2025-11-04 17:39:06 +07:00
MinhHai 7c3bc44bd7 Merge branch 'feature/convert-task-templ' into develop 2025-11-03 18:34:36 +07:00
MinhHai c9cd71c3f9 Merge branch 'develop' into feature/convert-task-templ
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs
#	Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs.meta
#	Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs
#	Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs.meta
#	Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs
#	Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs.meta
#	Assets/PerfectWorld/Scripts/Task/SizeTest.cs
#	Assets/PerfectWorld/Scripts/Task/SizeTest.cs.meta
#	Assets/PerfectWorld/Scripts/Task/TaskExpAnalyser.cs
#	Assets/PerfectWorld/Scripts/Task/TaskLog.txt
#	Assets/PerfectWorld/Scripts/Task/TaskLog.txt.meta
#	Assets/Scenes/HoangTest.unity
2025-11-03 17:30:47 +07:00
MinhHai c26cdcdc36 complete convert raw properties of FixedData 2025-10-30 17:33:44 +07:00
HungDK 33c845cd3b Merge branch 'develop' into feature/inventories 2025-10-30 10:10:16 +07:00
HungDK 0fb8b0d406 Update login UI 2025-10-29 17:02:18 +07:00
HungDK 915b11b387 Update login ui 2025-10-28 13:51:33 +07:00
NguyenVanDat d72d4cd967 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-10-27 13:41:59 +07:00
HungDK a2469d0259 Merge branch 'develop' into feature/inventories 2025-10-27 10:33:38 +07:00
VDH 7fef48278f addressable ui 2025-10-25 17:28:46 +07:00
HungDK 73f187968b Update LoginScene.unity 2025-10-23 10:52:35 +07:00
Le Duc Anh e839141eb5 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-10-22 16:35:41 +07:00
Le Duc Anh 9fa1c93e27 addressable intial commit 2025-10-22 16:34:56 +07:00
VDH 5f38710c4a npc and monster done 2025-10-22 13:42:55 +07:00
VDH eaf07bd223 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-22 09:26:38 +07:00
HungDK 168da10d1a Update LoginScene.unity 2025-10-21 18:50:44 +07:00
VDH 02df4f3c6f monster attack 2025-10-21 18:34:45 +07:00
Tungdv de76d2dec0 fix: update struct in logic terrain. 2025-10-15 18:14:53 +07:00
HungDK c02f471fa6 Add select character ui 2025-09-29 16:10:45 +07:00
VDH 34c36072c6 for build add package 2025-09-23 14:14:03 +07:00
Tungdv 6f9716da3e fix: show scene word and character.
feat: add script NPCmanager.
2025-09-09 11:00:42 +07:00
Le Duc Anh e3e435d12e Unity Game Session MVP 2025-09-08 16:28:54 +07:00