duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,077 Commits 13 Branches 0 Tags
d666bbae1e44f97ff77b1f3e359dd6813244f151
Commit Graph

713 Commits

Author SHA1 Message Date
VuNgocHaiC7 11600180d4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
 2026-03-24 16:13:00 +07:00
VuNgocHaiC7 5b52e17ef4 update money when buy item and manufacturing, pethatch, petrec 2026-03-24 16:11:43 +07:00
Chomper9981 281690316a Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace 2026-03-24 10:53:46 +07:00
Chomper9981 1f0da3b665 Add UI for Buff Icons. Refactor the UI Image Picture 2026-03-24 10:53:05 +07:00
VuNgocHaiC7 de0fc2b0ee Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-23 18:00:14 +07:00
VuNgocHaiC7 1004d64457 fix again some UI and update money when buy item 2026-03-23 17:59:11 +07:00
CuongNV 1035289271 fix show misc for chat 2026-03-23 16:10:28 +07:00
CuongNV 015d06c16c add filter chat 2026-03-23 16:01:58 +07:00
CuongNV 607ee2a013 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-23 09:39:34 +07:00
CuongNV c5d6275f30 fix input chat for mobile 2026-03-20 16:50:33 +07:00
VuNgocHaiC7 0ff167624b Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-20 16:47:23 +07:00
VuNgocHaiC7 65afe04918 update money in inventory when pickup money and button confirm dlgAwarld for item_info setActive false 2026-03-20 16:47:14 +07:00
CuongNV 1bae9c4092 add new logic update inputField 2026-03-20 16:42:20 +07:00
Chomper9981 ee75334b1d fix task trace position 2026-03-20 16:16:17 +07:00
CuongNV 0021ce2ade Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 13:53:37 +07:00
CuongNV fad24cfdd8 add new logic chat Input 2026-03-20 13:52:55 +07:00
Chomper9981 8e4117e139 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-19 17:53:54 +07:00
Chomper9981 bb107503ab Change UI for TaskTrace. Add side bar for MainUI 2026-03-19 17:48:02 +07:00
CuongNV 06b4cd91ca Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-19 16:53:59 +07:00
CuongNV 221c6ad364 change prefab chatsystem and update logic button channel 2026-03-19 16:52:49 +07:00
VDH ae02046fc7 Merge branch 'develop' into feature/refactor-SkillUI 2026-03-19 16:01:05 +07:00
VDH 92852a28a0 add log for build 2026-03-19 16:00:31 +07:00
CuongNV 8b8653c1fa update prefix 2026-03-19 15:44:02 +07:00
CuongNV c484ade69b add prefix for chat 2026-03-19 15:24:13 +07:00
CuongNV 5708f72910 Change UI Chat 2026-03-19 13:41:38 +07:00
Chomper9981 34bd53b3a3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-18 18:02:14 +07:00
VuNgocHaiC7 aec0394e79 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-18 17:45:39 +07:00
VuNgocHaiC7 e51674279d fix code for some dlg include one click item and fix detail info, value money 2026-03-18 17:43:25 +07:00
VDH dc589a8e8d Merge branch 'develop' into feature/refactor-SkillUI 
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
 2026-03-18 17:39:04 +07:00
VDH f28efd552f cheat UI 2026-03-18 17:19:10 +07:00
Tungdv 40cddc645d Merge remote-tracking branch 'origin/develop' into feature/elseplayer 2026-03-18 16:35:33 +07:00
Tungdv 0ccc726e3d fix: update wing for HP. 2026-03-18 16:34:31 +07:00
CuongNV ee6d880333 Merge remote-tracking branch 'origin/develop' into feature/chat 
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
#	Assets/Scripts/EC_GameRun.cs
 2026-03-18 16:05:54 +07:00
CuongNV 4d462c119d add GameSession and logic handle chat 2026-03-18 15:56:53 +07:00
HungDK 6faf18dc5e Merge branch 'develop' into feature/friend 2026-03-18 14:48:27 +07:00
VDH 3259d297d8 Merge branch 'develop' into feature/ComboSkill 
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
 2026-03-18 13:50:49 +07:00
VDH c6506ce6eb done combo includer normal attack and loop 2026-03-18 13:49:49 +07:00
Chomper9981 81f0824e1d Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-18 13:41:25 +07:00
Chomper9981 7f6395522f Modify skill quickbar 2026-03-18 13:40:27 +07:00
Tungdv c800b48d52 Merge branch 'develop' into feature/elseplayer 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
 2026-03-18 12:54:34 +07:00
Tungdv 8cf3144761 fix: update world when teleport. 2026-03-18 11:44:46 +07:00
HungDK 2adc3ede59 Add logic update friend UI, friend status 2026-03-18 11:39:26 +07:00
Le Duc Anh bc7db7f58d get correct armor for elseplayer 2026-03-17 22:01:36 +07:00
VuNgocHaiC7 d33568d373 fix bug info item server return for dlgUninstall and use item for two dlg 2026-03-17 17:24:49 +07:00
VDH 4bb8306661 Merge branch 'develop' into feature/skillBehavior 2026-03-17 10:24:49 +07:00
VDH 0f55a32f97 adjust skill find the issue cause logic handle remove gfx faild 2026-03-17 10:24:30 +07:00
NguyenVanDat a960d7a5df finished refactor message box 2026-03-17 10:22:03 +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 f58b6381d8 Merge remote-tracking branch 'origin/develop' into feature/chat 
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
 2026-03-16 11:28:14 +07:00