 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 |
|
|
NguyenVanDat
|
d3bd3f7403
|
remove not use code
|
2025-11-12 10:23:33 +07:00 |
|
|
NguyenVanDat
|
629d419c57
|
WIP logic show vfx select target and level up
|
2025-11-12 10:21:09 +07:00 |
|
|
NguyenVanDat
|
875b9ad866
|
add vfx
|
2025-11-12 10:17:44 +07:00 |
|
|
HungDK
|
ea53c30306
|
Merge branch 'feature/mall' into develop
|
2025-11-12 09:27:12 +07:00 |
|
|
hoangvd
|
115a7d5991
|
Merge pull request 'done skill' (#50) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/50
|
2025-11-11 10:14:26 +00:00 |
|
|
VDH
|
ecbdf4c803
|
done skill
|
2025-11-11 17:12:51 +07:00 |
|
|
hoangvd
|
a236ee0506
|
Merge pull request 'ref' (#49) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/49
|
2025-11-11 07:14:17 +00:00 |
|
|
VDH
|
e01c923e16
|
ref
|
2025-11-11 14:13:14 +07:00 |
|
|
hoangvd
|
936d3d5e7a
|
Merge pull request 'feature/skill-data' (#48) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/48
|
2025-11-11 06:45:26 +00:00 |
|
|
VDH
|
a13e931bc1
|
fix bug after merge
|
2025-11-11 13:44:55 +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 |
|
|
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
|
b287ff7902
|
Fix scroll
|
2025-11-10 10:52:21 +07:00 |
|
|
HungDK
|
32d0aeff3a
|
Fix unexpect item order in each tab of mall
|
2025-11-10 10:52:05 +07:00 |
|
|
VDH
|
eed08c2b13
|
bug skill data not received
|
2025-11-08 16:41:19 +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
|
6b2737f779
|
Fix missing setting, package
|
2025-11-07 17:00:31 +07:00 |
|
|
HungDK
|
bf4986afb2
|
Update a61.unity
|
2025-11-07 14:09:29 +07:00 |
|
|
HungDK
|
316d633525
|
Add overrides multi prefabs tool and clear missing scripts
|
2025-11-07 14:09:17 +07:00 |
|
|
HungDK
|
8d310277d9
|
Update prefab, fixing missing script prefabs
|
2025-11-07 14:06:27 +07:00 |
|
|
HungDK
|
8b8e9b55be
|
Update collision
|
2025-11-07 11:10:03 +07:00 |
|
|
VDH
|
38a2c0d46f
|
covnert continue
|
2025-11-06 17:29:02 +07:00 |
|
|
HungDK
|
5a689ef090
|
Update a61.unity
|
2025-11-06 16:55:11 +07:00 |
|
|
HungDK
|
fae786f9e9
|
Add generated mesh of collider
|
2025-11-06 16:54:40 +07:00 |
|
|
HungDK
|
f924f4f0d7
|
Add extruded mesh collider tool
|
2025-11-06 16:53:36 +07:00 |
|
|
VDH
|
0ad91a5e1d
|
InitAllSkillsOfCurProf done
|
2025-11-05 17:55:50 +07:00 |
|
|
HungDK
|
4f49a8f342
|
Merge branch 'feature/revive' into develop
|
2025-11-05 16:51:30 +07:00 |
|
|
HungDK
|
0798b25db3
|
Update a61.unity
|
2025-11-05 16:45:56 +07:00 |
|
|
HungDK
|
691b27b69f
|
Fix duplicate init else player, duplicate model
|
2025-11-05 16:38:23 +07:00 |
|
|
HungDK
|
19b42000a0
|
Fix error update player distance to object
|
2025-11-05 16:37:32 +07:00 |
|
|
anhld
|
d77ab085b9
|
Merge pull request 'initial load all equipments' (#47) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/47
|
2025-11-05 09:09:57 +00:00 |
|
|
Le Duc Anh
|
f338899f76
|
initial load all equipments
|
2025-11-05 16:08:51 +07:00 |
|
|
HungDK
|
07f7a36b08
|
Merge branch 'feature/revive' into develop
|
2025-11-05 09:38:45 +07:00 |
|
|
HungDK
|
14ed8ac2e9
|
Update else player revive on host client
|
2025-11-05 09:37:55 +07:00 |
|
|
HungDK
|
18c1465b1e
|
Merge branch 'feature/revive' into develop
|
2025-11-04 15:38:07 +07:00 |
|
|
HungDK
|
61ce6be4fd
|
Update EC_ManPlayer.cs
|
2025-11-04 15:36:43 +07:00 |
|
|
hoangvd
|
20e69d109b
|
Merge pull request 'setup for esle player' (#46) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/46
|
2025-11-04 08:31:09 +00:00 |
|
|
VDH
|
eaf1a4ba2d
|
Merge remote-tracking branch 'origin/develop' into feature/skill-data
# Conflicts:
# .idea/.idea.perfect-world-unity/.idea/workspace.xml
# Assets/AddressableAssetsData.meta
# Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
# Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta
# Assets/AddressableAssetsData/AddressableAssetSettings.asset
# Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
# Assets/AddressableAssetsData/AssetGroupTemplates.meta
# Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
# Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
# Assets/AddressableAssetsData/AssetGroups.meta
# Assets/AddressableAssetsData/AssetGroups/Schemas.meta
# Assets/AddressableAssetsData/AssetGroups/Schemas/models_BundledAssetGroupSchema.asset
# Assets/AddressableAssetsData/AssetGroups/Schemas/models_BundledAssetGroupSchema.asset.meta
# Assets/AddressableAssetsData/AssetGroups/Schemas/models_ContentUpdateGroupSchema.asset
# Assets/AddressableAssetsData/AssetGroups/Schemas/models_ContentUpdateGroupSchema.asset.meta
# Assets/AddressableAssetsData/AssetGroups/models.asset
# Assets/AddressableAssetsData/AssetGroups/models.asset.meta
# Assets/AddressableAssetsData/DataBuilders.meta
# Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
# Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
# Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
# Assets/AddressableAssetsData/DefaultObject.asset
# Assets/AddressableAssetsData/DefaultObject.asset.meta
# Assets/Scenes/a61.unity
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-04 15:29:57 +07:00 |
|
|
HungDK
|
9e825620cd
|
Fix GameController position in scene
|
2025-11-04 15:11:50 +07:00 |
|
|
HungDK
|
2793515e31
|
Update NPCRender.unity
|
2025-11-04 15:09:25 +07:00 |
|
|
HungDK
|
1f7c20069c
|
Merge branch 'develop' into feature/revive
|
2025-11-04 14:51:15 +07:00 |
|
|
HungDK
|
28aff4cd75
|
Add work dead
|
2025-11-04 14:37:15 +07:00 |
|
|
HungDK
|
05d952860b
|
Add revive handle on host and else player
|
2025-11-04 14:36:59 +07:00 |
|
|
HungDK
|
53da747d56
|
Request and play anim revive
|
2025-11-04 14:36:40 +07:00 |
|
|
HungDK
|
bc7693aceb
|
Add revive data structure of revive
|
2025-11-04 14:32:23 +07:00 |
|