Commit Graph

827 Commits

Author SHA1 Message Date
NguyenVanDat e62b2d9e3a add unitask 2025-12-16 09:42:07 +07:00
tungdv 0f23f349b9 Merge pull request 'fix move HP on Ground.' (#81) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/81
2025-12-15 11:00:39 +00:00
Tungdv 2087f4f069 Merge branch 'develop' into feature/HP_jump 2025-12-15 17:59:09 +07:00
Tungdv b7cb744c35 fix: update move for HP. 2025-12-15 17:55:58 +07:00
Le Duc Anh 9378866567 add 4 more player models 2025-12-15 00:12:16 +07:00
tungdv f1dc674b2f Merge pull request 'fix move on ground.' (#80) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/80
2025-12-13 12:41:32 +00:00
Tungdv c43eac8599 Merge remote-tracking branch 'origin/develop' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-13 19:17:18 +07:00
Tungdv d1d59c6d04 fix: fix bug move on ground. 2025-12-13 19:11:38 +07:00
Le Duc Anh 0df2f45179 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-13 18:46:55 +07:00
Le Duc Anh 81853da600 add more monster 2025-12-13 18:45:42 +07:00
hoangvd 4fd50a2b0b Merge pull request 'feature/skill-data' (#79) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/79
2025-12-13 10:52:53 +00:00
VDH fa177ec734 Merge branch 'develop' into feature/skill-data 2025-12-13 17:50:04 +07:00
Le Duc Anh 3984170c6f remove NPC Disappeared events 2025-12-13 17:49:37 +07:00
VDH 60d0a52d4e fix 2 struct 2025-12-13 17:49:34 +07:00
VDH f20c5a123e st 2025-12-13 16:54:52 +07:00
VDH 9b0c3b3dc0 fix 2025-12-13 15:30:53 +07:00
VDH 10fd731948 st 2025-12-13 10:43:00 +07:00
VDH d61478f161 Merge branch 'develop' into feature/skill-data 2025-12-12 18:59:26 +07:00
tungdv c6a13ee469 Merge pull request 'Update rotation cam' (#78) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/78
2025-12-12 11:17:52 +00:00
Tungdv 65cb2fa69d Merge remote-tracking branch 'origin/develop' into feature/HP_jump 2025-12-12 18:15:06 +07:00
VDH e629523ff1 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
2025-12-12 18:14:14 +07:00
Tungdv 4c6a49c238 fix: update dir move HP with cam. 2025-12-12 18:14:01 +07:00
VDH 89c7b550f0 convert all skill in stub1 2025-12-12 18:06:48 +07:00
Le Duc Anh 6c74fcf224 water and gfx 2025-12-12 11:17:55 +07:00
VDH 504cdb11d6 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
#	Assets/PerfectWorld/Scripts/World/CECWorld.cs
#	Assets/Scenes/a61.unity
2025-12-11 14:14:54 +07:00
VDH 2c20aea277 save 2025-12-11 14:13:37 +07:00
namth 0f5d8c0129 Merge pull request 'update detail color text item' (#75) from feature/color-text into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/75
2025-12-11 04:07:22 +00:00
Chomper9981 a7dcbd4e69 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-11 10:01:53 +07:00
VDH 45f69c9f44 skill ui 2025-12-10 18:17:34 +07:00
tungdv a8c4edd9a9 Merge pull request 'Add rotation camera.' (#76) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/76
2025-12-10 10:22:30 +00:00
Tungdv 5ebf4fb49b Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/Scripts/CECGameRun.cs
2025-12-10 17:21:20 +07:00
Tungdv 21f41ecae1 feat: add rotation cam. 2025-12-10 17:18:38 +07:00
Tungdv ebdb99865d fix: update move air. 2025-12-09 19:53:50 +07:00
VDH 972104970d copnvert 2025-12-09 19:53:32 +07:00
Chomper9981 5d9dd1c3d9 Change some shop UI 2025-12-09 16:37:16 +07:00
Tungdv ead70ecfea fix: update move air. 2025-12-08 19:10:23 +07:00
VDH c239660cd6 Merge branch 'develop' into feature/skill-data 2025-12-08 17:51:18 +07:00
VDH 2410af3078 done pos skill 2025-12-08 17:49:57 +07:00
VungochaiC7 aee25a18b5 update detail color text item 2025-12-08 17:45:12 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
HungDK 892d0d3aef Merge branch 'develop' into feature/npc-shop 2025-12-08 10:37:03 +07:00
HungDK 9993297ab5 Update Tab_Button.prefab 2025-12-08 10:33:32 +07:00
HungDK f42e1d27de Update InventoryUI.prefab 2025-12-08 10:27:45 +07:00
HungDK 729bd4ce6e Add button and correct refresh detail item pannel size 2025-12-08 10:26:44 +07:00
NguyenVanDat 659253c3d2 temporary add vfx for weapon attack 2025-12-08 10:23:00 +07:00
HungDK 421bcfd6a6 Update EC_InventoryUI.cs 2025-12-08 10:12:35 +07:00
NguyenVanDat 6be2ef9a39 Merge branch 'develop' into feature/vfx 2025-12-08 10:12:32 +07:00
NguyenVanDat e973260dee fix addressable release asset 2025-12-08 09:48:37 +07:00
HungDK 66dc12ef4a Update item detail 2025-12-08 09:30:59 +07:00
HungDK d2fd5b2f0a Add missing id config of items description 2025-12-08 09:17:36 +07:00