duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,531 Commits 13 Branches 0 Tags
8df945151d5aa256fda171af2f4e02b4ee071519
Commit Graph

264 Commits

Author SHA1 Message Date
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 acfd4bfdbe having the distance check running on separated thread 2026-02-18 23:20:15 +07:00
Le Duc Anh 3becfc3ab5 move all litmodel a61 into a61 asset group 2026-02-15 21:34:38 +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 781c5cd08d done passive skill UI 2026-02-06 15:13:42 +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
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
NguyenVanDat d234076311 add clear emmbedded chip command 2026-02-03 11:00:07 +07:00
NguyenVanDat 4da6b16a8d Merge branch 'develop' into feature/clear-embedded-chip 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
 2026-02-03 10:55:33 +07:00
HungDK 9cc0ffce45 Merge remote-tracking branch 'origin/develop' into feature/character_info 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
 2026-02-03 10:10:05 +07:00
HungDK 8b82734fcf Add logout cmd type 1 and type 0 2026-02-03 09:47:25 +07:00
NguyenVanDat 775bbd7c55 add ClearEmbedded command 2026-02-02 16:29:42 +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
HungDK 8adf717b41 Add invite, kick, join, leave, change lead, dismiss, new member, member leave for both client and server 2026-02-02 09:22:09 +07:00
Le Duc Anh ccd6564772 update game UI 2026-02-01 15:02:43 +07:00
NguyenVanDat d9c3333dc9 Merge branch 'develop' into feature/embed-stone 2026-01-30 15:07:20 +07:00
NguyenVanDat 14b5a6f780 do embed stone 2026-01-30 15:06:37 +07:00
Tungdv b5d5ae1982 fix: update logic pet. 2026-01-29 19:24:57 +07:00
VDH e2e63b83f2 convert ui code 2026-01-29 19:24:42 +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 d69fed7aea fix conflig use item 2026-01-29 14:23:24 +07:00
VuNgocHaiC7 2dea3a8f02 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
 2026-01-29 14:04:49 +07:00
VuNgocHaiC7 8f916ee88c use item but cooldown don't active 2026-01-29 13:58:15 +07:00
Tungdv ef07a39964 fix: update logic dlg pet. 2026-01-28 19:31:14 +07:00
VDH a3b5a72b9c Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
 2026-01-28 16:47:35 +07:00
Tungdv 4c51d6bf19 fix: update logic dlg pet. 2026-01-27 19:47:15 +07:00
VDH c22ca07a0f done skill combo 2026-01-27 18:04:32 +07:00
HungDK c3a925cd6c Add c2s_SendCmdSetStatusPts to modify character potential point 2026-01-27 17:38:47 +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
Tungdv c712653b21 fix: update logic pet. 2026-01-22 20:13:46 +07:00
VDH ef366cfc32 convert skill combo' 2026-01-22 19:23:32 +07:00
HungDK 0e883425d7 Callback onto unitys main thread 2026-01-22 16:30:25 +07:00
HungDK 9877c1eb98 Update createrole protocols data 2026-01-22 10:06:51 +07:00
HungDK 1d680be52e Add protocol createrole_re 2026-01-22 10:04:43 +07:00
HungDK 1cd4375081 Add roles equipment and make sure not null able while encode 2026-01-22 10:04:13 +07:00
HungDK 79906c3113 Add handle creating role, call back 2026-01-22 10:02:28 +07:00
Tungdv d950c5a9c3 fix: add controller pet. 2026-01-21 19:17:41 +07:00
VDH 1cdeb28367 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Skills/ElementSkill.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-21 17:51:54 +07:00
VDH 53190f3f61 convert skill bombo 2026-01-21 17:40:10 +07:00
VDH f2382366c3 convert skill combo 2026-01-20 18:00:18 +07:00
NguyenVanDat 5c6a4bb628 Merge branch 'develop' into feature/embed-stone 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-20 16:53:56 +07:00
NguyenVanDat b14bb3db0f update command embed stone 2026-01-20 16:49:56 +07:00
Chomper9981 e903de108a Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-20 16:32:36 +07:00
Chomper9981 273f353ddc add more item detail in inventory. Create some place holder for pet item so that those item can be shown 2026-01-20 16:31:57 +07:00