增加凯多角色

onepiece_demo_arena
xiejun 2023-07-02 21:52:32 +08:00
parent fd59086676
commit ab6a726b3a
28 changed files with 1247 additions and 689 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 MiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: d80411e1b448d5d468ff6c425f7e824d
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 427d9b6ef7a034142bae0e5fa3e2d22c
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 529e00d577ac5f24a80ca25206a47ee0
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: c788dfed477eab04dbab1ec3ad4bdd73
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 917468adc38826a4385c0d8049e14205
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a1dfb4bd72a0a284ea760b76dc1445cc
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: f6d8e5ddbaa291a4e93baa1e1e214bb7
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 00b0d5568c37a0a46863b416b67407cb
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -9861,7 +9861,7 @@ RectTransform:
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: 435, y: -658}
m_AnchoredPosition: {x: 150, y: -551}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &-7319966375981102351
@ -25633,8 +25633,8 @@ RectTransform:
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: -20, y: 30}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 235, y: -101}
m_SizeDelta: {x: 520, y: 889}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &-1483527777593229461
GameObject:
@ -25669,7 +25669,7 @@ RectTransform:
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: 172, y: -520}
m_AnchoredPosition: {x: -113, y: -413}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &-1303641493584541925
@ -27425,7 +27425,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044302834}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 99.97763}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 437121364}
@ -27449,8 +27449,8 @@ RectTransform:
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: -1952, y: 1235}
m_SizeDelta: {x: 290, y: 442}
m_AnchoredPosition: {x: -1158, y: 594.09985}
m_SizeDelta: {x: 172, y: 172}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1044302837
CanvasRenderer:
@ -33430,7 +33430,7 @@ RectTransform:
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: 183, y: 209}
m_AnchoredPosition: {x: -102, y: 316}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &117053801067986580
@ -44533,7 +44533,7 @@ RectTransform:
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: 437, y: -276}
m_AnchoredPosition: {x: 152, y: -169}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &955111747055170081
@ -55141,7 +55141,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5721896765191474331
RectTransform:
m_ObjectHideFlags: 0
@ -80623,7 +80623,7 @@ RectTransform:
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: 438, y: 37}
m_AnchoredPosition: {x: 153, y: 144}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2822669952964638746
@ -81284,7 +81284,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2874419574162345741
RectTransform:
m_ObjectHideFlags: 0
@ -180935,7 +180935,7 @@ RectTransform:
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: 175, y: -174}
m_AnchoredPosition: {x: -110, y: -67}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6629286203943054682
@ -242786,6 +242786,11 @@ PrefabInstance:
propertyPath: m_Name
value: c_long_zhandou_lizi
objectReference: {fileID: 0}
- target: {fileID: 3228300391096871728, guid: 3d2c64d03b9529e41a439003a94cf617,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3813236059885055480, guid: 3d2c64d03b9529e41a439003a94cf617,
type: 3}
propertyPath: m_LocalPosition.x

View File

