duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,569 Commits 13 Branches 0 Tags
4e0e52eb7f94adebc7e6806e0aee17fe2fb64d5d
Commit Graph

466 Commits

Author SHA1 Message Date
MinhHai 859ecb1315 Create Faction_Mem_Info for Fation and create CECFriendMan 2026-02-26 15:56:22 +07:00
Chomper9981 7ddd60e7e1 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-25 14:41:37 +07:00
Chomper9981 cad727b814 Fix the nav bug(work around). fix the major map quest's npc load proplem. 2026-02-25 14:41:15 +07:00
HungDK 34dbaa4c0a Fixing select target and id duel 2026-02-25 13:38:33 +07:00
HungDK 7996bed176 Fix PvP conflict 2026-02-24 16:59:51 +07:00
HungDK d066a1a541 Merge remote-tracking branch 'origin/develop' into feature/character_info 2026-02-24 11:12:38 +07:00
Le Duc Anh 0e6ceaf6f3 Play from Bootstrap scene. Move heavy logic to other Thread 2026-02-20 01:20:05 +07:00
Le Duc Anh 3becfc3ab5 move all litmodel a61 into a61 asset group 2026-02-15 21:34:38 +07:00
VuNgocHaiC7 e5529a94e3 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-11 17:46:55 +07:00
Tungdv 7c132590f1 fix: update logic move when jump stand. 2026-02-11 17:37:27 +07:00
VuNgocHaiC7 366001be85 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-11 17:37:06 +07:00
VuNgocHaiC7 363520be53 update info item for dlgInstall after the merge 2026-02-11 17:36:16 +07:00
VDH 77deaf2e08 fix bug endless loop 2026-02-11 14:58:08 +07:00
VDH b5184947f2 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-11 10:50:17 +07:00
VDH 88d7bd550b fix bug after convert by tool 2026-02-11 10:43:08 +07:00
Tungdv e252649f7f Merge branch 'develop' into feature/hp_swim 2026-02-10 19:44:32 +07:00
Tungdv 5f943f4c32 feat: delete log. 2026-02-10 19:41:20 +07:00
VDH d0914160b2 convert skill and add path 2026-02-10 19:28:15 +07:00
Tungdv ea437dca63 fix: update logic move with brush. 2026-02-10 17:58:13 +07:00
Tungdv 1f4671ee46 Merge branch 'develop' into feature/hp_swim 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
 2026-02-10 14:25:14 +07:00
Chomper9981 2e04507aa6 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-02-10 12:16:25 +07:00
Chomper9981 a86e15e48a Fix bug cant get "Lan xi ki di" in main quest progress 2026-02-10 12:14:47 +07:00
Tungdv 077a76f77e fix: test move with brush. 2026-02-10 11:12:12 +07:00
HungDK a3c6ec9aa1 Add force attack 2026-02-09 18:08:49 +07:00
HungDK a295b3402e HUD and else player interact 2026-02-09 18:07:56 +07:00
HungDK 750e7b4ff8 Handle logic of Duel 2026-02-09 18:07:37 +07:00
VDH 7458032777 spawn skill 5 2026-02-09 18:05:37 +07:00
VDH 8bce2d6b06 tesst skill 2026-02-09 15:15:31 +07:00
VDH b70f68fe81 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-05 17:41:50 +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 414562f221 done excute skill bar 2026-02-05 11:21:49 +07:00
Tungdv cda4e1343a fix: update logic rider pet. 2026-02-04 19:27:01 +07:00
Tungdv 53f8829413 fix: update show pet rider. 2026-02-03 19:26:41 +07:00
VuNgocHaiC7 7fdce58713 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-03 17:39:51 +07:00
VuNgocHaiC7 bcb2f61348 update UI DlgUninstall.prefab 2026-02-03 17:38:50 +07:00
VDH ef1804f967 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
 2026-02-03 15:09:55 +07:00
VDH eca33817e8 done ui info 2026-02-03 15:01:57 +07:00
VDH e57899226d infoskill done data 2026-02-02 18:16:11 +07:00
VuNgocHaiC7 9e0d1a284d Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-02 14:17:20 +07:00
VuNgocHaiC7 e6faf5d2fc update logic more UseItemInPack 2026-02-02 13:54:38 +07:00
VDH 7091fb8d41 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-02 10:28:42 +07:00
VDH 57c2f5fb9f FIX after merge 2026-02-02 10:23:49 +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
HungDK 793eb7c030 Merge branch 'develop' into feature/character_info 2026-02-02 09:43:23 +07:00
VDH e91a491444 get description skill 2026-02-02 09:40:39 +07:00
HungDK 53d2de6a6c Fetch player, player's info in search panel 2026-02-02 09:25:11 +07:00
Tungdv ef894f6e49 fix: update logic pet. 2026-01-31 19:23:50 +07:00
Le Duc Anh d6e4daeda2 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-31 18:20:34 +07:00
NguyenVanDat d9c3333dc9 Merge branch 'develop' into feature/embed-stone 2026-01-30 15:07:20 +07:00
Tungdv b5d5ae1982 fix: update logic pet. 2026-01-29 19:24:57 +07:00