duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
eaf1a4ba2d2a15429639b4643a477a95133b30d8
test/Assets/PerfectWorld/Scripts
T
History
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
..
Addressable
addressable ui
2025-10-25 17:28:46 +07:00
Boostrap
testfast
2025-10-28 10:31:28 +07:00
Common
Merge remote-tracking branch 'origin/develop' into feature/skill-data
2025-11-04 15:29:57 +07:00
GameData
Merge remote-tracking branch 'origin/develop' into feature/skill-data
2025-11-04 15:29:57 +07:00
MainFiles
Merge branch 'develop' into feature/inventories
2025-10-27 10:33:38 +07:00
Managers
Merge branch 'develop' into feature/else-player
2025-11-04 13:51:24 +07:00
ModelFiles
convert continue :)))
2025-11-03 17:34:39 +07:00
Move
dummy fix showing weapon
2025-11-04 14:17:05 +07:00
Network
Merge remote-tracking branch 'origin/develop' into feature/skill-data
2025-11-04 15:29:57 +07:00
NPC
attack animatin with weapon type
2025-11-04 09:36:23 +07:00
Objet
npc leave after die
2025-10-16 10:53:05 +07:00
Pattern
convert continue :)))
2025-11-03 17:34:39 +07:00
Players
fix bug
2025-11-04 11:31:10 +07:00
PlayerState
Merge branch 'develop' into feature/hp_normal_attack
2025-10-20 16:58:20 +07:00
Skills
convert continue :)))
2025-11-03 17:34:39 +07:00
Sound
Add sfx login
2025-10-29 17:02:43 +07:00
Task
fix bug missing namespace after merge from develop
2025-11-03 17:36:42 +07:00
UI
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
2025-11-03 17:37:16 +07:00
Utils
update subfix of addressable also
2025-10-22 16:43:10 +07:00
World
fix: update logic check bush.
2025-10-16 18:35:15 +07:00
Addressable.meta
addressable intial commit
2025-10-22 16:34:56 +07:00
Boostrap.meta
Unity Game Session MVP
2025-09-08 16:28:54 +07:00
Common.meta
Unity Game Session MVP
2025-09-08 16:28:54 +07:00
GameData.meta
elementdataman
2025-09-13 14:58:00 +07:00
MainFiles.meta
organize folder
2025-10-10 15:10:36 +07:00
Managers.meta
demo post message
2025-09-06 15:12:00 +07:00
ModelFiles.meta
skill convert processing
2025-10-31 17:50:04 +07:00
Move.meta
organize folder
2025-10-10 15:10:36 +07:00
Network.meta
demo post message
2025-09-06 15:12:00 +07:00
NPC.meta
monster process
2025-09-24 18:07:22 +07:00
Objet.meta
npc leave after die
2025-10-16 10:53:05 +07:00
Pattern.meta
convert continue :)))
2025-11-03 17:34:39 +07:00
Players.meta
fix: Update show elesplayer,
2025-09-08 01:27:59 +07:00
PlayerState.meta
organize folder
2025-10-10 15:10:36 +07:00
Skills.meta
inital skill
2025-10-16 11:17:25 +07:00
Sound.meta
Add sfx login
2025-10-29 17:02:43 +07:00
Task.meta
organize folder
2025-10-10 15:10:36 +07:00
UI.meta
Unity Game Session MVP
2025-09-08 16:28:54 +07:00
Utils.meta
remove missing scripts.
2025-10-18 10:54:09 +07:00
World.meta
monster process
2025-09-24 18:07:22 +07:00