@ -599,8 +599,8 @@ RectTransform:
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: 35.4, y: 23.6}
m_SizeDelta: {x: 26, y: 26}
m_AnchoredPosition: {x: 45, y: 44}
m_SizeDelta: {x: 42, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7992611271923775960
CanvasRenderer:
@ -639,6 +639,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &36996742129138317
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7108782143553525394}
- component: {fileID: 1134658107095842465}
- component: {fileID: 4554563273459945240}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7108782143553525394
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 36996742129138317}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1473827928010218247}
m_RootOrder: 9
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: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1134658107095842465
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 36996742129138317}
m_CullTransparentMesh: 0
--- !u!114 &4554563273459945240
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 36996742129138317}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d80411e1b448d5d468ff6c425f7e824d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &52439346268391356
GameObject:
m_ObjectHideFlags: 0
@ -14790,8 +14864,8 @@ RectTransform:
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: 35.4, y: 23.6}
m_SizeDelta: {x: 26, y: 26}
m_AnchoredPosition: {x: 45, y: 44}
m_SizeDelta: {x: 42, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6152828126037669513
CanvasRenderer:
@ -19699,8 +19773,8 @@ RectTransform:
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: 35.4, y: 23.6}
m_SizeDelta: {x: 26, y: 26}
m_AnchoredPosition: {x: 45, y: 44}
m_SizeDelta: {x: 42, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6540035719649651047
CanvasRenderer:
@ -19895,7 +19969,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1508767087665272957
RectTransform:
m_ObjectHideFlags: 0
@ -20094,7 +20168,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -42, y: -136}
m_AnchoredPosition: {x: -62, y: -301}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1214399939458572418
@ -20558,7 +20632,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3124962570895569612
RectTransform:
m_ObjectHideFlags: 0
@ -20864,7 +20938,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5517260209263683791
RectTransform:
m_ObjectHideFlags: 0
@ -22141,7 +22215,7 @@ RectTransform:
m_GameObject: {fileID: 2612545891026455540}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children:
- {fileID: 1956258183123164743}
- {fileID: 7111826681632226868}
@ -22150,7 +22224,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 48, y: 72}
m_AnchoredPosition: {x: 34, y: 68}
m_SizeDelta: {x: 147, y: 662}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6392692323906310469
@ -23631,8 +23705,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 57, y: -69}
m_SizeDelta: {x: 148, y: 126}
m_AnchoredPosition: {x: 64.6, y: -64.3}
m_SizeDelta: {x: 138, y: 122}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &600217400349962022
CanvasRenderer:
@ -24125,7 +24199,7 @@ RectTransform:
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: 176, y: 176}
m_SizeDelta: {x: 138, y: 122}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3429949318808366111
CanvasRenderer:
@ -24155,7 +24229,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 37b24b9600e34bc46af112f7dd0579c9, type: 3}
m_Sprite: {fileID: 21300000, guid: 8e71acaef2cea6e4d8e89e48a7d260ae, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -29475,7 +29549,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2487322578737295235
RectTransform:
m_ObjectHideFlags: 0
@ -34386,7 +34460,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8711988954666217240
RectTransform:
m_ObjectHideFlags: 0
@ -34856,7 +34930,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 69, y: 7}
m_AnchoredPosition: {x: 85, y: -61}
m_SizeDelta: {x: 100, y: 100.000015}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4781727753083145598
@ -45700,7 +45774,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7682634954648963246
RectTransform:
m_ObjectHideFlags: 0
@ -57047,7 +57121,7 @@ RectTransform:
m_GameObject: {fileID: 4714194501442786280}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75294, y: 0.75294, z: 0.75294}
m_LocalScale: {x: 1, y: 1, z: 0.75294}
m_Children:
- {fileID: 1407379797450811008}
- {fileID: 4619756014181260901}
@ -57056,8 +57130,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -137}
m_SizeDelta: {x: 160.2, y: 902.6}
m_AnchoredPosition: {x: 170, y: -183}
m_SizeDelta: {x: 147, y: 662}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6257897751989525113
CanvasRenderer:
@ -68505,7 +68579,7 @@ RectTransform:
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: 176, y: 176}
m_SizeDelta: {x: 138, y: 122}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8824506480658754774
CanvasRenderer:
@ -68535,7 +68609,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 5831feaa9b3f96d4caa277f4c794e04f, type: 3}
m_Sprite: {fileID: 21300000, guid: f6d8e5ddbaa291a4e93baa1e1e214bb7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -70791,7 +70865,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7754725958776047094
RectTransform:
m_ObjectHideFlags: 0
@ -70906,7 +70980,7 @@ RectTransform:
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: 176, y: 176}
m_SizeDelta: {x: 138, y: 122}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7233453053197335427
CanvasRenderer:
@ -70936,7 +71010,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: c0b3bf3c739b5874aa4ccb849bd2ba74, type: 3}
m_Sprite: {fileID: 21300000, guid: 529e00d577ac5f24a80ca25206a47ee0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -71276,8 +71350,8 @@ RectTransform:
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: 35.4, y: 23.6}
m_SizeDelta: {x: 26, y: 26}
m_AnchoredPosition: {x: 45, y: 44}
m_SizeDelta: {x: 42, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3103228585888554231
CanvasRenderer:
@ -71331,7 +71405,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4098794210407888594
RectTransform:
m_ObjectHideFlags: 0
@ -71672,7 +71746,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7882963723000738564
RectTransform:
m_ObjectHideFlags: 0
@ -72744,7 +72818,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 5a8901c400a952045b296654b26852ab, type: 3}
m_Sprite: {fileID: 21300000, guid: 917468adc38826a4385c0d8049e14205, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -73018,7 +73092,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2906059734384628762
RectTransform:
m_ObjectHideFlags: 0
@ -73743,11 +73817,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 85
m_Right: 11
m_Top: 32
m_Bottom: 50
m_ChildAlignment: 1
m_Spacing: 25
m_Spacing: 12.71
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -82321,7 +82395,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1072833264322135079
RectTransform:
m_ObjectHideFlags: 0
@ -82755,7 +82829,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1877704359351138992
RectTransform:
m_ObjectHideFlags: 0
@ -87659,7 +87733,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5260332697946394125
RectTransform:
m_ObjectHideFlags: 0
@ -87826,7 +87900,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &22985473912614593
RectTransform:
m_ObjectHideFlags: 0
@ -93128,7 +93202,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 32, y: 41}
m_SizeDelta: {x: 26, y: 26}
m_SizeDelta: {x: 42, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6527394029819058282
CanvasRenderer:
@ -93511,6 +93585,7 @@ RectTransform:
- {fileID: 7882963723000738564}
- {fileID: 3124962570895569612}
- {fileID: 5260332697946394125}
- {fileID: 7108782143553525394}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -93969,7 +94044,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4619756014181260901
RectTransform:
m_ObjectHideFlags: 0

View File

@ -12296,7 +12296,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 24
m_FontSize: 18
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 0

View File

@ -34,8 +34,8 @@ RectTransform:
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: -66.55, y: 7}
m_SizeDelta: {x: 90, y: 90}
m_AnchoredPosition: {x: -80, y: 5}
m_SizeDelta: {x: 105, y: 105}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222678909550277982
CanvasRenderer:
@ -235,11 +235,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Right: 28
m_Top: 13
m_Bottom: 0
m_ChildAlignment: 2
m_Spacing: 12.47
m_Spacing: 27.31
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@ -985,8 +985,8 @@ RectTransform:
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: -66.55, y: 7}
m_SizeDelta: {x: 90, y: 90}
m_AnchoredPosition: {x: -80, y: 5}
m_SizeDelta: {x: 105, y: 105}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7486104693350436940
CanvasRenderer:
@ -1133,8 +1133,8 @@ RectTransform:
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: -66.55, y: 7}
m_SizeDelta: {x: 90, y: 90}
m_AnchoredPosition: {x: -80, y: 5}
m_SizeDelta: {x: 105, y: 105}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4044471825024192370
CanvasRenderer:
@ -4267,8 +4267,8 @@ RectTransform:
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: -66.55, y: 7}
m_SizeDelta: {x: 90, y: 90}
m_AnchoredPosition: {x: -80, y: 5}
m_SizeDelta: {x: 105, y: 105}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7675101194925952394
CanvasRenderer:

