-
Notifications
You must be signed in to change notification settings - Fork 155
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/assetbundle #3510
base: development
Are you sure you want to change the base?
Feature/assetbundle #3510
Conversation
Took THEIRS # Conflicts: # nekoyume/Assets/BundledResources/VFX/MaterialsTextures/NY_UI_rainbow.mat # nekoyume/Assets/BundledResources/VFX/MaterialsTextures/NY_UI_rainbow.mat.meta # nekoyume/Assets/BundledResources/VFX/MaterialsTextures/NY_UI_rainbow.png # nekoyume/Assets/BundledResources/VFX/MaterialsTextures/NY_UI_rainbow.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/CelebratesVFX.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/CelebratesVFX.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Result_Light.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Result_Light.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_Lobby_bg_main_LightVFX.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_Lobby_bg_main_LightVFX.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_Lobby_bg_main_WorldBossVFX.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_Lobby_bg_main_WorldBossVFX.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_Lobby_bg_main_portal2VFX.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_Lobby_bg_main_portal2VFX.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_main_bg_rainbow.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_main_bg_rainbow.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_main_light.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_main_light.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_patrolreward_000102.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_patrolreward_000102.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_patrolreward_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/UI_patrolreward_03.prefab.meta # nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Shop.spriteatlas
…undle # Conflicts: # nekoyume/Assets/BundledResources/UI/Icons/Item/700902.png # nekoyume/Assets/BundledResources/UI/Icons/Item/700902.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/700904.png # nekoyume/Assets/BundledResources/UI/Icons/Item/700904.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/700906.png # nekoyume/Assets/BundledResources/UI/Icons/Item/700906.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701002.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701002.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701004.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701004.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701006.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701006.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701102.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701102.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701104.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701104.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701106.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701106.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701202.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701202.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701204.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701204.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701206.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701206.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701302.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701302.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701304.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701304.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701306.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701306.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701402.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701402.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701404.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701404.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701406.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701406.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701502.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701502.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701504.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701504.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701506.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701506.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701602.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701602.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701604.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701604.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701606.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701606.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701702.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701702.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701704.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701704.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701706.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701706.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701802.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701802.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701804.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701804.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701806.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701806.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701902.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701902.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701904.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701904.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/701906.png # nekoyume/Assets/BundledResources/UI/Icons/Item/701906.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702002.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702002.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702004.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702004.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702006.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702006.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702102.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702102.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702104.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702104.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702106.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702106.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702202.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702202.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702204.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702204.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/702206.png # nekoyume/Assets/BundledResources/UI/Icons/Item/702206.png.meta
…undle # Conflicts: # nekoyume/Assets/BundledResources/Audio/Sfx/Prefabs/sfx_star.prefab # nekoyume/Assets/BundledResources/Audio/Sfx/Prefabs/sfx_star.prefab.meta # nekoyume/Assets/BundledResources/Audio/Sfx/clips/sfx_star.wav # nekoyume/Assets/BundledResources/Audio/Sfx/clips/sfx_star.wav.meta # nekoyume/Assets/BundledResources/Character/PlayerSpineTexture/Weapon/10130002.png # nekoyume/Assets/BundledResources/Character/PlayerSpineTexture/Weapon/10130002.png.meta # nekoyume/Assets/BundledResources/HelpPopupData/Sprites/result_29_Seasonpass.png # nekoyume/Assets/BundledResources/HelpPopupData/Sprites/result_29_Seasonpass.png.meta # nekoyume/Assets/BundledResources/UI/Animations/LastReward.controller # nekoyume/Assets/BundledResources/UI/Animations/LastReward.controller.meta # nekoyume/Assets/BundledResources/UI/Animations/[email protected] # nekoyume/Assets/BundledResources/UI/Animations/[email protected] # nekoyume/Assets/BundledResources/UI/Animations/[email protected] # nekoyume/Assets/BundledResources/UI/Animations/[email protected] # nekoyume/Assets/BundledResources/UI/Animations/[email protected] # nekoyume/Assets/BundledResources/UI/Animations/[email protected] # nekoyume/Assets/BundledResources/UI/Animations/[email protected] # nekoyume/Assets/BundledResources/UI/Animations/[email protected] # nekoyume/Assets/BundledResources/UI/Icons/Item/10130002.png # nekoyume/Assets/BundledResources/UI/Icons/Item/10130002.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/49900012.png # nekoyume/Assets/BundledResources/UI/Icons/Item/49900012.png.meta # nekoyume/Assets/BundledResources/UI/Prefabs/UI_IntroScreen_backup.prefab # nekoyume/Assets/BundledResources/UI/Prefabs/UI_IntroScreen_backup.prefab.meta # nekoyume/Assets/BundledResources/UI/Prefabs/UI_InviteFriendsPopup.prefab # nekoyume/Assets/BundledResources/UI/Prefabs/UI_InviteFriendsPopup.prefab.meta # nekoyume/Assets/BundledResources/UI/Prefabs/UI_SeasonPass.prefab # nekoyume/Assets/BundledResources/UI/Prefabs/UI_SeasonPass.prefab.meta # nekoyume/Assets/BundledResources/UI/Prefabs/UI_SeasonPassNewPopup.prefab # nekoyume/Assets/BundledResources/UI/Prefabs/UI_SeasonPassNewPopup.prefab.meta # nekoyume/Assets/BundledResources/UI/Prefabs/UI_SeasonPassPremiumPopup.prefab # nekoyume/Assets/BundledResources/UI/Prefabs/UI_SeasonPassPremiumPopup.prefab.meta # nekoyume/Assets/BundledResources/UI/Textures/00_Loading/loading_worldboss.png # nekoyume/Assets/BundledResources/UI/Textures/00_Loading/loading_worldboss.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/PremiumPlusVFX.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/PremiumPlusVFX.prefab.meta # nekoyume/Assets/Resources/UI/Animations/[email protected] # nekoyume/Assets/Resources/UI/Animations/[email protected] # nekoyume/ProjectSettings/ProjectSettings.asset
…undle # Conflicts: # nekoyume/Assets/BundledResources/Font/Materials/ChineseSimplified SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/ChineseSimplified SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/ChineseSimplified SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/ChineseSimplified SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/ChineseSimplified SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/ChineseSimplified SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/ChineseTraditional SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/ChineseTraditional SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/ChineseTraditional SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/ChineseTraditional SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/ChineseTraditional SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/ChineseTraditional SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/English SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/English SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/English SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/English SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/English SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/English SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Japanese SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/Japanese SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Japanese SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/Japanese SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Japanese SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/Japanese SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Korean SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/Korean SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Korean SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/Korean SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Korean SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/Korean SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/PortugueseBrazil SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/PortugueseBrazil SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/PortugueseBrazil SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/PortugueseBrazil SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/PortugueseBrazil SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/PortugueseBrazil SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Russia SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/Russia SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Russia SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/Russia SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Russia SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/Russia SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Spanish SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/Spanish SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Spanish SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/Spanish SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Spanish SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/Spanish SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Thai SDF Material - WorldmapClose.mat # nekoyume/Assets/BundledResources/Font/Materials/Thai SDF Material - WorldmapClose.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Thai SDF Material - WorldmapOpen.mat # nekoyume/Assets/BundledResources/Font/Materials/Thai SDF Material - WorldmapOpen.mat.meta # nekoyume/Assets/BundledResources/Font/Materials/Thai SDF Material - WorldmapUnlock.mat # nekoyume/Assets/BundledResources/Font/Materials/Thai SDF Material - WorldmapUnlock.mat.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300011.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300011.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300012.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300012.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300013.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300013.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300014.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300014.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300015.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300015.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300016.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300016.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300017.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300017.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300018.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300018.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300019.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300019.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40300020.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40300020.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500011.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500011.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500012.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500012.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500013.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500013.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500014.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500014.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500015.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500015.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500016.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500016.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500017.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500017.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500018.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500018.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500019.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500019.png.meta # nekoyume/Assets/BundledResources/UI/Icons/Item/40500020.png # nekoyume/Assets/BundledResources/UI/Icons/Item/40500020.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue.atlas.txt # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue.atlas.txt.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue.json # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue.json.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue.png # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue_Atlas.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue_Atlas.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue_Material.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue_Material.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue_SkeletonData.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-blue_SkeletonData.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green.atlas.txt # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green.atlas.txt.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green.json # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green.json.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green.png # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_Atlas.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_Atlas.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_Material-Additive.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_Material-Additive.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_Material-Screen.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_Material-Screen.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_Material.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_Material.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_SkeletonData.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-green_SkeletonData.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple.atlas.txt # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple.atlas.txt.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple.json # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple.json.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple.png # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple_Atlas.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple_Atlas.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple_Material.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple_Material.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple_SkeletonData.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-purple_SkeletonData.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow.atlas.txt # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow.atlas.txt.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow.json # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow.json.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow.png # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_Atlas.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_Atlas.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_Material-Additive.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_Material-Additive.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_Material-Screen.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_Material-Screen.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_Material.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_Material.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_SkeletonData.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_01-yellow_SkeletonData.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue.atlas.txt # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue.atlas.txt.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue.json # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue.json.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue.png # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue_Atlas.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue_Atlas.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue_Material.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue_Material.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue_SkeletonData.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-blue_SkeletonData.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green.atlas.txt # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green.atlas.txt.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green.json # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green.json.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green.png # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_Atlas.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_Atlas.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_Material-Additive.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_Material-Additive.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_Material-Screen.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_Material-Screen.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_Material.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_Material.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_SkeletonData.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-green_SkeletonData.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple.atlas.txt # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple.atlas.txt.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple.json # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple.json.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple.png # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple_Atlas.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple_Atlas.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple_Material.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple_Material.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple_SkeletonData.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-purple_SkeletonData.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow.atlas.txt # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow.atlas.txt.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow.json # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow.json.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow.png # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow.png.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_Atlas.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_Atlas.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_Material-Additive.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_Material-Additive.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_Material-Screen.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_Material-Screen.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_Material.mat # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_Material.mat.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_SkeletonData.asset # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/Spine/Aura_02-yellow_SkeletonData.asset.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_01_blue_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_01_blue_03.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_01_green_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_01_green_03.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_01_violet_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_01_violet_03.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_01_yellow_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_01_yellow_03.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_02_blue_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_02_blue_03.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_02_green_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_02_green_03.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_02_violet_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_02_violet_03.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_02_yellow_03.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraResourecs/aura_02_yellow_03.prefab.meta # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraSample.prefab # nekoyume/Assets/BundledResources/VFX/Prefabs/Aura/AuraSample.prefab.meta # nekoyume/Assets/_Scripts/UI/Tutorial/TutorialController.cs # nekoyume/ProjectSettings/GvhProjectSettings.xml
This PR has Quantification details
Why proper sizing of changes matters
Optimal pull request sizes drive a better predictable PR flow as they strike a
What can I do to optimize my changes
How to interpret the change counts in git diff output
Was this comment helpful? 👍 :ok_hand: :thumbsdown: (Email) |
|
Description
AssetBundle 분리를 통한 앱 전체 용량 축소 및 메모리 최적화
AssetBundle 기능 추가
동적 로딩-언로딩 추가
기존 동적로딩 파트 AssetBundle로드로 대체
How to test
TODO