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

367 Commits

Author SHA1 Message Date
Tungdv fa1bd3d076 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
 2025-11-17 14:50:24 +07:00
Tungdv 1325a8df63 fix: update logic select option interact npc. 2025-11-17 14:31:20 +07:00
NguyenVanDat 16fadfe2a4 fix play animation 2025-11-15 13:54:29 +07:00
Tungdv e46fcf2ee5 fix: update show text mission in dlgnpc. 2025-11-13 18:14:49 +07:00
NguyenVanDat fe73a9b979 handle conflict 2025-11-13 17:53:31 +07:00
NguyenVanDat f7d0ee6b43 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
 2025-11-13 17:22:47 +07:00
NguyenVanDat c6f24993b5 show selecting vfx and elase player enter vfx 2025-11-13 17:12:41 +07:00
Le Duc Anh ba9c97d3f6 fix the conflicts 2025-11-13 16:43:59 +07:00
Le Duc Anh 648d51ff3a Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-13 16:22:36 +07:00
Le Duc Anh c4a56218d8 load player model 2025-11-13 16:12:12 +07:00
NguyenVanDat daeabf3aca Merge remote-tracking branch 'origin/develop' into feature/add-vfx 2025-11-13 09:13:15 +07:00
tung.do@monkey.edu.vn 8bf8f3716c fix: update text dlgnpc and fix bug merge. 2025-11-13 01:51:06 +07:00
Tungdv 9feb2b22e3 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
 2025-11-12 19:39:19 +07:00
NguyenVanDat 28efdb79ec update hover vfx 2025-11-12 18:27:46 +07:00
Tungdv 020058d9da fix: update logic show dialog NPC. 2025-11-12 17:20:15 +07:00
MinhHai 271bb0d787 fix conflict 2025-11-12 17:14:39 +07:00
MinhHai bb01bbb6f1 Merge remote-tracking branch 'origin/develop' into implement_task_UI 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-12 16:57:45 +07:00
MinhHai 2c3c44de4e update Task: complete read task templ, log task name and description on UI, add sprites asset 2025-11-12 16:56:35 +07:00
NguyenVanDat f1e15cdc2d apply final level up vfx 2025-11-12 14:05:00 +07:00
NguyenVanDat cfeebf3a15 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
 2025-11-12 11:04:43 +07:00
NguyenVanDat 142fabf108 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Prefab/GameController.prefab
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/PlayerVisual.cs
 2025-11-12 11:03:25 +07:00
hoangvd fb2288c2a2 Merge pull request 'skill 1,2,3,4,5,6' (#52) from feature/skill-data into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/52
 2025-11-12 03:53:35 +00:00
VDH 6d98f3d30f skill 1,2,3,4,5,6 2025-11-12 10:52:37 +07:00
anhld b3bac397e4 Merge pull request 'develop' (#51) from develop into feature/load-all-equipments 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/51
 2025-11-12 03:23:37 +00:00
NguyenVanDat 629d419c57 WIP logic show vfx select target and level up 2025-11-12 10:21:09 +07:00
HungDK ea53c30306 Merge branch 'feature/mall' into develop 2025-11-12 09:27:12 +07:00
Tungdv fabb286473 fix: update logic show dialog npc. 2025-11-11 19:04:49 +07:00
MinhHai 451555a1ba Merge remote-tracking branch 'origin/develop' into implement_task_UI 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
 2025-11-11 18:35:33 +07:00
VDH ecbdf4c803 done skill 2025-11-11 17:12:51 +07:00
Le Duc Anh 9d8e219f3c Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-11 15:59:38 +07:00
Le Duc Anh 9be43da2ae load equipment skin 2025-11-11 15:59:26 +07:00
VDH e01c923e16 ref 2025-11-11 14:13:14 +07:00
VDH 40f17dadab Merge remote-tracking branch 'origin/develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-11 13:44:45 +07:00
VDH cbf626fa28 skill processing 2025-11-11 13:33:27 +07:00
Le Duc Anh 2974373390 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-11 10:30:06 +07:00
Tungdv ec4bb785b8 fix: update logic show dialog. 2025-11-10 19:50:39 +07:00
NguyenVanDat b7bf20be75 show selecting vfx 2025-11-10 18:24:09 +07:00
HungDK f58d00a4ac Update shop categories 2025-11-10 16:13:31 +07:00
HungDK 32d0aeff3a Fix unexpect item order in each tab of mall 2025-11-10 10:52:05 +07:00
Tungdv f643998dda ifx: update logic show dialog npc. 2025-11-08 18:51:00 +07:00
VDH eed08c2b13 bug skill data not received 2025-11-08 16:41:19 +07:00
Tungdv 920317683b fix: update logic show dialog npc. 2025-11-07 18:32:49 +07:00
VDH d4af8e33f9 convert for test done 2025-11-07 18:01:47 +07:00
NguyenVanDat e07be0d048 Merge branch 'develop' into feature/add-vfx 2025-11-07 17:38:19 +07:00
NguyenVanDat df07b1661d add gfx resource and vfx object base 2025-11-07 17:35:52 +07:00
HungDK 316d633525 Add overrides multi prefabs tool and clear missing scripts 2025-11-07 14:09:17 +07:00
tungdv 551a6dd576 fix: update show dialog npc. 2025-11-07 13:38:33 +07:00
Tungdv 3bd29134b9 fix: update dialog NPC. 2025-11-06 18:58:05 +07:00
VDH 38a2c0d46f covnert continue 2025-11-06 17:29:02 +07:00
Le Duc Anh 57c24c2c6f show name for debug 2025-11-06 16:06:13 +07:00