View File

@ -142,7 +142,7 @@ function this.GetPassivityData(passivityList)
for i = 1, #passivityList do
local passiveId = tonumber(passivityList[i])
if passiveId then
LogError("passiveId======================"..passiveId)
--LogError("passiveId======================"..passiveId)
local cfg = PassiveSkillLogicConfig[passiveId]
-- 判断技能是否在战斗中生效
if cfg and cfg.EffectiveRange == 1 then

View File

@ -62,6 +62,7 @@ local effectList = {
caster.Event:DispatchEvent(BattleEventName.RoleViewBullet, skill, target)
BattleLogic.WaitForTrigger(interval, function ()
BattleUtil.CalDamage(skill, caster, target, dt, f1)
LogError("造成伤害"..os:clock());
end)
end,
--造成[a]%的[b]伤害【AOE】

View File

@ -71,6 +71,7 @@ function EffectCaster:DoEffect(caster, target, eff, duration, skill)
--
if Effect[e.type] then
Effect[e.type](caster, target, e.args, duration, skill)
LogError("造成效果"..os:clock())
end
end

View File

@ -185,8 +185,7 @@ function RoleLogic:Init(uid, data, position)
end
-- 初始怒气值放在被动之后计算,使被动对初始怒气的影响生效
self.Rage = self.Rage + self:GetRoleData(RoleDataName.InitRage)-- 当前怒气值
--tempdata
self.Rage = 0
end

View File

@ -79,6 +79,7 @@ function Skill:Cast(func)
end
--end
self.effectCaster:Cast()
LogError(self.id.."釋放完成"..os:clock())
end
self.owner.Event:DispatchEvent(BattleEventName.SkillCastBefore, self)
-- 释放技能开始

View File

@ -51,7 +51,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
toward=data.Toward
end
heroTData.Live = GetResourcePath(data.Live)
if heroTId==10016 then
if heroTId==10016 then
heroTData.Live=GetResourcePath(data.Painting)
end
heroTData.Scale = data.Scale

View File

@ -284,7 +284,7 @@ function this:Init()
this.EnemyDiffMonsterFlag = false
UIManager.camera.clearFlags = CameraClearFlags.Skybox
--注册战斗事件
this.InitBattleEvent()
@ -694,12 +694,12 @@ function this.BattleOrderChange(order)
-- local v3 = this.EnemyPanel:GetComponent("RectTransform").anchoredPosition
this.EnemyPanel.transform.localScale = Vector3.one
-- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(v3.x, posY)
if this.isBoss then
-- boss位置修正
this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector3.New(73, 280, 0)
else
this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector3.New(0, -20, 0)
end
-- if this.isBoss then
-- -- boss位置修正
-- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector3.New(73, 280, 0)
-- else
-- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector3.New(0, -20, 0)
-- end
for i=1, 6 do
local enemyPos = Util.GetTransform(this.EnemyPanel, tostring(i))
@ -723,6 +723,9 @@ function this.OnAddRole(data)
playerMaxHP = playerMaxHP + data:GetRoleData(RoleDataName.MaxHp)
tbRole[data] = PlayerView.New(go, data, data.position, this)
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
go.transform.anchoredPosition = Vector2.New(0,-170)
else
local enemyPos = Util.GetTransform(this.EnemyPanel, tostring(data.position))
-- go = BattlePool.GetItem(enemyPos, data.position <= 3 and BATTLE_POOL_TYPE.ENEMY_ROLE or BATTLE_POOL_TYPE.ENEMY_ROLE_2)
@ -734,11 +737,13 @@ function this.OnAddRole(data)
isBoss = true
end
tbRole[data] = EnemyView.New(go, data, data.position, this, isBoss, this.fightData and this.fightData.enemyId or nil)
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
go.transform.anchoredPosition = Vector2.New(0,-110)
end
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
-- go.transform.position = Vector3.New(0,-160,0)
go.transform.anchoredPosition = Vector2.New(0,-50)
go:SetActive(true)
end

View File

@ -66,7 +66,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId)
self.yujiaSlider.fillAmount = 0
self.livePath = GetResourcePath(live)
self.livePath2 = GetResourcePath(live)
if role.roleData.roleId==10016 then
if role.roleData.roleId==10016 or role.roleData.roleId== 21063 then
self.livePath2=GetResourcePath(HeroConfig[role.roleData.roleId].Painting)
end
self.play_liveScale = RoleConfig[roleId].play_liveScale
@ -112,7 +112,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId)
self.RoleLiveGO2 = poolManager:LoadLive(self.livePath2, go.transform.parent, Vector3.one, Vector3.zero)
self.RoleLiveGOGraphic2 = self.RoleLiveGO2:GetComponent("SkeletonGraphic")
self.RoleLiveGOTran2 = self.RoleLiveGO2:GetComponent("RectTransform")
if role.roleData.roleId==10016 then
if role.roleData.roleId==10016 or role.roleData.roleId== 21063 then
self.RoleLiveGOGraphic2.AnimationState:SetAnimation(0, "animation", true)
else
self.RoleLiveGOGraphic2.AnimationState:SetAnimation(0, "idle", true)
@ -252,7 +252,8 @@ end
function EnemyView:ChangeCardSorting(sortingOrder)
-- 重计算层级
local pos = (self.role.position + 2) % 6 + 1
local sort = sortingOrder + pos
local sort = sortingOrder + (self.role.position>3 and (6-self.role.position+1) or self.role.position)
--
self.liveRoot:GetComponent("Canvas").sortingOrder = sort
self.GameObject:GetComponent("Canvas").sortingOrder = sort + 2 --血条层级加2
@ -468,7 +469,7 @@ function EnemyView:OnSkillCastingStart()
-- 提前进入下一阶段
self.RoleLiveGO2:SetActive(true)
local name="touch"
if self.role.roleData.roleId==10016 then
if self.role.roleData.roleId==10016 or self.role.roleData.roleId== 21063 then
-- name="skill"
-- name="skill"
name="animation"

