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

253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
VDH 4a701aaa16 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-10-13 09:11:16 +07:00
VDH bd344fcff5 player animation 2025-10-11 16:09:00 +07:00
Le Duc Anh 9cb287b58f Merge branch 'develop' of https://git.brew.monster/anhld/perfect-world-unity into develop 2025-10-11 15:57:47 +07:00
Le Duc Anh 142611dddd StringTab 2025-10-11 15:57:15 +07:00
tungdv d69c331fac Merge pull request 'fix bug send data hp_normal_attack to server' (#25) from feature/hp_normal_attack into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/25
 2025-10-11 08:54:11 +00:00
Tungdv 955ba80dff Merge branch 'develop' into feature/hp_normal_attack 2025-10-11 15:53:46 +07:00
Tungdv 442035c587 fix: fix bug send data attack normal to server. 2025-10-11 15:52:12 +07:00
Tungdv d00efc44a8 fix: fix bug data send from server. 2025-10-11 11:46:16 +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
Le Duc Anh fab1fd0534 fix data type size 2025-10-11 09:56:30 +07:00
Le Duc Anh 2b7ad0e335 add get id data type function 2025-10-11 09:50:36 +07:00
Tungdv 3af8d968f1 fix: Update atk normal. 2025-10-10 19:02:57 +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 24d080f210 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-10-09 18:27:47 +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
VDH bd384699dc st 2025-10-09 18:16:02 +07:00
hoangvd 34a9a7f1e4 Merge pull request 'revert 439722a8c43fca9b6bd0bc24f313fbc4033af753' (#23) from hoangvd-patch-1 into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/23
 2025-10-09 11:10:56 +00: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
hoangvd 439722a8c4 Merge pull request 'feature/movement' (#22) from feature/movement into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/22
 2025-10-09 10:08:03 +00:00
VDH 0f8823504f mer 2025-10-09 17:07:11 +07:00
VDH c961eea8e6 Merge remote-tracking branch 'origin/develop' into feature/movement 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
 2025-10-09 17:00:48 +07:00
tungdv e7e8bef0f1 Merge pull request 'Update hp_normal_attack' (#21) from feature/hp_normal_attack into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/21
 2025-10-09 09:58:08 +00:00
Tungdv 56933f36d5 Merge branch 'develop' into feature/hp_normal_attack 2025-10-09 16:57:24 +07:00
Tungdv 2dee89793d fix: Update attack normal HP. 2025-10-09 16:57:07 +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 056efde23d Merge pull request 'Add normal attack for host player.' (#20) from feature/hp_normal_attack into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/20
 2025-10-09 04:28:32 +00: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
tung.do@monkey.edu.vn dd77543cdb fix: update normal attack. 2025-10-09 02:08:11 +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 bb91365639 udpate packages 2025-10-08 10:29:22 +07:00
Le Duc Anh c4215ca095 increase project version 2025-10-08 10:12:49 +07:00
VDH 33f5a62fa4 fixbug package 2025-10-08 09:42:20 +07:00