Merge branch 'onepiece_demo' into onepiece_demo_dev

onepiece_demo_arena
wangzhenxing 2024-01-03 15:25:04 +08:00
commit 3c611d3914
45 changed files with 393 additions and 100 deletions

View File

@ -29,7 +29,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
time: 0.041666668
value: {x: 0.8, y: 0.8, z: 1.3}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -38,7 +38,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.36666667
time: 0.125
value: {x: 0.8, y: 0.8, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -47,7 +47,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: {x: 0.8, y: 0.8, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -73,7 +73,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 1
inSlope: 0
outSlope: 0
@ -101,7 +101,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 1
inSlope: 0
outSlope: 0
@ -129,7 +129,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 1
inSlope: 0
outSlope: 0
@ -157,7 +157,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
time: 0.041666668
value: 1
inSlope: 0
outSlope: 0
@ -166,7 +166,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
time: 0.125
value: 1
inSlope: 0
outSlope: 0
@ -175,7 +175,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 0
inSlope: 0
outSlope: 0
@ -203,7 +203,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 0
inSlope: 0
outSlope: 0
@ -231,7 +231,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
time: 0.125
value: 0
inSlope: 0
outSlope: 0
@ -240,8 +240,17 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
value: 0
time: 0.20833333
value: 100
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.41666666
value: 97.23032
inSlope: 0
outSlope: 0
tangentMode: 136
@ -256,7 +265,7 @@ AnimationClip:
classID: 224
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_SampleRate: 24
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
@ -277,6 +286,13 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 538195251
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 2526845255
@ -305,20 +321,13 @@ AnimationClip:
typeID: 224
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 538195251
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.45
m_StopTime: 0.7083333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -347,7 +356,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
time: 0.041666668
value: 0.8
inSlope: 0
outSlope: 0
@ -356,7 +365,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
time: 0.125
value: 0.8
inSlope: 0
outSlope: 0
@ -365,7 +374,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 0.8
inSlope: 0
outSlope: 0
@ -393,7 +402,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
time: 0.041666668
value: 0.8
inSlope: 0
outSlope: 0
@ -402,7 +411,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
time: 0.125
value: 0.8
inSlope: 0
outSlope: 0
@ -411,7 +420,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 0.8
inSlope: 0
outSlope: 0
@ -439,7 +448,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
time: 0.041666668
value: 1.3
inSlope: 0
outSlope: 0
@ -448,7 +457,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
time: 0.125
value: 1
inSlope: 0
outSlope: 0
@ -457,7 +466,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 1
inSlope: 0
outSlope: 0
@ -485,7 +494,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 1
inSlope: 0
outSlope: 0
@ -513,7 +522,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 1
inSlope: 0
outSlope: 0
@ -541,7 +550,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 1
inSlope: 0
outSlope: 0
@ -569,7 +578,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
time: 0.041666668
value: 1
inSlope: 0
outSlope: 0
@ -578,7 +587,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
time: 0.125
value: 1
inSlope: 0
outSlope: 0
@ -587,7 +596,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 0
inSlope: 0
outSlope: 0
@ -615,7 +624,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
time: 0.7083333
value: 0
inSlope: 0
outSlope: 0
@ -643,7 +652,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
time: 0.125
value: 0
inSlope: 0
outSlope: 0
@ -652,8 +661,17 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
value: 0
time: 0.20833333
value: 100
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.41666666
value: 97.23032
inSlope: 0
outSlope: 0
tangentMode: 136

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 153 KiB

After

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 7ca9518214996174ea9bfeaf0202e45e
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: -1
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: de1da0b42866d9841a5b833a9ca5a6e1
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 133 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 307e6964e94609e43a199f98a4bc6465
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: -1
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 9db9235d60a631248ba771572d16197c
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 KiB

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 126 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 99 KiB

View File

@ -10784,7 +10784,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 133.5, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1240811747
@ -11030,7 +11030,7 @@ RectTransform:
- {fileID: 3144727546776224643}
- {fileID: 366932771}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -11109,7 +11109,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 293.5, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1596169479
@ -41233,7 +41233,7 @@ RectTransform:
- {fileID: 8345673557554861438}
- {fileID: 105956228246463033}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -48415,7 +48415,7 @@ RectTransform:
m_Children:
- {fileID: 559709572625077821}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -59385,7 +59385,7 @@ RectTransform:
- {fileID: 6774715561352953680}
- {fileID: 6133679773110985404}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -59542,7 +59542,7 @@ RectTransform:
- {fileID: 6523326471660810093}
- {fileID: 3376645615951407419}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -76395,7 +76395,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4113268208886061241
RectTransform:
m_ObjectHideFlags: 0
@ -76410,11 +76410,11 @@ RectTransform:
- {fileID: 2184745892301017378}
- {fileID: 5788920436162322516}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 4
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -131, y: -277}
m_AnchoredPosition: {x: -540, y: -1605}
m_SizeDelta: {x: 256.32996, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4113268208886061247
@ -76432,7 +76432,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4113268208886061240}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -96682,7 +96682,7 @@ RectTransform:
- {fileID: 5073206815621103962}
- {fileID: 942618210107869783}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -122741,7 +122741,7 @@ RectTransform:
- {fileID: 7964108409033408373}
- {fileID: 8006389423642367895}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -128213,7 +128213,7 @@ RectTransform:
- {fileID: 2797450724780035430}
- {fileID: 8065192691382102447}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -139135,7 +139135,7 @@ RectTransform:
- {fileID: 8885551416139425081}
- {fileID: 2790268029142068141}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -139577,7 +139577,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 355, y: 0}
m_SizeDelta: {x: 0, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7203306409298755909
@ -146564,7 +146564,6 @@ RectTransform:
- {fileID: 4755555835564946913}
- {fileID: 6498494602927743175}
- {fileID: 3814890933284291651}
- {fileID: 4113268208886061241}
- {fileID: 5871758389554791585}
- {fileID: 3952385394978222417}
- {fileID: 545186920270452855}
@ -146574,6 +146573,7 @@ RectTransform:
- {fileID: 1388929535}
- {fileID: 7718967529276036518}
- {fileID: 7556113482846472712}
- {fileID: 4113268208886061241}
- {fileID: 4670671735622619351}
- {fileID: 5912275222556601812}
- {fileID: 7203306410379096177}
@ -148168,12 +148168,6 @@ PrefabInstance:
propertyPath: m_RaycastTarget
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8631558124670306719, guid: 53b44f029897fbe44b680b2fd498f643,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: dd2be1d0bbe6af7478c74cf08a0eeb20,
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 53b44f029897fbe44b680b2fd498f643, type: 3}
--- !u!224 &7759392491232237277 stripped

