Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-11-29 18:26:02 +08:00
commit db1fd8cc9e
21 changed files with 313 additions and 75 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

View File

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

View File

@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Effect_c_gg_0005_t3_attack_02_long
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4ec9eefccd3417849a75812f2dac35a9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,12 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Effect_c_gg_0005_t3_attack_02
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ef8708970d2a3ca40863d59d24e060b1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4674,7 +4674,7 @@ Transform:
- {fileID: 8583359779622409798}
m_Father: {fileID: 8583359780496105434}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -78.295715, y: -162.99301, z: 132.10664}
--- !u!1 &8583359778830568330
GameObject:
m_ObjectHideFlags: 0
@ -4705,7 +4705,7 @@ Transform:
m_Children: []
m_Father: {fileID: 8583359779325509924}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0.000026987575, y: 0.000112137626, z: -0.00009089117}
--- !u!1 &8583359778877583957
GameObject:
m_ObjectHideFlags: 0
@ -4736,7 +4736,7 @@ Transform:
- {fileID: 8583359780780892883}
m_Father: {fileID: 8583359779024169282}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 7.6508217, y: -42.056564, z: 9.596247}
--- !u!1 &8583359778912894939
GameObject:
m_ObjectHideFlags: 0
@ -4767,7 +4767,7 @@ Transform:
- {fileID: 8583359780227096890}
m_Father: {fileID: 8583359780287916076}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 11.315113, y: -1.6198218, z: 5.2691855}
--- !u!1 &8583359778915826874
GameObject:
m_ObjectHideFlags: 0
@ -4798,7 +4798,7 @@ Transform:
- {fileID: 8583359779339536484}
m_Father: {fileID: 8583359779761937105}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 1.2533952, y: -0.5450233, z: 4.252144}
--- !u!1 &8583359778928294708
GameObject:
m_ObjectHideFlags: 0
@ -9437,7 +9437,7 @@ Transform:
- {fileID: 8583359780622386936}
m_Father: {fileID: 8583359780737159013}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 5.711338, y: 7.1350965, z: -50.252064}
--- !u!1 &8583359778998265021
GameObject:
m_ObjectHideFlags: 0
@ -14179,7 +14179,7 @@ Transform:
- {fileID: 8583359778877583956}
m_Father: {fileID: 8583359780489516950}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -39.905132, y: -11.74011, z: 107.83448}
--- !u!1 &8583359779033011727
GameObject:
m_ObjectHideFlags: 0
@ -14210,7 +14210,7 @@ Transform:
- {fileID: 8583359780222541044}
m_Father: {fileID: 8583359780582047452}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -0.0008251767, y: -4.621528, z: -0.0000008160903}
--- !u!1 &8583359779092110012
GameObject:
m_ObjectHideFlags: 0
@ -14241,7 +14241,7 @@ Transform:
- {fileID: 8583359780778704922}
m_Father: {fileID: 8583359780539271661}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 1.7000273, y: -0.3553565, z: 3.6033316}
--- !u!1 &8583359779233249879
GameObject:
m_ObjectHideFlags: 0
@ -14303,7 +14303,7 @@ Transform:
- {fileID: 8583359780737159013}
m_Father: {fileID: 8583359780489516950}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 39.717133, y: -12.470476, z: -108.97518}
--- !u!1 &8583359779261652653
GameObject:
m_ObjectHideFlags: 0
@ -14334,7 +14334,7 @@ Transform:
- {fileID: 8583359780539271661}
m_Father: {fileID: 8583359778809022081}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 2.0161712, y: -0.12133855, z: 4.566022}
--- !u!1 &8583359779325509925
GameObject:
m_ObjectHideFlags: 0
@ -14365,7 +14365,7 @@ Transform:
- {fileID: 8583359778830568373}
m_Father: {fileID: 8583359779886815976}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 2.0708246, y: -3.131134, z: -2.0992591}
--- !u!1 &8583359779339496456
GameObject:
m_ObjectHideFlags: 0
@ -14375,8 +14375,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8583359779339496459}
- component: {fileID: 1607102813}
m_Layer: 5
m_Name: Effect_c_jlbuyuan_00017_t3_attack_02
m_Name: Effect_c_gg_0005_t3_attack_02
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -14389,7 +14390,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8583359779339496456}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -14404,6 +14405,25 @@ RectTransform:
m_AnchoredPosition: {x: 54, y: -400.00006}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1607102813
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8583359779339496456}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: ef8708970d2a3ca40863d59d24e060b1, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &8583359779339536485
GameObject:
m_ObjectHideFlags: 0
@ -14434,7 +14454,7 @@ Transform:
- {fileID: 8583359780020614863}
m_Father: {fileID: 8583359778915826853}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0.9179168, y: -0.48307034, z: 3.8870718}
--- !u!1 &8583359779356098851
GameObject:
m_ObjectHideFlags: 0
@ -23931,7 +23951,7 @@ Transform:
m_Children: []
m_Father: {fileID: 8583359780127453901}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0.00000054405984, y: -2.5334755e-15, z: -0.00000034003727}
--- !u!1 &8583359779520751307
GameObject:
m_ObjectHideFlags: 0
@ -23962,7 +23982,7 @@ Transform:
- {fileID: 8583359780489516950}
m_Father: {fileID: 8583359778809022081}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -0.000022444056, y: -0.078465395, z: -179.99998}
--- !u!1 &8583359779549669315
GameObject:
m_ObjectHideFlags: 0
@ -38101,7 +38121,7 @@ Transform:
- {fileID: 8583359780582047452}
m_Father: {fileID: 8583359780020614863}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -0.20879847, y: 0.19122295, z: 3.208982}
--- !u!1 &8583359779761937110
GameObject:
m_ObjectHideFlags: 0
@ -38132,7 +38152,7 @@ Transform:
- {fileID: 8583359778915826853}
m_Father: {fileID: 8583359780778704922}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 2.5270095, y: -0.84659535, z: 3.8577144}
--- !u!1 &8583359779768604140
GameObject:
m_ObjectHideFlags: 0
@ -42771,7 +42791,7 @@ Transform:
- {fileID: 8583359779325509924}
m_Father: {fileID: 8583359780858288004}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -7.750087, y: -4.9784966, z: -2.028608}
--- !u!1 &8583359780020614860
GameObject:
m_ObjectHideFlags: 0
@ -42802,7 +42822,7 @@ Transform:
- {fileID: 8583359779741002725}
m_Father: {fileID: 8583359779339536484}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0.023431227, y: -0.0057084784, z: 3.7818108}
--- !u!1 &8583359780123080852
GameObject:
m_ObjectHideFlags: 0
@ -47598,7 +47618,7 @@ Transform:
- {fileID: 8583359779433925676}
m_Father: {fileID: 8583359780489516950}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -0.14230524, y: -18.512941, z: -0.42489752}
--- !u!1 &8583359780222541045
GameObject:
m_ObjectHideFlags: 0
@ -47628,7 +47648,7 @@ Transform:
m_Children: []
m_Father: {fileID: 8583359779033011726}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -0.00010402166, y: 6.7115088, z: -0.00006982046}
--- !u!1 &8583359780227096891
GameObject:
m_ObjectHideFlags: 0
@ -47659,7 +47679,7 @@ Transform:
m_Children: []
m_Father: {fileID: 8583359778912894938}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0.00000054405996, y: 0.0000010881192, z: -0.0000030603364}
--- !u!1 &8583359780227688808
GameObject:
m_ObjectHideFlags: 0
@ -57102,7 +57122,7 @@ Transform:
- {fileID: 8583359778912894938}
m_Father: {fileID: 8583359780622386936}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 12.69963, y: -4.5519385, z: 5.1955066}
--- !u!1 &8583359780373081351
GameObject:
m_ObjectHideFlags: 0
@ -61812,7 +61832,7 @@ Transform:
m_Children: []
m_Father: {fileID: 8583359780489516950}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0.00000054405996, y: 1.5707545e-14, z: 0.000002108231}
--- !u!1 &8583359780489516951
GameObject:
m_ObjectHideFlags: 0
@ -61846,7 +61866,7 @@ Transform:
- {fileID: 8583359779024169282}
m_Father: {fileID: 8583359779520751306}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -0.0000010114987, y: -0.000005613012, z: 0.44809195}
--- !u!1 &8583359780496105435
GameObject:
m_ObjectHideFlags: 0
@ -61928,7 +61948,7 @@ Transform:
- {fileID: 8583359779092110015}
m_Father: {fileID: 8583359779261652652}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 1.7272565, y: -0.24244085, z: 3.976343}
--- !u!1 &8583359780545637070
GameObject:
m_ObjectHideFlags: 0
@ -66670,7 +66690,7 @@ Transform:
- {fileID: 8583359779033011726}
m_Father: {fileID: 8583359779741002725}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0.13227884, y: -0.110754356, z: 2.5229824}
--- !u!1 &8583359780622386937
GameObject:
m_ObjectHideFlags: 0
@ -66701,7 +66721,7 @@ Transform:
- {fileID: 8583359780287916076}
m_Father: {fileID: 8583359778949709762}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0.65043914, y: 0.9459672, z: -21.82159}
--- !u!1 &8583359780628128495
GameObject:
m_ObjectHideFlags: 0
@ -76163,7 +76183,7 @@ Transform:
- {fileID: 8583359778949709762}
m_Father: {fileID: 8583359779256436801}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -7.650837, y: -42.056484, z: -9.5962715}
--- !u!1 &8583359780739818220
GameObject:
m_ObjectHideFlags: 0
@ -80941,7 +80961,7 @@ Transform:
- {fileID: 8583359779761937105}
m_Father: {fileID: 8583359779092110015}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 1.9782355, y: -0.5418271, z: 3.7371054}
--- !u!1 &8583359780780892880
GameObject:
m_ObjectHideFlags: 0
@ -80972,7 +80992,7 @@ Transform:
- {fileID: 8583359780858288004}
m_Father: {fileID: 8583359778877583956}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -6.05639, y: 11.599041, z: 43.319332}
--- !u!1 &8583359780858288005
GameObject:
m_ObjectHideFlags: 0
@ -81003,7 +81023,7 @@ Transform:
- {fileID: 8583359779886815976}
m_Father: {fileID: 8583359780780892883}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 1.7872667, y: 3.592661, z: 22.465155}
--- !u!1 &8583359780890195426
GameObject:
m_ObjectHideFlags: 0

