Merge branch 'china/dev' into 0功能/灵脉秘境
|
After Width: | Height: | Size: 30 KiB |
|
|
@ -0,0 +1,131 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 012d9cd8169720e43a996d0dec97f5e2
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: r_zjm_shenhun
|
||||
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: 2
|
||||
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
|
||||
- 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: 33
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: r_zjm_shenhun
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 148
|
||||
height: 126
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 5f1cd8129411e9344866c6bf1c99c1f5
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: bca2e88436fc8fc4da1ff8e0e40ee262
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 34 KiB |
|
|
@ -19,27 +19,18 @@ AnimationClip:
|
|||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: {x: 0, y: 180, z: 21.445002}
|
||||
value: {x: 0, y: 180, z: 9.373}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.6666667
|
||||
value: {x: 0, y: 180.00002, z: 21.445002}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: -25.464457}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.9734258}
|
||||
- serializedVersion: 3
|
||||
time: 1.0833334
|
||||
value: {x: 0, y: 179.99998, z: 12.964346}
|
||||
inSlope: {x: 0, y: 0, z: -14.844557}
|
||||
outSlope: {x: 0, y: 0, z: -14.844557}
|
||||
value: {x: 0, y: 179.99998, z: 9.373}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
|
|
@ -47,7 +38,7 @@ AnimationClip:
|
|||
- serializedVersion: 3
|
||||
time: 1.5833334
|
||||
value: {x: 0, y: 180.00002, z: 9.373}
|
||||
inSlope: {x: 0, y: 0, z: 1.05247}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 1.05247}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
|
|
@ -81,16 +72,7 @@ AnimationClip:
|
|||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: {x: -6.46, y: 4.22, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.6666667
|
||||
value: {x: -6.82, y: 4.22, z: 0}
|
||||
value: {x: -6, y: 4.22, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
|
|
@ -99,34 +81,34 @@ AnimationClip:
|
|||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 1.0833334
|
||||
value: {x: -2.35, y: 2.83, z: 0}
|
||||
inSlope: {x: 7.3418183, y: -0.61090857, z: 0}
|
||||
outSlope: {x: 7.3418183, y: -0.61090857, z: 0}
|
||||
value: {x: 200, y: 2.83, z: 0}
|
||||
inSlope: {x: 193.26315, y: -0.3536839, z: 0}
|
||||
outSlope: {x: 193.26315, y: -0.3536839, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 1.5833334
|
||||
value: {x: -0.09, y: 2.69, z: 0}
|
||||
inSlope: {x: 5.5820227, y: 0, z: 0}
|
||||
outSlope: {x: 5.5820227, y: 0, z: 0}
|
||||
value: {x: 300, y: 2.69, z: 0}
|
||||
inSlope: {x: 269.66293, y: 0, z: 0}
|
||||
outSlope: {x: 269.66293, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 2.5666666
|
||||
value: {x: 5.93, y: 3.72, z: 0}
|
||||
inSlope: {x: 10.41628, y: 1.6883723, z: 0}
|
||||
outSlope: {x: 10.41628, y: 1.6883723, z: 0}
|
||||
value: {x: 600, y: 3.72, z: 0}
|
||||
inSlope: {x: 348.83722, y: 1.0674417, z: 0}
|
||||
outSlope: {x: 348.83722, y: 1.0674417, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 3.0166667
|
||||
value: {x: 14.84, y: 5.11, z: 0}
|
||||
value: {x: 800, y: 4.22, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
|
|
@ -188,16 +170,7 @@ AnimationClip:
|
|||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -6.46
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.6666667
|
||||
value: -6.82
|
||||
value: -6
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
|
|
@ -206,37 +179,37 @@ AnimationClip:
|
|||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.0833334
|
||||
value: -2.35
|
||||
inSlope: 7.3418183
|
||||
outSlope: 7.3418183
|
||||
value: 200
|
||||
inSlope: 193.26315
|
||||
outSlope: 193.26315
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.5833334
|
||||
value: -0.09
|
||||
inSlope: 5.5820227
|
||||
outSlope: 5.5820227
|
||||
value: 300
|
||||
inSlope: 269.66293
|
||||
outSlope: 269.66293
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.5666666
|
||||
value: 5.93
|
||||
inSlope: 10.41628
|
||||
outSlope: 10.41628
|
||||
value: 600
|
||||
inSlope: 348.83722
|
||||
outSlope: 348.83722
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 3.0166667
|
||||
value: 14.84
|
||||
value: 800
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
|
|
@ -259,20 +232,11 @@ AnimationClip:
|
|||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.6666667
|
||||
value: 4.22
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.0833334
|
||||
value: 2.83
|
||||
inSlope: -0.61090857
|
||||
outSlope: -0.61090857
|
||||
inSlope: -0.3536839
|
||||
outSlope: -0.3536839
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
|
|
@ -289,18 +253,18 @@ AnimationClip:
|
|||
- serializedVersion: 3
|
||||
time: 2.5666666
|
||||
value: 3.72
|
||||
inSlope: 1.6883723
|
||||
outSlope: 1.6883723
|
||||
inSlope: 1.0674417
|
||||
outSlope: 1.0674417
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 3.0166667
|
||||
value: 5.11
|
||||
value: 4.22
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
|
|
@ -323,15 +287,6 @@ AnimationClip:
|
|||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.6666667
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.0833334
|
||||
value: 0
|
||||
|
|
@ -364,7 +319,7 @@ AnimationClip:
|
|||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
|
|
@ -378,15 +333,6 @@ AnimationClip:
|
|||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0.6666667
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.5833334
|
||||
value: 0
|
||||
|
|
@ -433,15 +379,6 @@ AnimationClip:
|
|||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.6666667
|
||||
value: 180.00002
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.0833334
|
||||
value: 179.99998
|
||||
|
|
@ -488,15 +425,6 @@ AnimationClip:
|
|||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0.6666667
|
||||
value: 21.445002
|
||||
inSlope: -25.464457
|
||||
outSlope: -25.464457
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.9734258
|
||||
- serializedVersion: 3
|
||||
time: 1.5833334
|
||||
value: 9.373
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 29 KiB |
|
|
@ -0,0 +1,85 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &3115015986594381284
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4817073268374044270}
|
||||
- component: {fileID: 7468455974790359534}
|
||||
- component: {fileID: 4154312226256128033}
|
||||
m_Layer: 0
|
||||
m_Name: live2d_c_0023_02
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4817073268374044270
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3115015986594381284}
|
||||
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: 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!222 &7468455974790359534
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3115015986594381284}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4154312226256128033
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3115015986594381284}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
|
||||
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
|
||||
skeletonDataAsset: {fileID: 11400000, guid: 4dacdb4550e515b45b7133b25ee2523d, type: 2}
|
||||
initialSkinName: default
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
startingAnimation: idle
|
||||
startingLoop: 1
|
||||
timeScale: 1
|
||||
freeze: 0
|
||||
unscaledTime: 0
|
||||
meshGenerator:
|
||||
settings:
|
||||
useClipping: 1
|
||||
zSpacing: 0
|
||||
pmaVertexColors: 1
|
||||
tintBlack: 0
|
||||
calculateTangents: 0
|
||||
addNormals: 0
|
||||
immutableTriangles: 0
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d6dc79ab0a8cff44b889d631e753d5d8
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/prefabs/live2d/live2d_c_0023
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -69,7 +69,7 @@ MonoBehaviour:
|
|||
initialSkinName: default
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
startingAnimation:
|
||||
startingAnimation: idle
|
||||
startingLoop: 1
|
||||
timeScale: 1
|
||||
freeze: 0
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ MonoBehaviour:
|
|||
initialSkinName: default
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
startingAnimation:
|
||||
startingAnimation: idle
|
||||
startingLoop: 1
|
||||
timeScale: 1
|
||||
freeze: 0
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ MonoBehaviour:
|
|||
initialSkinName: default
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
startingAnimation:
|
||||
startingAnimation: idle
|
||||
startingLoop: 1
|
||||
timeScale: 1
|
||||
freeze: 0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d86667c66179f8749a2fa1d8befaa402
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,153 @@
|
|||
|
||||
c_0023_02.png
|
||||
size: 795,793
|
||||
format: RGBA8888
|
||||
filter: Linear,Linear
|
||||
repeat: none
|
||||
sx_aaa
|
||||
rotate: false
|
||||
xy: 635, 65
|
||||
size: 54, 68
|
||||
orig: 54, 68
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_biyan
|
||||
rotate: false
|
||||
xy: 365, 278
|
||||
size: 100, 82
|
||||
orig: 100, 82
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_mao001
|
||||
rotate: false
|
||||
xy: 220, 362
|
||||
size: 251, 429
|
||||
orig: 251, 429
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_mao003
|
||||
rotate: false
|
||||
xy: 473, 432
|
||||
size: 190, 359
|
||||
orig: 190, 359
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_shrnti
|
||||
rotate: false
|
||||
xy: 2, 316
|
||||
size: 216, 475
|
||||
orig: 216, 475
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_toubu
|
||||
rotate: false
|
||||
xy: 666, 155
|
||||
size: 100, 113
|
||||
orig: 100, 113
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_xiabai001
|
||||
rotate: false
|
||||
xy: 526, 30
|
||||
size: 107, 103
|
||||
orig: 107, 103
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_xiabai005
|
||||
rotate: false
|
||||
xy: 365, 109
|
||||
size: 159, 155
|
||||
orig: 159, 155
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_xiabai006
|
||||
rotate: false
|
||||
xy: 473, 266
|
||||
size: 168, 164
|
||||
orig: 168, 164
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_xiabai007
|
||||
rotate: false
|
||||
xy: 526, 135
|
||||
size: 138, 129
|
||||
orig: 138, 129
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_xiabai008
|
||||
rotate: false
|
||||
xy: 365, 9
|
||||
size: 139, 98
|
||||
orig: 139, 98
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_xiongbu
|
||||
rotate: false
|
||||
xy: 665, 356
|
||||
size: 92, 128
|
||||
orig: 92, 128
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_xiongbu-01
|
||||
rotate: false
|
||||
xy: 665, 486
|
||||
size: 92, 128
|
||||
orig: 92, 128
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_yiling
|
||||
rotate: false
|
||||
xy: 665, 616
|
||||
size: 103, 175
|
||||
orig: 103, 175
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_youjiao
|
||||
rotate: false
|
||||
xy: 759, 464
|
||||
size: 34, 150
|
||||
orig: 34, 150
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_youshangbi
|
||||
rotate: false
|
||||
xy: 643, 270
|
||||
size: 123, 84
|
||||
orig: 123, 84
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_youshou
|
||||
rotate: false
|
||||
xy: 179, 14
|
||||
size: 49, 49
|
||||
orig: 49, 49
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_youxiaobi
|
||||
rotate: false
|
||||
xy: 2, 2
|
||||
size: 175, 312
|
||||
orig: 175, 312
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_zuojiao
|
||||
rotate: false
|
||||
xy: 759, 383
|
||||
size: 33, 79
|
||||
orig: 33, 79
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_zuoshou
|
||||
rotate: false
|
||||
xy: 230, 17
|
||||
size: 42, 46
|
||||
orig: 42, 46
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sx_zuoxiaobi
|
||||
rotate: false
|
||||
xy: 179, 65
|
||||
size: 184, 249
|
||||
orig: 184, 249
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cc5aea7ce36344d4481ffa34f9238b9a
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 528 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d9ba6b47fdce6c34aa3ef87fec616911
|
||||
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: 0
|
||||
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: 0
|
||||
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: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 55
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 55
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 7c0711b2db0575346831eaa7ce634d9f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c72d6b346eccd0f49a709c0b524c8d05
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
|
||||
m_Name: c_0023_02_Atlas
|
||||
m_EditorClassIdentifier:
|
||||
atlasFile: {fileID: 4900000, guid: cc5aea7ce36344d4481ffa34f9238b9a, type: 3}
|
||||
materials:
|
||||
- {fileID: 2100000, guid: ad3b54ae3aedc8542ab9af294732f2b1, type: 2}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 61250dacf2e23644a8a9d13e788b0bd2
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
%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: c_0023_02_Material
|
||||
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: d9ba6b47fdce6c34aa3ef87fec616911, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _Cutoff: 0.1
|
||||
m_Colors: []
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ad3b54ae3aedc8542ab9af294732f2b1
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
|
||||
m_Name: c_0023_02_SkeletonData
|
||||
m_EditorClassIdentifier:
|
||||
atlasAssets:
|
||||
- {fileID: 11400000, guid: 61250dacf2e23644a8a9d13e788b0bd2, type: 2}
|
||||
scale: 0.01
|
||||
skeletonJSON: {fileID: 4900000, guid: c72d6b346eccd0f49a709c0b524c8d05, type: 3}
|
||||
fromAnimation: []
|
||||
toAnimation: []
|
||||
duration: []
|
||||
defaultMix: 0.2
|
||||
controller: {fileID: 0}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4dacdb4550e515b45b7133b25ee2523d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -11,6 +11,7 @@ local ManagerNames = {
|
|||
"Setting/SettingManager",
|
||||
--通信管理,所有的通信接口
|
||||
"Net/NetManager",
|
||||
"Net/HttpManager",
|
||||
--推送管理,所有的推送接口
|
||||
"Net/IndicationManager",
|
||||
--登录数据管理
|
||||
|
|
|
|||
|
|
@ -121,9 +121,10 @@ GameDataBase.SheetLineBase.__index = function(t,k)
|
|||
local val = t.val[index]
|
||||
-- *************************
|
||||
-- 提审服部分资源替换,特殊处理
|
||||
if SERVER_VERSION == 1 then
|
||||
if LoginManager and LoginManager.IsShield then
|
||||
if (val == "live2d_c_0038" and t.val[1] == 2004)
|
||||
or (val == "live2d_c_0043" and t.val[1] == 2008)
|
||||
or (val == "live2d_c_0023" and t.val[1] == 2066)
|
||||
or (val == "live2d_c_sjnn_00012" and t.val[1] == 2028)
|
||||
then
|
||||
return val.."_02"
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ GameEvent = {
|
|||
GuidePanelScrollViewPos = "Guide.GuidePanelScrollViewPos",
|
||||
|
||||
BattleGuideDone = "Guide.BattleGuideDone",
|
||||
FuncGuideDone = "Guide.FuncGuideDone",
|
||||
},
|
||||
Player = {
|
||||
--金币数量改变
|
||||
|
|
|
|||
|
|
@ -815,6 +815,7 @@ function this.GetSkillCombat(id)
|
|||
BeforeBullet = combat.BeforeBullet,
|
||||
SkillNumber = combat.SkillNumber,
|
||||
SkillDuration = combat.SkillDuration,
|
||||
DamageDelay = combat.DamageDelay,
|
||||
BeforeOrientation = combat.BeforeOrientation,
|
||||
Orientation = combat.Orientation,
|
||||
HitOrientation = combat.HitOrientation,
|
||||
|
|
@ -1078,7 +1079,7 @@ function this.RequestBattleDataByFightId(serverUrl, fightId, func)
|
|||
local uid = string.split(fightId, "_")[1]
|
||||
local requestUrl = string.format("http://%s/req/getFightRecord?uid=%s&fightid=%s", serverUrl, uid, fightId)
|
||||
LogGreen(requestUrl)
|
||||
LoginManager:SendGetHttp(requestUrl, function(str)
|
||||
HttpManager:SendGetHttp(requestUrl, function(str)
|
||||
--LogGreen(str)
|
||||
local json = require 'cjson'
|
||||
local data = json.decode(str)
|
||||
|
|
|
|||
|
|
@ -9202,7 +9202,7 @@ local passivityList = {
|
|||
end
|
||||
local arr = BattleUtil.ChooseTarget(role,targets)
|
||||
for i=1, #arr do
|
||||
arr[i]:AddBuff(Buff.Create(arr[i], BuffName.PropertyChange, round, BattlePropList[p1],v1, ct))
|
||||
arr[i]:AddBuff(Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[p1],v1, ct))
|
||||
end
|
||||
triggerTime=triggerTime+1
|
||||
end
|
||||
|
|
@ -9229,6 +9229,10 @@ local passivityList = {
|
|||
if arr[1].position<=3 then
|
||||
return
|
||||
end
|
||||
local front=RoleManager.Query(function(v) return role.camp == v.camp and v.position<=3 end)
|
||||
if not front or #front==0 then
|
||||
return
|
||||
end
|
||||
local function _CallBack(v, ct)
|
||||
if v then
|
||||
table.insert(cl, {v, ct})
|
||||
|
|
|
|||
|
|
@ -651,10 +651,15 @@ function BattleUtil.ApplyDamageNoPassive(skill, atkRole, defRole, damage, bCrit,
|
|||
-- 计算护盾减伤
|
||||
damage = BattleUtil.CalShield(atkRole, defRole, damage,skill)
|
||||
-- 造成的最终伤害
|
||||
local damagingFunc = function(dmgDeduction)
|
||||
local damagingFunc = function(dmgDeduction)
|
||||
--不计算增伤只计算减伤
|
||||
if dmgDeduction<0 then
|
||||
return
|
||||
end
|
||||
damage = damage - dmgDeduction
|
||||
end
|
||||
|
||||
atkRole.Event:DispatchEvent(BattleEventName.PassiveDamaging, damagingFunc, defRole, damage, skill, dotType, bCrit,damageType, dotType,isDirect)
|
||||
defRole.Event:DispatchEvent(BattleEventName.FinalBeDamageEnd, damagingFunc, atkRole, damage, skill, dotType, bCrit, damageType,isDirect)
|
||||
BattleLogic.Event:DispatchEvent(BattleEventName.FinalDamage, damagingFunc, atkRole, defRole, damage, skill, dotType, bCrit, damageType)
|
||||
|
||||
|
|
@ -814,8 +819,8 @@ function BattleUtil.FinalDamageCountShield(skill, atkRole, defRole, damage, bCri
|
|||
if defRole.type == BattleUnitType.Monster or defRole.type == BattleUnitType.Player then
|
||||
return
|
||||
end
|
||||
-- 计算护盾减伤
|
||||
damage = BattleUtil.CalShield(atkRole, defRole, damage,skill)
|
||||
-- 计算无敌盾减伤
|
||||
damage = BattleUtil.CalAllReduceShield(atkRole, defRole, damage,skill)
|
||||
|
||||
if damage < 0 then damage = 0 end
|
||||
if skill and skill.type==BattleSkillType.Special then
|
||||
|
|
|
|||
|
|
@ -125,12 +125,12 @@ function RoleLogic:Init(uid, data, position)
|
|||
local len=floor((#coverArgs-1)/2)
|
||||
for i = 1, len do
|
||||
local id=0
|
||||
if #coverArgs>i+1 then
|
||||
id=coverArgs[i+1]
|
||||
if #coverArgs>i+i then
|
||||
id=coverArgs[i+i]
|
||||
end
|
||||
local value=0
|
||||
if #coverArgs>=i+2 then
|
||||
value=coverArgs[i+2]
|
||||
if #coverArgs>=i+i+1 then
|
||||
value=coverArgs[i+i+1]
|
||||
end
|
||||
if id~=0 and value~=0 and #args>=id and args[id] then
|
||||
args[id]=value
|
||||
|
|
|
|||
|
|
@ -417,10 +417,16 @@ local DotTypeTip = {
|
|||
}
|
||||
--
|
||||
function EnemyView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
|
||||
if skill and skill.continueTime > 0 and skill.attackCount > 1 then
|
||||
local space = skill.continueTime / skill.attackCount
|
||||
local count = skill.attackCount
|
||||
local d = math.floor(dmg/count)
|
||||
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 space = continue / count
|
||||
local d = math.floor(dmg / count)
|
||||
-- 如果平均伤害小于0 则
|
||||
if d == 0 then
|
||||
d = dmg
|
||||
|
|
@ -429,22 +435,36 @@ function EnemyView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType,
|
|||
if BattleManager.IsBattleTestPanel() then
|
||||
LogYellow(string.format("目标阵营:%s, 位置:%s, 总伤害:%s, 伤害段数:%s,每段伤害:%s", self.camp, self.role.position, dmg, count, d))
|
||||
end
|
||||
if count ~= 1 then
|
||||
-- 后续伤害延迟打出
|
||||
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)
|
||||
else
|
||||
self:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
|
||||
end
|
||||
-- 伤害文字延时,有些受击特效不是立刻播放文字
|
||||
self:DelayFunc(delay/1000, function()
|
||||
-- 伤害文字
|
||||
if count ~= 1 then
|
||||
-- 多段伤害
|
||||
-- 后续伤害延迟打出
|
||||
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:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
|
||||
-- 被伤害卡牌表现
|
||||
self:DOHitEffect()
|
||||
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
|
||||
--
|
||||
|
|
@ -476,26 +496,35 @@ function EnemyView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotTyp
|
|||
end
|
||||
end
|
||||
end
|
||||
self.RoleLiveGOTran:DOShakeAnchorPos(0.3, Vector2.New(200, 100), 100, 50, false, true):OnComplete(function ()
|
||||
self.RoleLiveGO.transform.anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2] )
|
||||
end)
|
||||
self.RoleLiveGOGraphic:DOColor(Color.New(1,0,0,1), 0.3):OnComplete(function ()
|
||||
self.RoleLiveGOGraphic:DOColor(Color.New(1,1,1,1), 0.1)
|
||||
end)
|
||||
-- 受击放大1.2倍
|
||||
self:DoScale(1.2, 0.3, function()
|
||||
self:DoScale(1, 0.1)
|
||||
end)
|
||||
-- 播放受击动画
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "hit", false)
|
||||
-- bo
|
||||
if skill then
|
||||
local combatId = BattleManager.GetCombatIdBySkin(skill.id, atkRole.roleData.skinId)
|
||||
local combat = BattleManager.GetSkillCombat(combatId)
|
||||
self.SkillCaster:CheckSkillHitEffect("hit", combat, skill)
|
||||
end
|
||||
end
|
||||
|
||||
-- 播放卡牌受击效果
|
||||
function EnemyView:DOHitEffect(time, func)
|
||||
-- 时间修正
|
||||
if not time or time < 0.3 then
|
||||
time = 0.3
|
||||
end
|
||||
-- 受击放大1.2倍
|
||||
self:DoScale(1.2, 0.1)
|
||||
-- 卡面变红
|
||||
self.RoleLiveGOGraphic:DOColor(Color.New(1,0,0,1), 0.1):OnComplete(function ()
|
||||
self.RoleLiveGOGraphic:DOColor(Color.New(1,1,1,1), 0.1):SetDelay(time)
|
||||
end)
|
||||
-- 震动
|
||||
self.RoleLiveGOTran:DOShakeAnchorPos(time, Vector2.New(200, 100), 100, 50, false, true):OnComplete(function ()
|
||||
self.RoleLiveGO.transform.anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2] )
|
||||
-- 恢复大小
|
||||
self:DoScale(1, 0.1)
|
||||
-- 回调
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
function EnemyView:OnHealed(castRole)
|
||||
local sortingOrder = nil
|
||||
local go = BattleManager.LoadAsset(healEffect, sortingOrder)
|
||||
|
|
|
|||
|
|
@ -456,10 +456,16 @@ local DotTypeTip = {
|
|||
}
|
||||
--
|
||||
function PlayerView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
|
||||
if skill and skill.continueTime > 0 and skill.attackCount > 1 then
|
||||
local space = skill.continueTime / skill.attackCount
|
||||
local count = skill.attackCount
|
||||
local d = math.floor(dmg/count)
|
||||
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 space = continue / count
|
||||
local d = math.floor(dmg / count)
|
||||
-- 如果平均伤害小于0 则
|
||||
if d == 0 then
|
||||
d = dmg
|
||||
|
|
@ -468,22 +474,36 @@ function PlayerView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType
|
|||
if BattleManager.IsBattleTestPanel() then
|
||||
LogYellow(string.format("目标阵营:%s, 位置:%s, 总伤害:%s, 伤害段数:%s,每段伤害:%s", self.camp, self.role.position, dmg, count, d))
|
||||
end
|
||||
if count ~= 1 then
|
||||
-- 后续伤害延迟打出
|
||||
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)
|
||||
else
|
||||
self:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
|
||||
end
|
||||
-- 伤害文字延时,有些受击特效不是立刻播放文字
|
||||
self:DelayFunc(delay/1000, function()
|
||||
-- 伤害文字
|
||||
if count ~= 1 then
|
||||
-- 多段伤害
|
||||
-- 后续伤害延迟打出
|
||||
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:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
|
||||
-- 被伤害卡牌表现
|
||||
self:DOHitEffect()
|
||||
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
|
||||
--
|
||||
|
|
@ -515,43 +535,49 @@ function PlayerView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotTy
|
|||
end
|
||||
end
|
||||
end
|
||||
-- 播放受击动画
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "hit", false)
|
||||
end
|
||||
|
||||
|
||||
-- 播放卡牌受击效果
|
||||
function PlayerView:DOHitEffect(time, func)
|
||||
-- 时间修正
|
||||
if not time or time < 0.3 then
|
||||
time = 0.3
|
||||
end
|
||||
-- 受击放大1.2倍
|
||||
self:DoScale(1.2, 0.1)
|
||||
-- 卡面变红
|
||||
DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 1 end),
|
||||
DG.Tweening.Core.DOSetter_float(function (progress)
|
||||
local color = Color.New(1, progress, progress, 1)
|
||||
Util.SetColor(self.GameObject, color)
|
||||
Util.SetColor(self.RoleLiveGOGraphic, color)
|
||||
end), 0, 0.3):SetEase(Ease.Linear):OnComplete(function()
|
||||
end), 0, 0.1):SetEase(Ease.Linear):OnComplete(function()
|
||||
DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 0 end),
|
||||
DG.Tweening.Core.DOSetter_float(function (progress)
|
||||
local color = Color.New(1, progress, progress, 1)
|
||||
Util.SetColor(self.GameObject, color)
|
||||
Util.SetColor(self.RoleLiveGOGraphic, color)
|
||||
end), 1, 0.1):SetEase(Ease.Linear)
|
||||
end), 1, 0.1):SetEase(Ease.Linear):SetDelay(time)
|
||||
end)
|
||||
|
||||
self.GameObject.transform.parent:DOShakeAnchorPos(0.3, Vector2.New(200, 100), 100, 50, false, true):OnComplete(function ()
|
||||
-- 震动
|
||||
self.GameObject.transform.parent:DOShakeAnchorPos(time, Vector2.New(200, 100), 100, 50, false, true):OnComplete(function ()
|
||||
if self.GameObject then
|
||||
self.GameObject.transform.parent.anchoredPosition = Vector2.New(self.role.position == 1 and -145 or 0, -221)
|
||||
end
|
||||
end)
|
||||
|
||||
-- 受击放大1.2倍
|
||||
self:DoScale(1.2, 0.3, function()
|
||||
-- 恢复大小
|
||||
self:DoScale(1, 0.1)
|
||||
-- 回调
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
end)
|
||||
-- 播放受击动画
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "hit", false)
|
||||
|
||||
-- 播放受击特效
|
||||
if skill then
|
||||
local combatId = BattleManager.GetCombatIdBySkin(skill.id, atkRole.roleData.skinId)
|
||||
local combat = BattleManager.GetSkillCombat(combatId)
|
||||
self.SkillCaster:CheckSkillHitEffect("hit", combat, skill)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
function PlayerView:OnHealed(castRole)
|
||||
local sortingOrder = self.GameObject:GetComponent("Canvas").sortingOrder + 21
|
||||
local go = BattleManager.LoadAsset(healEffect, sortingOrder)
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ function this.DOGetBindPhone(type, phoneNumber, code)
|
|||
local sign = Util.MD5Encrypt(string.format("%s%s%s%s%s%s", pid,
|
||||
gid, type, phoneNumber, time, signKey))
|
||||
local code = code and code or ""
|
||||
LoginManager:SendGetHttp(string.format("%s?pid=%s&gid=%s&token=%s&type=%s&phone=%s&code=%s&time=%s&sign=%s",
|
||||
HttpManager:SendGetHttp(string.format("%s?pid=%s&gid=%s&token=%s&type=%s&phone=%s&code=%s&time=%s&sign=%s",
|
||||
GetBindUrl, pid, gid, token, type, phoneNumber, code, time, sign), this.OnCodeResult, nil, nil, nil)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -694,8 +694,10 @@ function this.ExcuteBattle()
|
|||
PopupTipPanel.ShowTip(tip)
|
||||
return
|
||||
end
|
||||
|
||||
this.SetInitAnim()
|
||||
-- 检测是否有前置引导
|
||||
GuideManager.BeforeFightCheck(curFightId, function()
|
||||
this.SetInitAnim()
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@ function this.RefreshFightId(msg)
|
|||
PlayerPrefs.SetInt(PlayerManager.uid .. OLD_ID, oldFight)
|
||||
-- 最后一关更新
|
||||
--if data.NextLevel ~= -1 then
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnPassFight, oldFight)
|
||||
|
||||
-- 服务器更新关卡状态
|
||||
this.curOpenFight = msg.fightId
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ function this:BuildRateData(actType,UpItem,upItemList)
|
|||
break
|
||||
end
|
||||
end
|
||||
rateList = this:RefreshMonsterRate(upItemList,_upRateList)
|
||||
rateList = this:RefreshMonsterRate(UpItem,_upRateList)
|
||||
elseif actType == ActivityTypeDef.XiangYaoDuoBao then
|
||||
local rewardData,showData,curScore = DynamicActivityManager.XiangYaoBuildData(activityType)
|
||||
for n,m in ipairs(upItemList) do
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ local this = GuideManager
|
|||
local GuideConfig = ConfigManager.GetConfig(ConfigName.GuideConfig)
|
||||
local GlobalSystemConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig)
|
||||
local SpecialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||
local MainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig)
|
||||
local openDic = {}
|
||||
local funcDic = {}
|
||||
|
||||
|
|
@ -18,6 +19,7 @@ function this.Initialize()
|
|||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, this.OnLevelChange)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Practice.PracticeGuide,this.PracticeGuideFun)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.EndLess.GuidePanel,this.EndlessGuideFun)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Mission.OnPassFight,this.OnFightPass)
|
||||
end
|
||||
this.IsFirstOpenHarmonyBei = false
|
||||
|
||||
|
|
@ -106,6 +108,60 @@ function this.OnFunctionOpen(funcId)
|
|||
this.CheckFuncGuide()
|
||||
end
|
||||
|
||||
-- 通过关卡时判断
|
||||
function this.OnFightPass(fightId)
|
||||
if not fightId then return end
|
||||
if not AppConst.isGuide then
|
||||
return
|
||||
end
|
||||
local guideId = MainLevelConfig[fightId].PassGuideId
|
||||
if not guideId or guideId == 0 then
|
||||
return
|
||||
end
|
||||
if funcDic[guideId] then
|
||||
-- funcDic[guideId] = nil
|
||||
return
|
||||
end
|
||||
--
|
||||
table.insert(_FuncGuideList, guideId)
|
||||
this.CheckFuncGuide()
|
||||
end
|
||||
-- 通过关卡时判断
|
||||
function this.BeforeFightCheck(fightId, func)
|
||||
-- 引导完成
|
||||
local function OnFuncGuideDone()
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Guide.FuncGuideDone, OnFuncGuideDone)
|
||||
end
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Guide.FuncGuideDone, OnFuncGuideDone)
|
||||
-- 正确性检测
|
||||
if not fightId then
|
||||
OnFuncGuideDone()
|
||||
return
|
||||
end
|
||||
-- 是否开启引导
|
||||
if not AppConst.isGuide then
|
||||
OnFuncGuideDone()
|
||||
return
|
||||
end
|
||||
-- 判断是否需要引导
|
||||
local guideId = MainLevelConfig[fightId].BeforeGuideId
|
||||
if not guideId or guideId == 0 then
|
||||
OnFuncGuideDone()
|
||||
return
|
||||
end
|
||||
-- 引导过了
|
||||
if funcDic[guideId] then
|
||||
-- funcDic[guideId] = nil
|
||||
OnFuncGuideDone()
|
||||
return
|
||||
end
|
||||
-- 功能引导检测
|
||||
table.insert(_FuncGuideList, guideId)
|
||||
this.CheckFuncGuide()
|
||||
end
|
||||
|
||||
|
||||
-- 将引导加入引导队列
|
||||
|
|
@ -164,6 +220,8 @@ function GuideManager.CheckFuncGuide()
|
|||
GuideManager.ShowGuide(guideId)
|
||||
end
|
||||
table.remove(_FuncGuideList, 1)
|
||||
else
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guide.FuncGuideDone)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -490,7 +490,7 @@ end
|
|||
-- 获取自身的条件属性
|
||||
function this.GetConditionProp(dId)
|
||||
-- 判空
|
||||
if this.IsConPropDirty[dId] then
|
||||
if not this.IsConPropDirty[dId] then
|
||||
this.IsConPropDirty[dId] = {}
|
||||
end
|
||||
if this.IsConPropDirty[dId].isDirty ~= false then
|
||||
|
|
@ -515,13 +515,15 @@ function this.GetConditionProp(dId)
|
|||
|
||||
-- 合并所有属性
|
||||
local condProp = this.GetConditionPropByType(dId, powerType)
|
||||
LogRedTable_Prop(condProp)
|
||||
if condProp then
|
||||
DoubleTableCompound(list, condProp)
|
||||
this.IsConPropDirty[dId][powerType] = condProp
|
||||
this.ConPropList[dId].propList = condProp
|
||||
-- this.IsConPropDirty[dId][powerType] = condProp
|
||||
-- this.ConPropList[dId].propList = condProp
|
||||
end
|
||||
end
|
||||
this.IsConPropDirty[dId].isDirty = false
|
||||
this.ConPropList[dId].propList = list
|
||||
end
|
||||
|
||||
return this.ConPropList[dId].propList
|
||||
|
|
|
|||
|
|
@ -94,8 +94,8 @@ function this.Initialize()
|
|||
-- 发送登出事件
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.LoginSuccess.OnLogout)
|
||||
end
|
||||
|
||||
end
|
||||
--
|
||||
local _Time
|
||||
function this.CheckRealName()
|
||||
local appId = PackageManager.GetAppID()
|
||||
|
|
@ -173,7 +173,7 @@ function this.RequestRegist(name, pw, call)
|
|||
pw, this.sign))
|
||||
|
||||
RequestPanel.Show(Language[11132])
|
||||
this:SendGetHttp(LoginRoot_Url .. "jl_loginserver/registerUser?userName=".. name .. "&password=".. pw .."&repeat=".. pw .. "&sign=" .. sign,
|
||||
HttpManager:SendGetHttp(LoginRoot_Url .. "jl_loginserver/registerUser?userName=".. name .. "&password=".. pw .."&repeat=".. pw .. "&sign=" .. sign,
|
||||
function(str)
|
||||
RequestPanel.Hide()
|
||||
if str == nil then
|
||||
|
|
@ -199,7 +199,7 @@ function this.RequestUser(name, pw, call)
|
|||
pw, this.sign))
|
||||
|
||||
RequestPanel.Show(Language[11134])
|
||||
this:SendGetHttp(LoginRoot_Url .. "jl_loginserver/userLogin?userName=".. name .. "&password=".. pw .. "&sign=" .. sign, function(str)
|
||||
HttpManager:SendGetHttp(LoginRoot_Url .. "jl_loginserver/userLogin?userName=".. name .. "&password=".. pw .. "&sign=" .. sign, function(str)
|
||||
RequestPanel.Hide()
|
||||
if str == nil then
|
||||
return
|
||||
|
|
@ -228,29 +228,6 @@ function this.RequestUser(name, pw, call)
|
|||
end,nil,nil,nil)
|
||||
end
|
||||
|
||||
require("Base.HttpCrypt")
|
||||
local CRYPT_KEY = "d53b3e8ef74bf72d8aafce3a1c8671a0"
|
||||
function this:SendGetHttp(url, callback, _, _, failCB)
|
||||
local request = url
|
||||
LogGreen("Http请求:"..request)
|
||||
if AppConst.Platform == "IOS" then
|
||||
local urlList = string.split(url, "?")
|
||||
urlList[2] = HTTP_ENCRYPT(urlList[2], CRYPT_KEY)
|
||||
request = urlList[1] .. "?crypt=" .. urlList[2]
|
||||
LogGreen("Http加密请求:"..request)
|
||||
end
|
||||
networkMgr:SendGetHttp(request, function(msg)
|
||||
LogGreen("Http请求结果:"..msg)
|
||||
if AppConst.Platform == "IOS" then
|
||||
msg = HTTP_DECRYPT(msg, CRYPT_KEY)
|
||||
LogGreen("Http请求结果解密:"..msg)
|
||||
end
|
||||
if callback then
|
||||
callback(msg)
|
||||
end
|
||||
end, nil, nil, failCB)
|
||||
end
|
||||
|
||||
-- 判断服务器状态是否可进入
|
||||
function this.IsServerStateEnterable(state)
|
||||
if not state then
|
||||
|
|
@ -264,4 +241,28 @@ function this.IsServerStateEnterable(state)
|
|||
return true
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- 初始化包信息
|
||||
function this.InitPackInfo()
|
||||
local LoginRoot_Url = ServerConfigManager.GetVersionInfo("serverUrl")
|
||||
local LoginRoot_Channel = ServerConfigManager.GetVersionInfo("channel")
|
||||
local LoginRoot_UserChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.USER_CHANNEL) or ""
|
||||
local ChannelID = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel
|
||||
local packId = PackageManager.GetPackageID()
|
||||
if packId then
|
||||
ChannelID = ChannelID.. packId
|
||||
end
|
||||
HttpManager:SendGetHttp(LoginRoot_Url.."jl_loginserver/getChannelInfo?ccId="..ChannelID, function(str)
|
||||
if str == "" or str == "null" or string.find(str, "html") then
|
||||
LogWarn("获取到的数据是空值,请检查!")
|
||||
else
|
||||
local json = require 'cjson'
|
||||
local context = json.decode(str)
|
||||
this.IsShield = context.shielding == 1
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
return this
|
||||
|
|
@ -318,6 +318,8 @@ function this:OnOpen(...)
|
|||
local offsetX = (GetPreferredWidth(tran) + Screen.width) / 2
|
||||
tran.anchoredPosition = Vector2.New(offsetX, 0)
|
||||
tran:DOAnchorPosX(-offsetX, 30, false):SetEase(Ease.Linear):SetLoops(-1)
|
||||
-- 初始化一些数据
|
||||
LoginManager.InitPackInfo()
|
||||
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Login)
|
||||
SoundManager.PlayAmbient(SoundConfig.Ambient_Login)
|
||||
|
|
@ -362,8 +364,7 @@ function this.ShowNotice()
|
|||
end
|
||||
end
|
||||
local url = LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..noticeChannel
|
||||
Log(url)
|
||||
LoginManager:SendGetHttp(url,function (str)
|
||||
HttpManager:SendGetHttp(url,function (str)
|
||||
UIManager.OpenPanel(UIName.NoticePopup,str)
|
||||
end, nil, nil, nil)
|
||||
end
|
||||
|
|
@ -376,9 +377,7 @@ function this.RequestServerVersion(func)
|
|||
ChannelID = ChannelID.. packId
|
||||
end
|
||||
local url = LoginRoot_Url .. "jl_loginserver/getServerVersion?serverVersion="..ChannelID
|
||||
LogPink(url)
|
||||
LoginManager:SendGetHttp(url, function (str)
|
||||
LogPink(str)
|
||||
HttpManager:SendGetHttp(url, function (str)
|
||||
if str == "" or str == "null" or string.find(str, "html") then
|
||||
LogWarn("获取到的ServerVersion数据是空值,请检查!")
|
||||
else
|
||||
|
|
@ -415,8 +414,7 @@ function this.RequestServerList(userId, callback)
|
|||
local url = string.format(
|
||||
"%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s&server_version=%s",
|
||||
LoginRoot_Url, userId, LoginRoot_Channel, LoginRoot_SubChannel, SERVER_VERSION)
|
||||
Log(url)
|
||||
LoginManager:SendGetHttp(url, callback, nil, nil, nil)
|
||||
HttpManager:SendGetHttp(url, callback, nil, nil, nil)
|
||||
end)
|
||||
|
||||
--用户协议,隐私政策
|
||||
|
|
@ -440,8 +438,7 @@ function this.RequestProtos(userId)
|
|||
ChannelID = ChannelID .. PackageID
|
||||
end
|
||||
local url = LoginRoot_Url.."jl_loginserver/getAgreement?gamePack="..ChannelID
|
||||
Log(url)
|
||||
LoginManager:SendGetHttp(url, function (str)
|
||||
HttpManager:SendGetHttp(url, function (str)
|
||||
local json = require 'cjson'
|
||||
local data = json.decode(str)
|
||||
if data.parms then
|
||||
|
|
@ -838,8 +835,7 @@ function this.RequestHttpLogin()
|
|||
end
|
||||
|
||||
end
|
||||
Log(url)
|
||||
LoginManager:SendGetHttp(url, this.OnReceiveLogin, nil, nil, nil)
|
||||
HttpManager:SendGetHttp(url, this.OnReceiveLogin, nil, nil, nil)
|
||||
end
|
||||
|
||||
--用户id登录
|
||||
|
|
|
|||
|
|
@ -389,9 +389,9 @@ end
|
|||
-- 试炼商店
|
||||
local trailMapShop = function(showType, eventId, showValues, options)
|
||||
-- 重新获取商店数据
|
||||
ShopManager.RequestAllShopData(function()
|
||||
UIManager.OpenPanel(UIName.MapShopPanel, SHOP_TYPE.TRIAL_SHOP, eventId, options)
|
||||
end)
|
||||
-- ShopManager.RequestAllShopData(function()
|
||||
UIManager.OpenPanel(UIName.MapShopPanel, SHOP_TYPE.TRIAL_SHOP)
|
||||
-- end)
|
||||
end
|
||||
|
||||
-- 试炼Boss界面
|
||||
|
|
@ -449,7 +449,10 @@ local funcList = {
|
|||
--事件点触发
|
||||
function this.EventPointTrigger(eventId)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)
|
||||
PlayerManager.RequestEnergy()
|
||||
-- 只有无尽副本需要重新请求行动力
|
||||
if MapManager.curCarbonType == CarBonTypeId.ENDLESS then
|
||||
PlayerManager.RequestEnergy()
|
||||
end
|
||||
MyPCall(function ()
|
||||
Log("EventPointTrigger中得到的事件ID " .. eventId)
|
||||
if eventId == 0 or eventId < 0 then
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
require("Base.HttpCrypt")
|
||||
HttpManager = {}
|
||||
-- 加密密钥
|
||||
local CRYPT_KEY = "d53b3e8ef74bf72d8aafce3a1c8671a0"
|
||||
-- 是否要加密
|
||||
local isCrypt = AppConst.Platform == "IOS" --or AppConst.Platform == "EDITOR"
|
||||
-- 计数器
|
||||
local _Counter = 0
|
||||
-- GET 请求
|
||||
function HttpManager:SendGetHttp(url, callback, _, _, failCB)
|
||||
local request = url
|
||||
_Counter = _Counter + 1
|
||||
local count = _Counter
|
||||
LogWarn("Http请求" .. count.. ":"..request)
|
||||
if isCrypt then
|
||||
local urlList = string.split(url, "?")
|
||||
urlList[2] = HTTP_ENCRYPT(urlList[2], CRYPT_KEY)
|
||||
request = urlList[1] .. "?crypt=" .. urlList[2]
|
||||
LogWarn("Http加密请求" .. count.. ":"..request)
|
||||
end
|
||||
networkMgr:SendGetHttp(request, function(msg)
|
||||
LogWarn("Http请求" .. count.. "结果:"..msg)
|
||||
if isCrypt then
|
||||
msg = HTTP_DECRYPT(msg, CRYPT_KEY)
|
||||
LogWarn("Http请求" .. count.. "结果解密:"..msg)
|
||||
end
|
||||
if callback then
|
||||
callback(msg)
|
||||
end
|
||||
end, nil, nil, failCB)
|
||||
end
|
||||
|
||||
return HttpManager
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 962977ac38fa98d4aa6c4eb32159ce49
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -135,7 +135,7 @@ function this.RegisterMessage(network)
|
|||
-- 神印信息推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.PurpleMansionSealIndication, this.PracticeImprintData)
|
||||
-- Vip等级奖励信息推送
|
||||
-- socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
|
||||
-- --心愿抽卡信息推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.wishDrawCardIndication, this.WishDrawCardInfoIndication)
|
||||
-- --心愿抽卡信息推送
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@ end
|
|||
function ExpertPre:SetButton()
|
||||
local btnData = BtnState[self.data.otherData.state]
|
||||
self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite(btnData.Img)
|
||||
Util.SetGray(self.btnGet,btnData.isGray)
|
||||
self.redPoint:SetActive(btnData.isRed)
|
||||
Util.SetGray(self.btnGet,btnData.isGray)
|
||||
self.btnText.text = btnData.Text
|
||||
self.info.text = self.data.otherData.info
|
||||
if self.actConfig.ActiveType == ActivityTypeDef.ContinuityRecharge then
|
||||
|
|
|
|||
|
|
@ -206,7 +206,6 @@ function RewardTalismanSingleShowPopup2:SetBtns()
|
|||
self.btnSwitch:SetActive(self.openType == 4)
|
||||
self.btnUpgrade:SetActive(self.openType == 2)
|
||||
self.btnUpstar:SetActive(self.openType == 2)
|
||||
self.mid:GetComponent("LayoutElement").minHeight = not self.isShowGet and 850 or 250
|
||||
|
||||
if self.equipData and self.equipData ~= 0 then
|
||||
isGongMing = HarmonyManager.IsInfo(self.equipData.upHeroDid)
|
||||
|
|
@ -276,9 +275,6 @@ function RewardTalismanSingleShowPopup2:OnShow()
|
|||
self.treeLevel.text = string.format("[神应等级:%s/%s]",self.equipData.treeLv,self.equipData.maxTreeLv)
|
||||
if (self.equipData.treeLv < 1 and SacredTreeManager.CulAttri(self.equipData) < 1) or self.openType == 1 then
|
||||
self.treeAttri:SetActive(false)
|
||||
if not self.isShowGet then
|
||||
self.mid:GetComponent("LayoutElement").minHeight = 450
|
||||
end
|
||||
else
|
||||
self.treeAttri:SetActive(true)
|
||||
self:SetPropertyShow2(treeInfo,self.TreeAttriList,self.treeGrid,self.TreeAttriList2)
|
||||
|
|
@ -288,9 +284,6 @@ function RewardTalismanSingleShowPopup2:OnShow()
|
|||
if self.equipData.upHeroDid == "" or self.equipData.upHeroDid == "0" then
|
||||
self.baseMaster:SetActive(false)
|
||||
self.refineMaster:SetActive(false)
|
||||
if not self.isShowGet then
|
||||
self.mid:GetComponent("LayoutElement").minHeight = 250
|
||||
end
|
||||
else
|
||||
--强化共鸣
|
||||
self:GongMingSetData(1,self.BaseMasterList,self.baseMasterGrid,self.baseMasterName,self.baseMaster)
|
||||
|
|
@ -329,6 +322,15 @@ function RewardTalismanSingleShowPopup2:OnShow()
|
|||
ForceRebuildLayout(self.midBar.transform)
|
||||
ForceRebuildLayout(self.midBar.transform)
|
||||
ForceRebuildLayout(self.midBar.transform)
|
||||
|
||||
|
||||
local maxHeight = self.isShowGet and 250 or 850
|
||||
local sizeDelta = GetPreferredHeight(self.midBar.transform)
|
||||
if sizeDelta >= maxHeight then
|
||||
self.mid:GetComponent("LayoutElement").minHeight = maxHeight
|
||||
else
|
||||
self.mid:GetComponent("LayoutElement").minHeight = sizeDelta
|
||||
end
|
||||
|
||||
if self.func then
|
||||
self.func()
|
||||
|
|
@ -486,9 +488,6 @@ function RewardTalismanSingleShowPopup2:GongMingSetData(curTabIndex,proPreList,g
|
|||
end
|
||||
if curJewelResonanceConfig.SortId < 1 then
|
||||
go.gameObject:SetActive(false)
|
||||
if not self.isShowGet then
|
||||
self.mid:GetComponent("LayoutElement").minHeight = self.mid:GetComponent("LayoutElement").minHeight - 100
|
||||
end
|
||||
return
|
||||
end
|
||||
go.gameObject:SetActive(true)
|
||||
|
|
|
|||
|
|
@ -93,7 +93,12 @@ function RoleInfoPopup:BindEvent()
|
|||
Util.AddClick(this.ShenhunBtn,function()
|
||||
local s = function()
|
||||
local pro = {}
|
||||
local lv = curHeroData.godSoulLv
|
||||
local lv = 0
|
||||
if this.isOther then
|
||||
lv = curHeroData.godSoulLv
|
||||
else
|
||||
lv = GodSoulManager.GetGodSoulLv(curHeroData.dynamicId)
|
||||
end
|
||||
local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0)
|
||||
|
||||
for i = 1,LengthOfTable(skillList) do
|
||||
|
|
@ -191,7 +196,6 @@ function RoleInfoPopup:OnOpen(...)
|
|||
this.selsectSkillImage:SetActive(false)
|
||||
local arg = { ... }
|
||||
curHeroData = arg[1]
|
||||
LogGreen("curHeroData:"..curHeroData.dynamicId)
|
||||
this.isOther = arg[2]
|
||||
choosedList = arg[3] or nil
|
||||
formationHeroNum = arg[4] or nil
|
||||
|
|
|
|||
|
|
@ -218,6 +218,9 @@ function SoulPrintPopUp:RefreshShow(type)
|
|||
self.equipInfoText.text = GetLanguageStrById(itemConfig[soulId].ItemDescribe)
|
||||
self.equipQuaText.text= GetStringByEquipQua(equipConfig[soulId].Quality, GetQuaStringByEquipQua(equipConfig[soulId].Quality))
|
||||
self.equipType.text= Language[11089]..GetEquipPosStrByEquipPosNum(equipConfig[soulId].Position)
|
||||
self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..equipConfig[soulId].Quality)
|
||||
self.effectbaijin:SetActive(equipConfig[soulId].Quality==7)
|
||||
Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1)
|
||||
|
||||
if equipConfig[soulId] then --魂印效果
|
||||
local txt = ""
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ function this.Show()
|
|||
|
||||
local skillId=curTalismanConFig.Property[i][1]
|
||||
local curValue=curTalismanConFig.Property[i][2]
|
||||
proName.text= " "..GetLanguageStrById(propertyConfig[skillId].Info).."+<size=40>"..curValue.."</size>"
|
||||
proName.text= " <size=40>"..GetLanguageStrById(propertyConfig[skillId].Info).."+"..curValue.."</size>"
|
||||
proImage.sprite=this.spLoader:LoadSprite(artResourcesConfig[propertyConfig[skillId].PropertyIcon].Name)
|
||||
Util.GetGameObject(proImage.gameObject,"Image"):GetComponent("Image"):SetNativeSize()
|
||||
end
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ function this.OnShowHeroAndTalisman()
|
|||
|
||||
local skillId=curTalismanConFig.Property[i][1]
|
||||
local curValue=curTalismanConFig.Property[i][2]
|
||||
proName.text= " "..GetLanguageStrById(propertyConfig[skillId].Info).."+<size=40>"..curValue.."</size>"
|
||||
proName.text= " <size=40>"..GetLanguageStrById(propertyConfig[skillId].Info).."+"..curValue.."</size>"
|
||||
proImage.sprite=this.spLoader:LoadSprite(artResourcesConfig[propertyConfig[skillId].PropertyIcon].Name)
|
||||
Util.GetGameObject(proImage.gameObject,"Image"):GetComponent("Image"):SetNativeSize()
|
||||
end
|
||||
|
|
|
|||
|
|
@ -211,7 +211,11 @@ function this.RefreshPanel(eventId, isFirstOpen)
|
|||
-- 显示立绘
|
||||
if resId > 0 and resId ~= 999 then
|
||||
local data = artResConfig[resId]
|
||||
this.RoleName.text =string.gsub(GetLanguageStrById(data.Desc), Language[11252], NameManager.roleName)
|
||||
if NameManager.roleName == tostring(PlayerManager.uid) then
|
||||
this.RoleName.text =string.gsub(GetLanguageStrById(data.Desc), Language[11252], "??????")
|
||||
else
|
||||
this.RoleName.text =string.gsub(GetLanguageStrById(data.Desc), Language[11252], NameManager.roleName)
|
||||
end
|
||||
|
||||
-- 初始化特效
|
||||
StoryManager.InitEffect(this.effectRoot)
|
||||
|
|
|
|||