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

3000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
NguyenVanDat c542d99ac8 try to convert data 2025-10-09 18:04:19 +07: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
HungDK f3d3a883dc Add matter spawn range 2025-10-09 17:04:29 +07:00
HungDK 7a000797ec Update place holder item drop object 2025-10-09 17:04:07 +07:00
HungDK 8286c01879 Remove useless code 2025-10-09 17:01:12 +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
NguyenVanDat 9f7bd68db8 add rule for convert data and test 2025-10-08 18:15:46 +07:00
VDH f0dca5bbdb npcAttack 2025-10-08 18:05:19 +07:00
NguyenVanDat d01242b040 Merge branch 'develop' into feature/convert-task-templ 2025-10-08 16:35:32 +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
Le Duc Anh bd4c44a125 demo load data 2025-10-08 13:43:23 +07:00
Le Duc Anh 81aea3dbe2 Merge remote-tracking branch 'origin/develop' into feature/convert-task-templ 2025-10-08 13:42:54 +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
VDH c6b9a1e316 st 2025-10-08 09:39:33 +07:00
VDH 571d66eb61 Merge branch 'develop' into feature/movement 2025-10-08 09:39:07 +07:00
VDH 7566b71a36 st 2025-10-08 09:39:01 +07:00
tung.do@monkey.edu.vn ddcc5c22d1 fix: Update normal attack. 2025-10-08 01:34:03 +07:00
Tungdv ee618bc38e fix: update attack normal. 2025-10-07 18:13:30 +07:00
Le Duc Anh af784bf761 set log file path 2025-10-07 17:20:08 +07:00
Le Duc Anh ca8252a4e9 Merge remote-tracking branch 'origin/develop' into feature/convert-task-templ 2025-10-07 17:07:47 +07:00
Le Duc Anh 3804a68073 Merge branch 'feature/convert-task-templ' of https://git.brew.monster/Unity/perfect-world-unity into feature/convert-task-templ 2025-10-07 17:07:27 +07:00
Le Duc Anh e03560a67f upgrade Unity 2025-10-07 17:07:24 +07:00
Tungdv 9c2b5b87f3 Merge branch 'develop' into feature/hp_normal_attack 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Packages/manifest.json
 2025-10-07 14:15:17 +07:00
anhld 4bd8c37e6b Delete Build.rar 2025-10-07 07:13:30 +00:00
Tungdv f66d9c694b fix: update struct a3dmatrix. 2025-10-07 14:11:28 +07:00
Le Duc Anh 906ec4e92e Merge remote-tracking branch 'origin/develop' into feature/convert-task-templ 2025-10-07 10:38:14 +07:00