View File

@ -26475,7 +26475,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &369711104
RectTransform:
m_ObjectHideFlags: 0
@ -26797,7 +26797,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &601964300
RectTransform:
m_ObjectHideFlags: 0
@ -236946,7 +236946,7 @@ PrefabInstance:
- target: {fileID: 7126812816580768065, guid: 9c72861411653334d98f12e4dbdf4ded,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 103
value: 203
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9c72861411653334d98f12e4dbdf4ded, type: 3}

View File

@ -3177,10 +3177,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 28
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -18675,10 +18675,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 28
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -18754,10 +18754,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 28
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -23756,10 +23756,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 28
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0

View File

@ -4859,7 +4859,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -10184,7 +10184,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -15211,7 +15211,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -30131,7 +30131,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -35392,7 +35392,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -40876,7 +40876,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -40950,7 +40950,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -41024,7 +41024,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -46092,7 +46092,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -51070,7 +51070,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -56257,7 +56257,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -65976,7 +65976,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -70931,7 +70931,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -76070,7 +76070,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -76218,7 +76218,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -76292,7 +76292,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

View File

@ -2657,9 +2657,11 @@ local effectList = {
if target.isDead then
BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime,function()
local arr = RoleManager.Query(function (r) return r.camp == target.camp end)
for i = 1, i1 do
local count = Random.RangeInt(1,#arr)
BattleUtil.CalRage(caster,arr[count],v1,CountTypeName.Sub)
if arr and #arr>0 then
for i = 1, i1 do
local count = Random.RangeInt(1,#arr)
BattleUtil.CalRage(caster,arr[count],v1,CountTypeName.Sub)
end
end
end)
end

View File

@ -181,9 +181,6 @@ end
-- 根据属性排序
function BattleUtil.SortByProp(arr, prop, sort)
if sort==0 then
return arr
end
BattleUtil.Sort(arr, function(a, b)
local r1 = a:GetRoleData(prop)
local r2 = b:GetRoleData(prop)
@ -379,7 +376,9 @@ function BattleUtil.ChooseTarget(role, chooseId)
if chooseWeight == 0 or role.ctrl_blind then --致盲时排序无效
BattleUtil.RandomList(arr)
elseif chooseWeight == 1 then -- 生命值
BattleUtil.SortByProp(arr, RoleDataName.Hp, sort)
if sort~=0 then
BattleUtil.SortByProp(arr, RoleDataName.Hp, sort)
end
elseif chooseWeight == 2 then -- 血量百分比
BattleUtil.SortByHpFactor(arr, sort)
--选血量百分比最低的 不选择有不灭的,如果伤害要选有不灭的 需处理
@ -669,7 +668,9 @@ end
-- 怒气计算
function BattleUtil.CalRage(caster, target, value, countType,isBorrow)
if target==nil then
return
end
-- 角色身上有无敌盾,不扣除怒气 by:wangzhenxing 2020/08/10 14:56
if (countType==3 or countType==4) -- 降怒
and (target.isImmuneReduceRage -- 免疫降怒 或者 有无敌盾

View File

@ -42,6 +42,10 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
local data = nil
if skinId and skinId>0 then
data = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId)
local roleConfig= ConfigManager.TryGetConfigData(ConfigName.RoleConfig,skinId)
if roleConfig then
toward=roleConfig.Toward
end
else
data= ConfigManager.GetConfigData(ConfigName.HeroConfig,heroTId)
toward=data.Toward

View File

@ -139,7 +139,12 @@ function MonsterView:PlaySpineAnim(gog, time, name, isLoop)
local _complete = nil
_complete = function(state)
gog.AnimationState.Complete = gog.AnimationState.Complete - _complete
gog.AnimationState:SetAnimation(0, "attack", true)
if self.role.roleData.id==20100 then
gog.AnimationState:SetAnimation(0, "idle", true)
else
gog.AnimationState:SetAnimation(0, "attack", true)
end
end
gog.AnimationState:ClearTracks() -- 清除上一个动画的影响(修复概率攻击动画播放错误的问题)
gog.AnimationState:SetAnimation(time, name, isLoop)

View File

@ -123,9 +123,14 @@ function ShengYiTianJiang:OnShowData()
self.proPertyText.text = "属性加成:"
if not skinConfig then
else
LogGreen(skinConfig.Live.." name:"..GetResourcePath(skinConfig.Live))
LogGreen(skinConfig.Live.." name:"..GetResourcePath(skinConfig.Live))
self.LiveObj = poolManager:LoadLive(GetResourcePath(skinConfig.Live),self.liveRoot.transform, Vector3.one * skinConfig.Scale, Vector3.New(skinConfig.Position[1], skinConfig.Position[2], 0))
self.skinName.text = ConfigManager.GetConfigData(ConfigName.HeroConfig,skinConfig.HeroId).ReadingName
local roleConfig= ConfigManager.TryGetConfigData(ConfigName.RoleConfig,skinId)
if roleConfig then
SetHEeroLiveToward(self.LiveObj,roleConfig.Toward,skinConfig.Position)
end
local heroSkinSingleProVal = {}
for _,v in ipairs(skinConfig.MonomerProperty) do
if not heroSkinSingleProVal[v[1]] then

View File

@ -151,6 +151,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
live.transform.rotation=Vector3.New(0,0,0)
local liveName = GetResourcePath(heroConfig.Live)
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
local scale = roleConfig.play_liveScale

View File

@ -222,6 +222,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
name.text=heroConfig.ReadingName
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
live.transform.rotation=Vector3.New(0,0,0)
local liveName = GetResourcePath(heroConfig.Live)
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
local scale = roleConfig.play_liveScale
@ -229,7 +230,10 @@ function this.SetCardSingleData(o,monsterId, _pos)
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
live.transform.localScale = Vector3.one
live.transform.localPosition = Vector3.zero
LogError("hero toward=="..heroConfig.Toward)
if heroConfig.Toward==2 then
SetHEeroLiveToward(live,1)
end
local zs = Util.GetGameObject(o, "zs")
local zsName = GetHeroCardStarZs[monsterconfig.Star]
if zsName == "" then

View File

@ -178,6 +178,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
Util.GetGameObject(o,"hpProgress"):SetActive(false)
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
live.transform.rotation=Vector3.New(0,0,0)
local liveName = GetResourcePath(heroConfig.Live)
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
local scale = roleConfig.play_liveScale

View File

@ -146,6 +146,9 @@ function this.SetSelectHero()
_LiveName = ArtConfig[paintingId].Name
_LiveNode = poolManager:LoadLive(_LiveName, this.e_liveRoot.transform, Vector3.one * heroConfig[monsterId].Scale, Vector3.New(pos[1], pos[2], 0))
this.rootLive.transform.localScale = Vector3.one*0.7
if heroConfig[monsterId].Toward==2 then
SetHEeroLiveToward(_LiveNode,1,pos)
end
this.e_level.text = "lv."..MonsterConfig[t].Level
this.e_name.text = GetLanguageStrById(MonsterConfig[t].ReadingName)

View File

@ -77,6 +77,7 @@ function DropGetSSRHeroShopPanel:OnShow()
testLiveGO = poolManager:LoadLive(GetResourcePath(heroStaticData.Live), self.live2dRoot.transform,
Vector3.one * heroStaticData.Scale, Vector3.New(heroStaticData.Position[1],heroStaticData.Position[2],0))
local SkeletonGraphic = testLiveGO:GetComponent("SkeletonGraphic")
SetHEeroLiveToward(testLiveGO,heroStaticData.Toward,heroStaticData.Position)
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle
poolManager:SetLiveClearCall(GetResourcePath(heroStaticData.Live), testLiveGO, function ()

View File

@ -160,9 +160,9 @@ function TailsmanSoulChipLottery:refreshMagicNum()
self.btnGift:SetActive(isActive)
local d = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySpecialConfig,"Type",self.singleRecruit.MergePool)
self.updateTimesTip.text = string.format("召唤<color=#%s>%s</color>次必得红色碎片","A55A13",d[1].Count - self.actData.value)
self.updateTimesTip.text = string.format("<color=#cbb981>召唤<color=#%s>%s</color>次必得红色碎片</color>","ff850c",d[1].Count - self.actData.value)
local endTime = ActivityGiftManager.GetTaskEndTime(self.actType) - PlayerManager.serverTime
self.updateTimesTip1.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime))
self.updateTimesTip1.text = string.format("<color=#cbb981>活动剩余时间:%s</color>",self:TimeToDHMS(endTime))
local timeDown=CalculateSecondsNowTo_N_OClock(0)
self.timer = Timer.New(function()
if timeDown < 1 then
@ -177,7 +177,7 @@ function TailsmanSoulChipLottery:refreshMagicNum()
self:OnShow(sortingOrder)
return
else
self.updateTimesTip1.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime))
self.updateTimesTip1.text = string.format("<color=#cbb981>活动剩余时间:%s</color>",self:TimeToDHMS(endTime))
end
endTime = endTime - 1
timeDown = timeDown - 1