View File

@ -74,7 +74,7 @@ function PlayerView:onCreate(go, role, position, root)
end
self.livePath = GetResourcePath(live)
self.livePath2 = GetResourcePath(live)
if role.roleData.roleId==10016 then
if role.roleData.roleId==10016 or role.roleData.roleId== 21063 then
self.livePath2=GetResourcePath(HeroConfig[role.roleData.roleId].Painting)
end
end
@ -144,6 +144,7 @@ function PlayerView:onCreate(go, role, position, root)
self.RoleLiveGOTran.localScale = Vector3.one * self.enemy_liveScale
self.RoleLiveGOTran.sizeDelta = Vector2.New(1000, 1000)
self.RoleLiveGOGraphic = self.RoleLiveGO:GetComponent("SkeletonGraphic")
-- local t= self.RoleLiveGOGraphic.SkeletonData.animations
self.RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
self.RoleLiveGO:SetActive(true)
@ -165,7 +166,7 @@ function PlayerView:onCreate(go, role, position, root)
self.RoleLiveGO2:SetActive(false)
self.RoleLiveGOGraphic2 = self.RoleLiveGO2:GetComponent("SkeletonGraphic")
self.RoleLiveGOTran2 = self.RoleLiveGO2:GetComponent("RectTransform")
if role.roleData.roleId==10016 then
if role.roleData.roleId==10016 or role.roleData.roleId== 21063 then
self.RoleLiveGOGraphic2.AnimationState:SetAnimation(0, "animation", true)
else
self.RoleLiveGOGraphic2.AnimationState:SetAnimation(0, "idle", true)
@ -314,10 +315,8 @@ end
function PlayerView:ChangeCardSorting(sortingOrder)
-- 重计算层级
local pos = self.role.position
if pos>3 then
pos=6-pos+1
end
local sort = sortingOrder + pos
local sort = sortingOrder + (pos>3 and(6-pos+1) or pos)
self.liveRoot:GetComponent("Canvas").sortingOrder = sort
self.GameObject:GetComponent("Canvas").sortingOrder = sort + 2 --血条层级加一
@ -553,9 +552,8 @@ function PlayerView:OnSkillCastingStart(type)
-- 提前进入下一阶段
self.RoleLiveGO2:SetActive(true)
self.lvHpObj:SetActive(false)
local name="touch"
LogError(type)
if self.role.roleData.roleId==10016 then
local name="touch"
if self.role.roleData.roleId==10016 or self.role.roleData.roleId== 21063 then
type=0
name="animation"
coroutine.start(function()

View File

@ -60,11 +60,10 @@ function SkillCaster:OnSkillCast(skill)
-- if self.owner.OnSkillPlay then
-- self.owner:OnSkillPlay(type)
-- end
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50
if combat.AttackDisplacement ==1 then
self.owner.GameObject:SetActive(false)
local targets = skill:GetDirectTargets()
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50
local targets = skill:GetDirectTargets()
for _, target in ipairs(targets) do
local t= self.owner.RootPanel.GetRoleView(target)
self.owner.RoleLiveGO.transform:DOMove(Vector3.New(t.GameObject.transform.position.x-(self.owner.camp==0 and 0.4 or(-0.4)),t.GameObject.transform.position.y-0.4,t.GameObject.transform.position.z), combat.AttackDisplaceTime/1000, false):OnComplete(function ()
@ -73,8 +72,7 @@ function SkillCaster:OnSkillCast(skill)
end
end)
end
else
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50
else
if self.owner.OnSkillPlay then
self.owner:OnSkillPlay(type)
end
@ -91,13 +89,16 @@ function SkillCaster:OnSkillCast(skill)
self:CheckSkillForoleEffect(combat, skill)
end
end
LogError(self.owner.roleId.."|"..skill.id.."开始等待"..self.actionTime.."|"..os:clock())
self.owner:DelayFunc(self.actionTime, function()
LogError(skill.id.."结束等待"..os:clock())
self:CheckFullSceenSkill(combat, skill)
-- 继续战斗放在特效加载之后,避免特效加载时间对战斗时间得影响
BattleManager.ResumeBattle()
-- 取消高亮
self.owner:DelayFunc((combat.KeyFrame + combat.SkillDuration)/1000, function()
-- 恢复高亮
LogError(self.owner.roleId.."|".. skill.id.."恢复高亮"..os:clock())
self.owner.RootPanel.SetRoleHighLight()
-- 调用上层接口
if self.owner.OnSkillEnd then
@ -108,6 +109,8 @@ function SkillCaster:OnSkillCast(skill)
self.owner.GameObject:SetActive(true)
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50
end)
else
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50
end
end)
end)

