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

67 Commits

Author SHA1 Message Date
VDH bd344fcff5 player animation 2025-10-11 16:09:00 +07:00
VDH 042b248368 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs.meta
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs.meta
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/Move/CECPlayer.cs
 2025-10-11 10:09:59 +07:00
VDH dd38edcdd5 change name file 2025-10-11 10:08:24 +07:00
VDH bcba39d951 reset 2025-10-11 10:02:52 +07:00
VDH a7666f9aa1 organize folder 2025-10-10 15:10:36 +07:00
VDH 3de4b27bb9 fixx 2025-10-09 18:32:18 +07:00
VDH 7d1dd88ff3 Merge branch 'feature/movement' into develop 2025-10-09 18:27:54 +07:00
VDH febe6f8b00 st 2025-10-09 18:23:53 +07:00
hoangvd d5a07077c7 Merge pull request 'push again' (#24) from feature/movement into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/24
 2025-10-09 11:18:29 +00:00
VDH 68643caa61 push again 2025-10-09 18:17:58 +07:00
hoangvd 38a12bd3fa revert 439722a8c4 
revert Merge pull request 'feature/movement' (#22) from feature/movement into develop

Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/22

mất package
 2025-10-09 11:06:44 +00:00
VDH 0f8823504f mer 2025-10-09 17:07:11 +07:00
VDH 6a0125be95 else player and npc 2025-10-09 15:31:53 +07:00
VDH 7c5652ec2e m 2025-10-09 14:06:12 +07:00
VDH c71e943ab7 Merge remote-tracking branch 'origin/develop' into feature/movement 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Common/CECObject.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/Scripts/Move/CECHostMove.cs
 2025-10-09 11:31:55 +07:00
Tungdv be959df162 fix: update command cancel action. 2025-10-09 11:27:12 +07:00
Tungdv ee2f337b26 Merge branch 'develop' into feature/hp_normal_attack 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs
 2025-10-09 09:58:48 +07:00
VDH f2a8975b1a Merge remote-tracking branch 'origin/develop' into feature/movement 2025-10-09 09:22:53 +07:00
VDH 85292064e6 Merge remote-tracking branch 'origin/develop' into feature/movement 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectVersion.txt
 2025-10-09 09:15:43 +07:00
HungDK 51eeb4e642 Update UnityGameSession.cs 2025-10-09 09:14:35 +07:00
Le Duc Anh 96843517c0 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-10-09 08:53:34 +07:00
Le Duc Anh fde06bbfaf Move all network code into Unity Project 2025-10-09 08:52:31 +07:00
Tungdv ff1e2dd89e fix: update normal atk. 2025-10-08 19:32:05 +07:00
VDH f0dca5bbdb npcAttack 2025-10-08 18:05:19 +07:00
HungDK bd4c66042b Fix conflix 2025-10-08 14:16:20 +07:00
HungDK fd3a269886 Merge branch 'develop' into feature/inventory 2025-10-08 13:49:30 +07:00
HungDK a761891403 Fix logger 2025-10-08 13:25:43 +07:00
Le Duc Anh af784bf761 set log file path 2025-10-07 17:20:08 +07:00
NguyenVanDat 7ebb4c602f Merge remote-tracking branch 'origin/develop' into feature/movement 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
 2025-10-07 09:31:01 +07:00
HungDK 9c92e33daf Add request pickup item method 2025-10-03 15:40:37 +07:00
HungDK 7bd276d4b8 Add man_mater msg 2025-10-02 18:06:16 +07:00
HungDK f72c3287cd Add Drop item cmd, default drop with quantity is 1 2025-10-02 14:16:00 +07:00
Le Duc Anh 62c7417c74 change Logger to BMLogger 2025-10-01 15:14:38 +07:00
VDH 586e2f834b npc animtion processing 2025-09-27 17:10:53 +07:00
NguyenVanDat dd73b4944a Merge branch 'develop' into feature/quest_sytem 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2025-09-25 17:20:07 +07:00
HungDK 4243bab53f Merge branch 'develop' into feature/inventory 2025-09-25 14:18:51 +07:00
NguyenVanDat ba9ab810d6 Merge branch 'develop' into feature/quest_sytem 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/CECHostPlayer.cs
 2025-09-24 14:41:24 +07:00
VDH 34c36072c6 for build add package 2025-09-23 14:14:03 +07:00
Tungdv aa81225c27 send request get all game data 2025-09-23 13:35:46 +07:00
Tungdv f7023afcb8 try to load task data 2025-09-22 18:36:19 +07:00
HungDK 880c49607c Equip, unequip item base 2025-09-19 16:18:58 +07:00
VDH a9aa67cc2d add animation tool 2025-09-16 18:07:13 +07:00
VDH 6e3ecada59 Merge remote-tracking branch 'origin/develop' into feature/movement 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
 2025-09-16 15:37:00 +07:00
VDH 2f109d039f edit tool 2025-09-16 15:34:48 +07:00
HungDK 24540e150d Fixing func calling order 2025-09-16 15:33:15 +07:00
HungDK 3f148c3f0f Merge branch 'feature/inventory' into develop 2025-09-16 11:04:46 +07:00
VDH 68eb9bd928 change state move and idle 2025-09-15 18:01:08 +07:00
tung.do@monkey.edu.vn 3b6c2bb4a3 fix: update logic show exist elseplayer (load word before spawn character). 2025-09-14 02:13:09 +07:00
tung.do@monkey.edu.vn a1bae06cba Merge branch 'develop' into feature/elseplayer 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/GameController.cs
 2025-09-14 01:15:24 +07:00
tung.do@monkey.edu.vn 48fef1008d fix: show exist elseplayer 2025-09-14 00:47:52 +07:00