Merge branch 'master_xma_local' into master_develop
# Conflicts: # Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_01.prefab # Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_02.prefab # Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_03.prefab
commit
e0c8ecfba8
|
|
@ -0,0 +1,118 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Effect_c_swk_00015_s1_attack_PG_001
|
||||
m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 3020
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DissolveSrc:
|
||||
m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DissolveTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 5ccdfda035691d84096219990deae330, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Mask:
|
||||
m_Texture: {fileID: 2800000, guid: 3999ddd8ab093f540b331b92dc2b6553, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MaskTex:
|
||||
m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _Amount: 0.28
|
||||
- _BlendMode: 0
|
||||
- _BlendOp: -1
|
||||
- _BumpScale: 1
|
||||
- _CullMode: 0
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _Dissolve: 0
|
||||
- _DissolveEdge: 0
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Illuminate: 0
|
||||
- _InvFade: 0.01
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _PZWrite: 0
|
||||
- _Parallax: 0.02
|
||||
- _QueueOffset: 0
|
||||
- _RenderMode: 0
|
||||
- _ReplaySpeed: 4
|
||||
- _Shininess: 0.03
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _StartAmount: 0.1
|
||||
- _Stencil: 0
|
||||
- _Thickness: 0
|
||||
- _Tile: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1}
|
||||
- _DissColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _NumTexTiles: {r: 4, g: 4, b: 0, a: 0}
|
||||
- _Scrolls: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Tiling: {r: 2, g: 2, b: 2, a: 1}
|
||||
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 433f955dc5bbc934aaf490bb578909c8
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Effect_c_swk_00015_s1_attack_PG_014
|
||||
m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DissolveSrc:
|
||||
m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DissolveTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 115870fa1f5d9b44cba0715507c82a31, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Mask:
|
||||
m_Texture: {fileID: 2800000, guid: 3999ddd8ab093f540b331b92dc2b6553, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MaskTex:
|
||||
m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _Amount: 0.28
|
||||
- _BlendMode: 0
|
||||
- _BlendOp: -1
|
||||
- _BumpScale: 1
|
||||
- _CullMode: 0
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _Dissolve: 0
|
||||
- _DissolveEdge: 0
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Illuminate: 0
|
||||
- _InvFade: 0.01
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _PZWrite: 0
|
||||
- _Parallax: 0.02
|
||||
- _QueueOffset: 0
|
||||
- _RenderMode: 0
|
||||
- _ReplaySpeed: 4
|
||||
- _Shininess: 0.03
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _StartAmount: 0.1
|
||||
- _Stencil: 0
|
||||
- _Thickness: 0
|
||||
- _Tile: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1}
|
||||
- _DissColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _NumTexTiles: {r: 4, g: 4, b: 0, a: 0}
|
||||
- _Scrolls: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Tiling: {r: 2, g: 2, b: 2, a: 1}
|
||||
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: eb093150e97ff934c92fad9c0a8b3f22
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -13,7 +13,7 @@ Material:
|
|||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
m_CustomRenderQueue: 3020
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Material:
|
|||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 3003
|
||||
m_CustomRenderQueue: 3020
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Material:
|
|||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
m_CustomRenderQueue: 3020
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Transform:
|
|||
m_LocalScale: {x: 270, y: 270, z: 270}
|
||||
m_Children:
|
||||
- {fileID: 3356387044126691763}
|
||||
m_Father: {fileID: 8201687418104535279}
|
||||
m_Father: {fileID: 7115114108858669905}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1079010722200154473
|
||||
|
|
@ -136,7 +136,7 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8201687418104535279}
|
||||
- component: {fileID: 7115114108858669905}
|
||||
m_Layer: 0
|
||||
m_Name: Effect_c_swk_00015_s1_attack_PG_01
|
||||
m_TagString: Untagged
|
||||
|
|
@ -144,8 +144,8 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8201687418104535279
|
||||
Transform:
|
||||
--- !u!224 &7115114108858669905
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
|
|
@ -159,3 +159,8 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
|
|||
|
|
@ -24006,7 +24006,7 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1531214235774446816}
|
||||
- component: {fileID: 6809796580800177351}
|
||||
m_Layer: 0
|
||||
m_Name: Effect_c_swk_00015_s1_attack_PG_02
|
||||
m_TagString: Untagged
|
||||
|
|
@ -24014,8 +24014,8 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1531214235774446816
|
||||
Transform:
|
||||
--- !u!224 &6809796580800177351
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
|
|
@ -24029,6 +24029,11 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7763733998739602406
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -24052,8 +24057,8 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7763733998739602406}
|
||||
m_LocalRotation: {x: -0, y: -0, z: 0.050078727, w: -0.9987453}
|
||||
m_LocalPosition: {x: -146, y: -425, z: -1350.0001}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 269.8294, y: 269.8294, z: 269.82935}
|
||||
m_Children:
|
||||
- {fileID: 7735253518723190852}
|
||||
|
|
@ -24062,6 +24067,6 @@ Transform:
|
|||
- {fileID: 3089160793648044276}
|
||||
- {fileID: 7162013205933782997}
|
||||
- {fileID: 6431258561695757426}
|
||||
m_Father: {fileID: 1531214235774446816}
|
||||
m_Father: {fileID: 6809796580800177351}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2617377208696537374}
|
||||
- component: {fileID: 8955167582444815817}
|
||||
m_Layer: 0
|
||||
m_Name: Effect_c_swk_00015_s1_attack_PG_03
|
||||
m_TagString: Untagged
|
||||
|
|
@ -16,8 +16,8 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2617377208696537374
|
||||
Transform:
|
||||
--- !u!224 &8955167582444815817
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
|
|
@ -31,6 +31,11 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &2032425788429851961
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -42954,7 +42959,7 @@ Transform:
|
|||
- {fileID: 8566623569120840947}
|
||||
- {fileID: 3716341856472300906}
|
||||
- {fileID: 3710348189195749509}
|
||||
m_Father: {fileID: 2617377208696537374}
|
||||
m_Father: {fileID: 8955167582444815817}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6808953163390148671
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 256 KiB |
|
|
@ -0,0 +1,56 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 115870fa1f5d9b44cba0715507c82a31
|
||||
timeCreated: 1561594660
|
||||
licenseType: Pro
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: .25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 8
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: -1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: .5, y: .5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaIsTransparency: 0
|
||||
textureType: -1
|
||||
buildTargetSettings: []
|
||||
spriteSheet:
|
||||
sprites: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 433 KiB |
|
|
@ -13,7 +13,7 @@ Material:
|
|||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 3001
|
||||
m_CustomRenderQueue: 3020
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
|
|
|
|||
|
|
@ -377,6 +377,8 @@ function SkillCaster:CheckSkillForoleEffect(combat, skill)
|
|||
local sortingOrder
|
||||
if self.owner.cam == 0 then
|
||||
sortingOrder = self.owner.GameObject:GetComponent("Canvas").sortingOrder
|
||||
else
|
||||
sortingOrder = BattleManager.GetBattleSorting() + 20
|
||||
end
|
||||
go = BattleManager.LoadAsset(path, sortingOrder)
|
||||
go.transform:SetParent(self.owner.GameObject.transform)
|
||||
|
|
@ -413,12 +415,11 @@ end
|
|||
-- 检测技能命中特效显示
|
||||
function SkillCaster:CheckSkillHitEffect(checkType, combat, skill)
|
||||
if not combat then return end
|
||||
|
||||
if checkType == "skill" then
|
||||
-- 释放技能时检测,如果是范围命中效果
|
||||
if combat.HitEffectType == 2 and combat.Hit then
|
||||
local targets = skill:GetDirectTargets()
|
||||
if not targets or not targets[1] or targets[1]:IsDead() then return end
|
||||
if not targets or not targets[1] then return end -- or targets[1]:IsDead() 删除了死亡的判断,会偶现被击特效不显示的问题
|
||||
local tv = self.owner.RootPanel.GetRoleView(targets[1])
|
||||
if not tv then return end
|
||||
|
||||
|
|
@ -430,7 +431,7 @@ function SkillCaster:CheckSkillHitEffect(checkType, combat, skill)
|
|||
-- 特效的偏移量
|
||||
local offset = combat.HitOffset and Vector3.New(combat.HitOffset[1], combat.HitOffset[2], 0) or Vector3.zero
|
||||
|
||||
local sortingOrder = tv.role.camp == 0 and tv.GameObject:GetComponent("Canvas").sortingOrder + 21 or nil
|
||||
local sortingOrder = tv.role.camp == 0 and tv.GameObject:GetComponent("Canvas").sortingOrder + 21 or BattleManager.GetBattleSorting() + 20
|
||||
local go = BattleManager.LoadAsset(combat.Hit, sortingOrder)
|
||||
go.transform:SetParent(self.effectRoot.transform)
|
||||
-- 检测特效旋转
|
||||
|
|
@ -448,7 +449,7 @@ function SkillCaster:CheckSkillHitEffect(checkType, combat, skill)
|
|||
if combat.HitEffectType == 1 and combat.Hit then
|
||||
local offset = combat.HitOffset and Vector3.New(combat.HitOffset[1], combat.HitOffset[2], 0) or Vector3.zero
|
||||
|
||||
local sortingOrder = self.owner.role.camp == 0 and self.owner.GameObject:GetComponent("Canvas").sortingOrder + 21 or nil
|
||||
local sortingOrder = self.owner.role.camp == 0 and self.owner.GameObject:GetComponent("Canvas").sortingOrder + 21 or BattleManager.GetBattleSorting() + 20
|
||||
local go2 = BattleManager.LoadAsset(combat.Hit, sortingOrder)
|
||||
go2.transform:SetParent(self.owner.GameObject.transform.parent)
|
||||
-- 检测特效旋转
|
||||
|
|
|
|||
|
|
@ -199,6 +199,8 @@ function this.RunFakeBattle(fakeId)
|
|||
end
|
||||
-- 战斗数据
|
||||
function this.RunBattleData(data, seed)
|
||||
data = loadstring("return "..data)()
|
||||
seed = tonumber(seed)
|
||||
require("Modules.Main.BattleData1")
|
||||
local fdata = (data and data ~= "") and data or testBattleData1
|
||||
local fseed = (seed and seed ~= "") and seed or testBattleSeed
|
||||
|
|
|
|||
Loading…
Reference in New Issue