View File

@ -455,7 +455,7 @@ end
function this.SwitchTimeScale()
local _scale = math.floor(BattleManager.GetTimeScale())
--如果之前是三倍速,强制转成二倍速
if _scale==2 then
if _scale==3 then
BattleManager.SetTimeScale(BATTLE_TIME_SCALE_TWO)
_scale=3
end

View File

@ -783,7 +783,7 @@ end
function EnemyView:OnRealDead()
self.effect_rage:SetActive(false)
self.effect_dead:SetActive(true)
self.effect_dead:SetActive(false)
self.RoleLiveGO:SetActive(true)
local order = BattleLogic.CurOrder
BattleManager.PauseBattle()

View File

@ -293,7 +293,7 @@ end
-- end)
-- end
function FloatNode:ArtFloating(type, color, value,role,tarGetPos)
local trole= role and role or nil
local trole= role and role or {}
local ttarGetPos=tarGetPos and tarGetPos or self.GameObject.transform.position
local go = BattleManager.LoadAsset(floatingEffect)
go.transform:SetParent(self.RootPanel.transform)
@ -306,7 +306,7 @@ function FloatNode:ArtFloating(type, color, value,role,tarGetPos)
local index=0
if #trole== 0 then
if #trole== 0 then
trole[#trole+1]=go
index=#trole
else
@ -366,7 +366,7 @@ function FloatNode:ArtFloating(type, color, value,role,tarGetPos)
anim:GetComponent("Canvas").sortingOrder = BattleManager.GetBattleSorting() + 100
anim:GetComponent("Animator"):Play(ArtFloatingAnim[type])
BattleManager.AddDelayRecycleRes(floatingEffect, go, 3,function ()
BattleManager.AddDelayRecycleRes(floatingEffect, go, 1,function ()
if trole then
for key, value in pairs(trole) do
if value == go then

View File

@ -683,20 +683,126 @@ local DotTypeTip = {
[3] = Language[10244],
}
--
-- function PlayerView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill,isImmune)
-- if isImmune and isImmune==true then
-- return
-- end
-- if skill then
-- -- 技能配置
-- local combatId = BattleManager.GetCombatIdBySkin(skill.id, atkRole.roleData.skinId)
-- local combat = BattleManager.GetSkillCombat(combatId)
-- --
-- local delay = combat.DamageDelay or 0
-- local continue = skill.continueTime or 0
-- --local count = skill.attackCount or 1
-- local count = type(combat.SkillNumbetTime[1][1]) == "userdata" and 1 or #combat.SkillNumbetTime
-- local space = continue / count
-- local d = math.floor(dmg / count)
-- -- 如果平均伤害小于0 则
-- if d == 0 then
-- d = dmg
-- count = 1
-- end
-- if BattleManager.IsBattleTestPanel() then
-- LogYellow(string.format("目标阵营:%s, 位置:%s, 总伤害:%s, 伤害段数:%s每段伤害%s", self.camp, self.role.position, dmg, count, d))
-- end
-- -- 伤害文字延时,有些受击特效不是立刻播放文字
-- -- 伤害文字
-- -- if count ~= 1 and skill.SkillNumbetTime==nil and skill.SkillNumbetTime~=0 then
-- if count ~=1 then
-- if combat.SkillNumbetTime and combat.SkillNumbetTime[1] and (type(combat.SkillNumbetTime[1][1]) ~= "userdata" and combat.SkillNumbetTime[1][1]~=0) then
-- for i = 1, #combat.SkillNumbetTime do
-- self:DelayFunc(combat.SkillNumbetTime[i][2]/1000, function()
-- local fd = dmg - d *(count - 1)
-- self:OnceDamaged(atkRole, fd, bCrit, finalDmg, damageType, dotType, skill)
-- -- 被伤害卡牌表现
-- self:DOHitEffect(continue)
-- self:DOHitMoveMent(continue,combat)
-- end)
-- end
-- end
-- -- 多段伤害
-- -- 后续伤害延迟打出
-- -- self:LoopFunc(space, count - 1, function()
-- -- self:OnceDamaged(atkRole, d, bCrit, finalDmg, damageType, dotType, skill)
-- -- end)
-- -- -- 立刻打出第一次伤害
-- -- local fd = dmg - d *(count - 1)
-- -- self:OnceDamaged(atkRole, fd, bCrit, finalDmg, damageType, dotType, skill)
-- -- -- 被伤害卡牌表现
-- -- self:DOHitEffect(continue)
-- else
-- self:DelayFunc(delay/1000, function()
-- self:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
-- -- 被伤害卡牌表现
-- self:DOHitEffect()
-- self:DOHitMoveMent(nil,combat)
-- end)
-- end
-- -- 播放特效
-- self.SkillCaster:CheckSkillHitEffect("hit", combat, skill)
-- else
-- if BattleManager.IsBattleTestPanel() then
-- LogYellow(string.format("目标阵营:%s, 位置:%s, 总伤害:%s", self.camp, self.role.position, dmg))
-- end
-- -- 伤害文字
-- self:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
-- -- 被伤害卡牌表现
-- self:DOHitEffect()
-- end
-- end
-- --
-- function PlayerView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
-- --王振兴注释,为了解决英雄死亡多段伤害显示不完整 2020/8/17
-- --if self.isDead then return end
-- if dotType then
-- if dotType == DotType.Poison then
-- self.Floater:ArtFloating(ArtFloatingType.PoisonDamage, ArtFloatingColor.Poison, dmg,TextFloatingColor.DarkGreen,self.role)
-- elseif dotType == DotType.Burn then
-- self.Floater:ArtFloating(ArtFloatingType.FireDamage, ArtFloatingColor.Fire, dmg,self.role)
-- elseif dotType == DotType.Blooding then
-- self.Floater:ArtFloating(ArtFloatingType.BleedDamage, ArtFloatingColor.Fire, dmg,self.role)
-- else
-- self.Floater:TextBuffFloating(2, DotTypeTip[dotType]..dmg)
-- end
-- else
-- if bCrit then -- 暴击红色并显示暴击
-- self.Floater:ArtFloating(ArtFloatingType.CritDamage, ArtFloatingColor.Red, dmg,self.role)
-- else
-- if atkRole.isTeam then -- 异妖紫色
-- self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.Purple, dmg,self.role)
-- else
-- if skill and skill.type == BattleSkillType.Special then -- 技能黄色
-- self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.Yellow, dmg,self.role)
-- else -- 普攻白色
-- self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.White, dmg,self.role)
-- end
-- end
-- end
-- end
-- -- 播放受击动画
-- self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "hit", false)
-- end
function PlayerView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill,isImmune)
if isImmune and isImmune==true then
return
return
end
local t={}
local pos=self.GameObject.transform.position
if skill then
-- 技能配置
local combatId = BattleManager.GetCombatIdBySkin(skill.id, atkRole.roleData.skinId)
local combat = BattleManager.GetSkillCombat(combatId)
--
--
local delay = combat.DamageDelay or 0
local continue = skill.continueTime or 0
--local count = skill.attackCount or 1
local continue = skill.continueTime or 0
local count = type(combat.SkillNumbetTime[1][1]) == "userdata" and 1 or #combat.SkillNumbetTime
local space = continue / count
local d = math.floor(dmg / count)
-- 如果平均伤害小于0 则
@ -708,15 +814,15 @@ function PlayerView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType
LogYellow(string.format("目标阵营:%s, 位置:%s, 总伤害:%s, 伤害段数:%s每段伤害%s", self.camp, self.role.position, dmg, count, d))
end
-- 伤害文字延时,有些受击特效不是立刻播放文字
-- 伤害文字
-- if count ~= 1 and skill.SkillNumbetTime==nil and skill.SkillNumbetTime~=0 then
-- if count ~= 1 and skill.SkillNumbetTime==nil and skill.SkillNumbetTime~=0 then
if count ~=1 then
if combat.SkillNumbetTime and combat.SkillNumbetTime[1] and (type(combat.SkillNumbetTime[1][1]) ~= "userdata" and combat.SkillNumbetTime[1][1]~=0) then
for i = 1, #combat.SkillNumbetTime do
self:DelayFunc(combat.SkillNumbetTime[i][2]/1000, function()
local fd = dmg - d *(count - 1)
self:OnceDamaged(atkRole, fd, bCrit, finalDmg, damageType, dotType, skill)
self:OnceDamaged(atkRole, fd, bCrit, finalDmg, damageType, dotType, skill,t,pos)
-- 被伤害卡牌表现
self:DOHitEffect(continue)
self:DOHitMoveMent(continue,combat)
@ -736,7 +842,7 @@ function PlayerView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType
else
self:DelayFunc(delay/1000, function()
self:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
self:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill,t,pos)
-- 被伤害卡牌表现
self:DOHitEffect()
self:DOHitMoveMent(nil,combat)
@ -750,37 +856,37 @@ function PlayerView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType
LogYellow(string.format("目标阵营:%s, 位置:%s, 总伤害:%s", self.camp, self.role.position, dmg))
end
-- 伤害文字
self:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
self:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill,t,pos)
-- 被伤害卡牌表现
self:DOHitEffect()
-- self:DOHitMoveMent(nil,combat)
end
end
--
function PlayerView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
function PlayerView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill,t,pos)
--王振兴注释,为了解决英雄死亡多段伤害显示不完整 2020/8/17
--if self.isDead then return end
if dotType then
if dotType == DotType.Poison then
self.Floater:ArtFloating(ArtFloatingType.PoisonDamage, ArtFloatingColor.Poison, dmg,TextFloatingColor.DarkGreen,self.role)
self.Floater:ArtFloating(ArtFloatingType.PoisonDamage, ArtFloatingColor.Poison, dmg,t,pos)
elseif dotType == DotType.Burn then
self.Floater:ArtFloating(ArtFloatingType.FireDamage, ArtFloatingColor.Fire, dmg,self.role)
self.Floater:ArtFloating(ArtFloatingType.FireDamage, ArtFloatingColor.Fire, dmg,t,pos)
elseif dotType == DotType.Blooding then
self.Floater:ArtFloating(ArtFloatingType.BleedDamage, ArtFloatingColor.Fire, dmg,self.role)
self.Floater:ArtFloating(ArtFloatingType.BleedDamage, ArtFloatingColor.Fire, dmg,t,pos)
else
self.Floater:TextBuffFloating(2, DotTypeTip[dotType]..dmg)
end
else
if bCrit then -- 暴击红色并显示暴击
self.Floater:ArtFloating(ArtFloatingType.CritDamage, ArtFloatingColor.Red, dmg,self.role)
self.Floater:ArtFloating(ArtFloatingType.CritDamage, ArtFloatingColor.Red, dmg,t,pos)
else
if atkRole.isTeam then -- 异妖紫色
self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.Purple, dmg,self.role)
self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.Purple, dmg,t,pos)
else
if skill and skill.type == BattleSkillType.Special then -- 技能黄色
self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.Yellow, dmg,self.role)
self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.Yellow, dmg,t,pos)
else -- 普攻白色
self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.White, dmg,self.role)
self.Floater:ArtFloating(ArtFloatingType.Damage, ArtFloatingColor.White, dmg,t,pos)
end
end
end
@ -789,7 +895,6 @@ function PlayerView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotTy
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "hit", false)
end
-- 播放卡牌受击效果
function PlayerView:DOHitEffect(time, func)
-- 时间修正
@ -901,7 +1006,7 @@ end
function PlayerView:OnRealDead()
Util.SetGray(self.RoleIconGO, true)
self.effect_dead:SetActive(true)
self.effect_dead:SetActive(false)
self.effect_rage:SetActive(false)
local order = BattleLogic.CurOrder
BattleManager.PauseBattle()