View File

@ -4268,13 +4268,13 @@ end
--根据界面数据加载动态立绘
function this.LoadHerolive(_heroData, _objPoint)
--TODO:动态加载立绘
local t=_heroData.id==10016 and _heroData.painting or _heroData.live
local t=_heroData.id==10016 or _heroData.id==21063 and _heroData.painting or _heroData.live
LogError(t)
local testLive = poolManager:LoadLive(t, _objPoint.transform,
Vector3.one * _heroData.scale, Vector3.New(_heroData.position[1], _heroData.position[2], 0))
local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic")
local clip="idle"
if _heroData.id==10016 then
if _heroData.id==10016 or _heroData.id==21063 then
clip="animation"
end
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, clip, true) end

View File

@ -196,7 +196,7 @@ function this:InitComponent()
this.btnWaiDi:SetActive(false)
--家园
this.btnHomeLand = Util.GetGameObject(this.gameObject, "scene/layer4/btnHomeLand")
this.btnHomeLand:SetActive(true)
-- this.btnHomeLand:SetActive(true)
--跨服
this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer")
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
@ -290,11 +290,11 @@ function this:InitComponent()
this.btnFunHide[FUNCTION_OPEN_TYPE.EMAIL] = this.btnYouJian
this.btnFunHide[FUNCTION_OPEN_TYPE.GOODFRIEND] = this.btnFriend
this.btnFunHide[FUNCTION_OPEN_TYPE.ALLRANKING] = this.btnRank
this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnHongMeng
-- this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnHongMeng
-- this.btnFunHide[FUNCTION_OPEN_TYPE.NewShenzun] = this.btnShenzun
this.btnFunHide[FUNCTION_OPEN_TYPE.POKEMON] = this.btnPokemon
--this.btnFunHide[FUNCTION_OPEN_TYPE.tianshumijuan] = this.btnTianShuMiJuan
this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnXingYunTanBao
-- this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnXingYunTanBao
this.animRoot = Util.GetGameObject(self.gameObject, "scene")
--挑战关卡快速升级提示
@ -812,7 +812,7 @@ function this.BindRedPoint()
BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
--BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
BindRedPointObject(RedPointType.HongMeng,this.rpbtnXingYunTanBao)
-- BindRedPointObject(RedPointType.HongMeng,this.rpbtnXingYunTanBao)
BindRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
BindRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
BindRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
@ -844,7 +844,7 @@ function this.ClearRedPoint()
ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
--ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
ClearRedPointObject(RedPointType.HongMeng,this.rpbtnXingYunTanBao)
-- ClearRedPointObject(RedPointType.HongMeng,this.rpbtnXingYunTanBao)
ClearRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
ClearRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
ClearRedPointObject(RedPointType.RightUp2,this.rpRightUp2)

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,18 @@
using UnityEngine;
using UnityEditor;
using Spine;
using Spine.Unity;
public class TestSpine :MonoBehaviour
{
public SkeletonGraphic graph;
public void Start()
{
var t= graph.SkeletonData.animations;
foreach (var item in t)
{
Debug.LogError(item.name);
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1cc606ea9b3302946957befbaf264c87
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5,5 +5,5 @@ TimeManager:
m_ObjectHideFlags: 0
Fixed Timestep: 0.0333333
Maximum Allowed Timestep: 0.33333334
m_TimeScale: 1
m_TimeScale: 1.1
Maximum Particle Timestep: 0.03333333