ed38351ba4
# Conflicts: # Assets/Prefab/AimCanvas.prefab # Assets/Prefab/BarCAnvas.prefab # Assets/Resources/1/Character/Prefab/Asvald.prefab # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_box_blur.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_blur 1.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_blur.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_glow.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_line_blue.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_glow.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_glow_small.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_rotate_line.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_rotate_line_small.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_blue.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_green.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_purple.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_red.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_white.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_yellow.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_blue.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_green.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_light.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_purple.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_red.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_white.png # Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_yellow.png # Assets/Resources/1/_NewSprites/Logo.png # Assets/Resources/1/_NewSprites/icon.png # Assets/Resources/Data/ItemData.asset # Assets/Scripts/Controller/GameInit.cs # Assets/Scripts/Items/ItemFabric.cs # Assets/Scripts/Units/Unit.cs # Assets/Scripts/Units/Views/UnitView.cs # Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf # Assets/TextMesh Pro/Fonts/LiberationSans.ttf # Assets/TextMesh Pro/Sprites/EmojiOne.png
12 lines
243 B
Plaintext
12 lines
243 B
Plaintext
fileFormatVersion: 2
|
|
guid: 3c05fa7f50c14939b1897888f5693f54
|
|
MonoImporter:
|
|
externalObjects: {}
|
|
serializedVersion: 2
|
|
defaultReferences: []
|
|
executionOrder: 0
|
|
icon: {instanceID: 0}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|