184 Commits

Author SHA1 Message Date
Tran Hai Nam 912518d2c9 1Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-04-22 16:25:34 +07:00
Tran Hai Nam f5dba37813 Add loop behavior via code to player animation 2026-04-22 15:58:28 +07:00
vuong dinh hoang 606c1ebfd5 remove logger 2026-04-22 15:46:11 +07:00
vuong dinh hoang 284a77e4d2 remove debug 2026-04-21 11:43:07 +07:00
Tran Hai Nam 37c329fbb8 remove .wav 2026-04-20 16:53:24 +07:00
Chomper9981 a3c2f478ef Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-20 14:44:07 +07:00
Chomper9981 2bf643fca9 fix equipment percent proplem 2026-04-20 14:21:27 +07:00
CuongNV 6c15eb0192 Merge branch 'develop' into feature/chat_01 2026-04-20 11:17:45 +07:00
CuongNV ef632e7f11 update icon combo 2026-04-20 11:11:23 +07:00
Chomper9981 7ac9721f3c Add sfx to skill trigger 2026-04-17 16:55:36 +07:00
Chomper9981 10c9a00e6a change combine action logic to dictionary 2026-04-16 16:21:10 +07:00
Chomper9981 aacd303e94 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-16 15:31:33 +07:00
Chomper9981 97bb1f97d4 Add A3DCombinedAction logic 2026-04-16 15:30:52 +07:00
CuongNV 5b2feeb39f update log 2026-04-16 14:40:39 +07:00
CuongNV 329f62a050 update prefab and logic draw name 2026-04-16 14:29:08 +07:00
CuongNV 8c72c3349c add code height name 2026-04-15 18:38:20 +07:00
Chomper9981 f083c400a0 Add BubbleText Logic 2026-04-13 14:44:16 +07:00
Chomper9981 47a219866b Fix some bug related to flying phoenix 2026-04-06 14:31:09 +07:00
Chomper9981 ff03d7d0eb Add Animation phoenix fly in the lv 10 quest. 2026-04-06 13:39:39 +07:00
Chomper9981 91b5c6fb51 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-16 14:46:41 +07:00
Chomper9981 db65447df2 Fix bug about elseplayer cast skill. 2026-03-16 14:46:16 +07:00
CuongNV 72310e9a42 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-12 17:29:11 +07:00
Le Duc Anh 2aee6f6141 attack fly sword to correct pos 2026-03-11 19:31:14 +07:00
Chomper9981 f4ad63f525 change game object logic to using CECPlayer instead. fix dlgaward not gen enough data. fix wave hand invalid 2026-03-09 17:10:14 +07:00
CuongNV 4da68f5721 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/EC_GameRun.cs
2026-03-07 10:37:26 +07:00
CuongNV 72299d0b71 Add base script for chat 2026-03-06 16:45:35 +07:00
VDH 52ac4d4b39 add hook system 2026-03-03 18:06:20 +07:00
VDH b2d49f8c65 covnert skill 1 2026-03-03 15:26:21 +07:00
Tungdv 01ae1463f4 fix: remove debug and "using" not use. 2026-02-28 18:34:39 +07:00
VDH cfdd048415 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
#	Assets/PerfectWorld/Scripts/DebugCommandMenu.meta
2026-02-26 15:30:49 +07:00
VDH 7ee3394834 done cast skill move linear 2026-02-26 15:01:46 +07:00
VuNgocHaiC7 fbfeefd4b9 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
2026-02-26 14:26:29 +07:00
VuNgocHaiC7 8df945151d update prefab DlgPetHatch 2026-02-26 14:24:30 +07:00
Le Duc Anh 0b90bd8aa2 add missing npc 2026-02-26 00:37:13 +07:00
Le Duc Anh 0e6ceaf6f3 Play from Bootstrap scene. Move heavy logic to other Thread 2026-02-20 01:20:05 +07:00
VDH 8bce2d6b06 tesst skill 2026-02-09 15:15:31 +07:00
Tungdv 7a96c7e252 Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs.meta
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
2026-02-05 17:29:54 +07:00
VDH 7aaed6d0d3 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 09:55:39 +07:00
Tungdv ef894f6e49 fix: update logic pet. 2026-01-31 19:23:50 +07:00
Chomper9981 0821e2f741 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-29 17:49:03 +07:00
Chomper9981 5aff603a47 Add task trace Feature. Modify task UI. 2026-01-29 17:42:34 +07:00
VuNgocHaiC7 ccbe1b4a0c update feature useitem 2026-01-29 17:08:58 +07:00
VDH 7d9f75de18 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-23 18:08:51 +07:00
VDH 3de0850a2b push convert flow use skill combo 2026-01-23 18:01:15 +07:00
VuNgocHaiC7 ca84a98d31 completed task icon head NPC 2026-01-23 14:10:56 +07:00
VuNgocHaiC7 0ca50d5475 update feature icon task on head NPC ( not yet completed ) 2026-01-21 14:12:23 +07:00
Le Duc Anh ba30b37c06 #if UNITY_EDITOR 2025-12-24 18:05:54 +07:00
VDH e5e3f35559 fix bug anim npc monster 2025-12-24 09:50:38 +07:00
VDH 4b75e854f3 Merge branch 'develop' into feature/loopanimation
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/Scenes/a61.unity
2025-12-23 17:55:21 +07:00
VDH 2b12799546 fix npc double 2025-12-23 17:33:09 +07:00