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

854 Commits

Author SHA1 Message Date
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
HungDK c748d9c39e Merge branch 'develop' into feature/character_info 2026-01-27 17:57:39 +07:00
HungDK 83bd64cc4f Add open dlgcharacter event 2026-01-27 17:41:59 +07:00
HungDK 312edda4aa Fix get character name logic 2026-01-27 17:41:33 +07:00
HungDK af13bd5c47 Add DlgCharacter ui logic 2026-01-27 17:39:03 +07:00
HungDK c3a925cd6c Add c2s_SendCmdSetStatusPts to modify character potential point 2026-01-27 17:38:47 +07:00
Chomper9981 035f313e00 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-23 17:38:52 +07:00
Chomper9981 366a1a8cec Change Task UI tree. (Add color, add tree space) 2026-01-23 17:38:31 +07:00
VuNgocHaiC7 3b0068cfc6 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-23 14:13:19 +07:00
VuNgocHaiC7 ca84a98d31 completed task icon head NPC 2026-01-23 14:10:56 +07:00
Chomper9981 4aa78566a4 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-23 09:32:13 +07:00
Chomper9981 46cfb747c6 add all item till level 20 through the quest for TIT(tien thu). fix the bug suite not count decoration data. 2026-01-23 09:31:55 +07:00
HungDK 7640bbadc2 Merge branch 'develop' into feature/creating-role 2026-01-22 16:37:59 +07:00
HungDK 0e883425d7 Callback onto unitys main thread 2026-01-22 16:30:25 +07:00
HungDK 8e29de3d13 Add create role complete callback 2026-01-22 16:19:44 +07:00
HungDK db1656973b Add s_bShowMale auto asign gender by prof 2026-01-22 16:15:59 +07:00
Chomper9981 00c32e50e6 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-22 10:19:06 +07:00
Chomper9981 98f792deb4 Add more item to display. fix the bug when load percent data. 2026-01-22 10:18:43 +07:00
HungDK 82c33c5d6e Add OnCreateCharacterComplete update ui, data 2026-01-22 10:07:37 +07:00
HungDK c9ba22823d Add CreateRoleAsync 2026-01-22 10:07:09 +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
HungDK 2244c8b73c Add create role ui 2026-01-21 19:16:49 +07:00
VuNgocHaiC7 de36b370d6 complete UI DlgInstall.prefab 2026-01-21 17:37:35 +07:00
VuNgocHaiC7 312d03f3e5 update ui DlgInstall.prefab 2026-01-21 16:40:25 +07:00
VuNgocHaiC7 2bb18644dd Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-21 14:13:23 +07:00
VuNgocHaiC7 0ca50d5475 update feature icon task on head NPC ( not yet completed ) 2026-01-21 14:12:23 +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
hungdk bb936abd8f Merge pull request 'feature/skill-data' (#129) from feature/skill-data into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/129
 2026-01-20 08:20:04 +00:00
VDH 5d0f69ab34 done ui cap phep 2026-01-20 10:53:12 +07:00
NguyenVanDat b461d0b151 add embed stone protocol 2026-01-20 10:09:09 +07:00
VuNgocHaiC7 6266fab039 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-19 18:03:35 +07:00
VuNgocHaiC7 ac3d77c3e2 update detail item of dlgProduce.prefab 2026-01-19 18:02:50 +07:00
VDH 1d43192fb1 Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-19 16:22:53 +07:00
Chomper9981 093c257f74 Load more ItemType 2026-01-19 16:16:51 +07:00
VDH 1d03572b73 done learned skill UI 2026-01-19 16:15:17 +07:00
Tungdv 8b951d7f49 fix: 
- update loop anim
- update time count in cmd cache.
 2026-01-17 13:41:28 +07:00
Tungdv 15f9bd2a86 Merge branch 'develop' into feature/hp_swim 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-16 19:16:40 +07:00
HungDK d4a571be87 Merge remote-tracking branch 'origin/develop' into feature/produce-equipment 2026-01-16 18:31:41 +07:00
Tungdv 0b23be64a2 fix: update logic cmd cache. 2026-01-16 18:02:39 +07:00
VDH 5fc98befea skill ui Process 2026-01-16 18:01:33 +07:00
HungDK ef362d6017 Merge branch 'develop' into feature/produce-equipment 2026-01-16 17:40:20 +07:00
VuNgocHaiC7 185cc451e5 Merge branch 'feature/produce-equipment' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-16 17:29:09 +07:00