View File

@ -21,24 +21,24 @@ local mapIdList = {
-- 临时可生成怪的区域
local monsterArea = {
[5005] = {
x_pos = {min = 2, max =6},
y_pos = {min = 2, max = 6},
x_pos = {min = 2, max =7},
y_pos = {min = 2, max = 7},
},
[4002] = {
x_pos = {min = 2, max =6},
y_pos = {min = 2, max = 6},
x_pos = {min = 2, max =7},
y_pos = {min = 2, max =7},
},
[5002] = {
x_pos = {min = 2, max =7},
y_pos = {min = 2, max = 7},
},
[5003] = {
x_pos = {min = 2, max =6},
y_pos = {min = 2, max = 6},
x_pos = {min = 2, max =7},
y_pos = {min = 2, max = 7},
},
[5004] = {
x_pos = {min = 2, max =6},
y_pos = {min = 2, max = 6},
x_pos = {min = 2, max =7},
y_pos = {min = 2, max = 7},
},
}
@ -110,7 +110,7 @@ function this:Init()
if not this.playerViews[0] then
--Log(m_curMapId)
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.guajigongneng) then
iconNum = 5
iconNum = 3
local randomNum = 0--math.random(2,3)
PlayerManager.GetFightMapPlayerNPCData(randomNum,function(NPCList)
if this.isClose then
@ -131,7 +131,7 @@ function this:Init()
end
end)
else
iconNum = 4
iconNum =3
end
this.playerViews[0] = SubUIManager.Open(SubUIConfig.SingleFightPlayerView,this.mapRoot.transform,this)
this.playerViews[0]:SetData(startUV[m_curMapId].u,startUV[m_curMapId].v,true)