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

dev_chengFeng
jiaoyangna 2021-11-26 17:54:55 +08:00
commit 4a82bcc664
21 changed files with 252 additions and 101 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: a8833975dce77d44895dd3577189ce53
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: 018a74a082ebc2f499e65a82059a88a4
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -316,16 +316,16 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2692898917959277323}
- component: {fileID: 7023519117441382734}
m_Layer: 0
m_Name: buff_WDXXD 1
m_Name: TongYong_Effect_buff_wudi
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2692898917959277323
Transform:
--- !u!224 &7023519117441382734
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -339,6 +339,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5028713974176146044
GameObject:
m_ObjectHideFlags: 0
@ -5553,6 +5558,6 @@ Transform:
- {fileID: 2709948177419360945}
- {fileID: 2512203624190304090}
- {fileID: 8584142683560691132}
m_Father: {fileID: 2692898917959277323}
m_Father: {fileID: 7023519117441382734}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -9799,12 +9799,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 7144930083889366428}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 7
m_Father: {fileID: -7803108222865121850}
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: -73, y: -86.000046}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &1572569323773417563
@ -9854,9 +9854,10 @@ RectTransform:
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_Children:
- {fileID: -3258366035422410537}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 3
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}
@ -25577,15 +25578,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 99.9786}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: -3258366035422410537}
- {fileID: 2464737965211906784}
- {fileID: -7417218276520852801}
- {fileID: -8859645987379613814}
- {fileID: -100897375014412121}
- {fileID: 7840477457502880242}
- {fileID: -7288508588859361142}
- {fileID: 3795882027273366937}
- {fileID: -3619418234783803351}
- {fileID: -3928636227828066691}
- {fileID: -7803108222865121850}
- {fileID: -8474452437207042981}
@ -25623,9 +25618,10 @@ RectTransform:
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_Children:
- {fileID: -3619418234783803351}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 11
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -25845,12 +25841,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 6960185033272747284}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 2
m_Father: {fileID: 7840477457502880242}
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: 377, y: 143.99995}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &268233009513622496
@ -33298,9 +33294,10 @@ RectTransform:
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_Children:
- {fileID: -7288508588859361142}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 9
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -44398,9 +44395,10 @@ RectTransform:
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_Children:
- {fileID: 2464737965211906784}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 4
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -44708,16 +44706,16 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1004967687612880886}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 99.9786}
m_LocalPosition: {x: 0, y: 0, z: 98.9786}
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 4060928337411048415}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 5
m_Father: {fileID: 8011628067624866770}
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: 77, y: 142.99997}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &4823737723693298344
@ -44833,7 +44831,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3360585188075601704
RectTransform:
m_ObjectHideFlags: 0
@ -44847,7 +44845,7 @@ RectTransform:
m_Children:
- {fileID: 4449728987535257064}
m_Father: {fileID: 4330148323958158182}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -44908,7 +44906,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4127916411277389435
RectTransform:
m_ObjectHideFlags: 0
@ -44922,7 +44920,7 @@ RectTransform:
m_Children:
- {fileID: 3813825261449738182}
m_Father: {fileID: 8011628067624866770}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -60059,12 +60057,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 2578355701318810613}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 1
m_Father: {fileID: -100897375014412121}
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: 77, y: 143.99995}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &-4340789554266929400
@ -79729,7 +79727,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &890082298661879197
RectTransform:
m_ObjectHideFlags: 0
@ -79743,7 +79741,7 @@ RectTransform:
m_Children:
- {fileID: 5542171691843067784}
m_Father: {fileID: 4053770132861701690}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -80376,9 +80374,10 @@ RectTransform:
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_Children:
- {fileID: -7417218276520852801}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 5
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -87875,7 +87874,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &666760566860824669
RectTransform:
m_ObjectHideFlags: 0
@ -87889,7 +87888,7 @@ RectTransform:
m_Children:
- {fileID: -3222148989548170810}
m_Father: {fileID: 3198430005102515251}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -88185,12 +88184,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 3217903925305295122}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 6
m_Father: {fileID: -3928636227828066691}
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: -373, y: -86.000046}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &-2841052192673379441
@ -103930,9 +103929,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7786658268145073970}
- {fileID: 3360585188075601704}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 12
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -128131,9 +128131,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6585631384616885062}
- {fileID: 7502186766485076338}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 8
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -157548,12 +157549,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 834692241}
- {fileID: 7485940279673153507}
- {fileID: 6585631384616885062}
- {fileID: 4417892464660579975}
- {fileID: 2593633115569930101}
- {fileID: 5541316517095428245}
- {fileID: 7786658268145073970}
- {fileID: 3198430005102515251}
- {fileID: 4733835317090964167}
- {fileID: 4053770132861701690}
@ -157735,12 +157730,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 3173719562454643619}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 8
m_Father: {fileID: -8474452437207042981}
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: 227, y: -86.000046}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &-3362569938017948774
@ -157793,12 +157788,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 8339478454819500014}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 3
m_Father: {fileID: 3198430005102515251}
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: 227, y: 448.99994}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &3681946865722538890
@ -178755,7 +178750,7 @@ RectTransform:
- {fileID: 3691979404969139093}
- {fileID: 631228591500787782}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 14
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@ -179935,9 +179930,10 @@ RectTransform:
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_Children:
- {fileID: 3795882027273366937}
m_Father: {fileID: 4104790940082786943}
m_RootOrder: 10
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -179973,12 +179969,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 1691281247155542861}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 1
m_Father: {fileID: 4053770132861701690}
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: -373, y: 448.99994}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &8683155064434081473
@ -180216,9 +180212,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7485940279673153507}
- {fileID: 890082298661879197}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 9
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -180383,12 +180380,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: -8409425785127076249}
m_Father: {fileID: 4104790940082786943}
m_Father: {fileID: -8859645987379613814}
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: -223, y: 144}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &-35742711196225680
@ -180663,7 +180660,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7502186766485076338
RectTransform:
m_ObjectHideFlags: 0
@ -180677,7 +180674,7 @@ RectTransform:
m_Children:
- {fileID: 5441369409000555912}
m_Father: {fileID: 4733835317090964167}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -185831,7 +185828,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 13
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -215628,12 +215625,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 5298674135033318747}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 6
m_Father: {fileID: 4330148323958158182}
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: 377, y: 142.99997}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &3196897155070244967
@ -220453,7 +220450,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2069895754318839184
RectTransform:
m_ObjectHideFlags: 0
@ -220467,7 +220464,7 @@ RectTransform:
m_Children:
- {fileID: 6751140669436849440}
m_Father: {fileID: 8665821495714301826}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -220540,12 +220537,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 9139396969791315054}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 4
m_Father: {fileID: 8665821495714301826}
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: -223, y: 143}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &3329905336858514894
@ -220596,9 +220593,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5541316517095428245}
- {fileID: 4127916411277389435}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 11
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -220917,9 +220915,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4417892464660579975}
- {fileID: 666760566860824669}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 7
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -231754,12 +231753,12 @@ RectTransform:
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 176820800635632652}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 2
m_Father: {fileID: 4733835317090964167}
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: -73, y: 448.99994}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &6752199970212708454
@ -236588,9 +236587,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2593633115569930101}
- {fileID: 2069895754318839184}
m_Father: {fileID: 8032969764776295951}
m_RootOrder: 10
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

View File

@ -34693,6 +34693,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 248
resAbNameIndex: 1969
- resName: m_meiyuelibao_banner33
extension: .png
resPathIndex: 248
resAbNameIndex: 1969
- resName: p_pozhengzhuxian_tu_zh
extension: .png
resPathIndex: 248

View File

@ -537,6 +537,17 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
ForceRebuildLayout(starGrid.transform)
end
--设置英雄立绘朝向
function SetHEeroLiveToward(go,toward)
if go and toward==1 then
go.transform.rotation=Vector3.New(0,180,0)
else
go.transform.rotation=Vector3.New(0,0,0)
end
end
function SetHeroBg(spLoader, bg,cardBg,star,quality)
local hong = Util.GetGameObject(bg,"Effect_UI_yansekuang_HongSe")
local bai = Util.GetGameObject(bg,"Effect_UI_yansekuang_BaiSe")

View File

@ -36,6 +36,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
func2 = _func2
-- 创建立绘
local heroTData = {}
local toward=0
if heroTId > 0 then
--如果有皮肤读取皮肤表里面的数据没有读取hero表
local data = nil
@ -43,6 +44,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
data = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId)
else
data= ConfigManager.GetConfigData(ConfigName.HeroConfig,heroTId)
toward=data.Toward
end
heroTData.Live = GetResourcePath(data.Live)
heroTData.Scale = data.Scale
@ -64,6 +66,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
this.liveName = heroTData.Live
this.liveNode = poolManager:LoadLive(this.liveName, this.firstRole.transform, Vector3.one * heroTData.Scale, Vector3.New(heroTData.Position[1], heroTData.Position[2]))
this.liveNode.transform.sizeDelta = Vector2.New(10, 10)
SetHEeroLiveToward(this.liveNode,toward)
local SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic")
local idle = function()
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)

View File

@ -645,9 +645,9 @@ function this.BattleOrderChange(order)
enemyPos.localScale = Vector3.zero
enemyLivePos.localScale = Vector3.zero
local myPos = Util.GetTransform(this.PlayerPanel,i.."/root")
myPos:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan")
myPos.localScale = Vector3.one
-- local myPos = Util.GetTransform(this.PlayerPanel,tostring(i))--.."/root")
-- myPos:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan")
-- myPos.localScale = Vector3.one
end
end
@ -655,7 +655,7 @@ end
function this.OnAddRole(data)
local go
if data.camp == 0 then
local parent = Util.GetTransform(this.PlayerPanel,data.position.."/root")
local parent = Util.GetTransform(this.PlayerPanel,tostring(data.position))--.."/root")
go = BattlePool.GetItem(parent, BATTLE_POOL_TYPE.MY_ROLE)
playerHP = playerHP + data:GetRoleData(RoleDataName.Hp)
playerMaxHP = playerMaxHP + data:GetRoleData(RoleDataName.MaxHp)

View File

@ -125,7 +125,7 @@ function BuffCtrl:AddBuffEffect(buffName, isTrigger, offset)
-- node.transform.localScale = Vector3.one
node.transform:SetParent(self.owner.GameObject.transform)
node.transform.localScale = Vector3.one
node.transform.localPosition = offset and Vector3.New(offset[1], offset[2], 0) or Vector3.zero--self.GameObject.transform.localPosition
node.transform.localPosition = offset and Vector3.New(offset[1], offset[2] + 50, 0) or Vector3.New(0, 50, 0)--self.GameObject.transform.localPosition
self.BuffEffectList[buffName].node = node
end
self.BuffEffectList[buffName].node:SetActive(false)

View File

@ -69,6 +69,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId)
self.nameText.text = SubString2(self.readingName,9)
self.level.text = role:GetRoleData(RoleDataName.Level)
self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
LogError("加战斗ID::::"..tostring(self.enemysId))
if self.enemysId and self.enemysId==1017 then
Util.GetGameObject(go, "Name"):GetComponent("RectTransform").anchoredPosition=Vector3.New(20,-180,0)
Util.GetGameObject(go, "Pro"):GetComponent("RectTransform").anchoredPosition=Vector3.New(-77,-180,0)
@ -313,7 +314,7 @@ function EnemyView:DoScale(scale, dur, func)
end
--local liveScale = self.role.position <= 3 and 0.6 or 0.5
local liveScale=0.6
self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur)
-- self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur)
end

View File

@ -106,7 +106,6 @@ function PlayerView:onCreate(go, role, position, root)
self.RoleLiveGOTran.sizeDelta = Vector2.New(1000, 1000)
self.RoleLiveGOGraphic = self.RoleLiveGO:GetComponent("SkeletonGraphic")
self.RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
--self.RootPanel.PlayerPanel, "live_"..position
self.RoleLiveGO:SetActive(true)
-- 卡牌立绘显示
@ -162,9 +161,9 @@ function PlayerView:onCreate(go, role, position, root)
self.rageText.text = ""
self.lvHpObj=Util.GetGameObject(go, "lvObj")
if position<=3 then
self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,385,0)
self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,469,0)
else
self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,-100,0)
self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,0,0)
end
-- 伤害文字显示
self.LastBuffFloatingTime = Time.realtimeSinceStartup
@ -326,7 +325,7 @@ function PlayerView:DoScale(scale, dur, func)
end
--local liveScale = self.role.position <= 3 and 0.6 or 0.5
local liveScale = 0.6
self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur)
-- self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur)
end
--角色被放逐

View File

@ -182,6 +182,7 @@ function TimeLimitUpHero:RefreshHeroData()
end
lastLiveName=GetResourcePath(curConfig.Live)
heroLiveObj=HeroManager.LoadHerolive1(curConfig,self.heroPar)
SetHEeroLiveToward(heroLiveObj,curConfig.Toward)
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId)
local totalTimes = 0
for i = 1, #wishConfig.UpList do

View File

@ -520,6 +520,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
local scale = roleConfig.play_liveScale
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
SetHEeroLiveToward(live,heroData.heroConfig.Toward)
live.transform.localScale = Vector3.one
live.transform.localPosition = Vector3.zero

View File

@ -657,6 +657,7 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...)
Util.GetGameObject(_go.transform, "card/name"):GetComponent("Text").text = GetLanguageStrById(heroData.ReadingName)
Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Painting))
SetHEeroLiveToward(Util.GetGameObject(_go.transform, "card/icon"),heroData.Toward)
Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
Util.GetGameObject(_go.transform, "card/heroStage"):SetActive(false)
local starGrid = Util.GetGameObject(_go.transform, "star")

View File

@ -402,6 +402,7 @@ function HeroLikeAbilityPanel:LoadHerolive1(_heroData, _objPoint)
local icon = GetResourcePath(_heroData.Live)
local testLive = poolManager:LoadLive(GetResourcePath(_heroData.Live), _objPoint.transform,
Vector3.one * _heroData.Scale, Vector3.New(_heroData.Position[1], _heroData.Position[2], 0))
SetHEeroLiveToward(testLive,_heroData.Toward)
local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic")
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle
@ -443,7 +444,8 @@ function HeroLikeAbilityPanel:RightBtnOnClick()
self.leftLiveObj = self.curLiveObj
self.curLiveObj = self.rightLiveObj
self.rightLiveObj = HeroManager.LoadHerolive1(rightHeroData,self.rightObj)
self.rightLiveObj = HeroManager.LoadHerolive1(rightHeroData,self.rightObj)
SetHEeroLiveToward(self.rightLiveObj,rightHeroData.Toward)
local SkeletonGraphic = self.curLiveObj:GetComponent("SkeletonGraphic")
SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
if self.curLiveObj then
@ -492,7 +494,8 @@ function HeroLikeAbilityPanel:LeftBtnOnClick()
self.rightLiveObj = self.curLiveObj
self.curLiveObj = self.leftLiveObj
self.leftLiveObj = HeroManager.LoadHerolive1(leftHeroData,self.leftObj)
self.leftLiveObj = HeroManager.LoadHerolive1(leftHeroData,self.leftObj)
SetHEeroLiveToward(self.leftLiveObj,rightHeroData.Toward)
local SkeletonGraphic = self.curLiveObj:GetComponent("SkeletonGraphic")
SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
if self.curLiveObj then

View File

@ -231,6 +231,7 @@ function LikeAbilityPanel:SingleHeroDataShow(_go,data)
local bg = Util.GetGameObject(card, "bg")
local icon = Util.GetGameObject(card, "icon"):GetComponent("Image")
icon.sprite = self.spLoader:LoadSprite(GetResourcePath(data.Painting))
SetHEeroLiveToward(icon.gameObject,data.Toward)
SetHeroBg(self.spLoader,card ,bg ,data.Star,data.Quality)
local pro = Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image")
pro.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.PropertyName))

View File

@ -123,6 +123,7 @@ function ExChangePage:ExChangeShow()
self.liveName = GetResourcePath(self.heroConfig.Live)
self.liveNode = poolManager:LoadLive(self.liveName, self.live2dRoot.transform,
Vector3.one * exChangeConFig.HeroShowScale, Vector3.New(exChangeConFig.HeroShowLocation[1], exChangeConFig.HeroShowLocation[2],0))
SetHEeroLiveToward(self.liveNode,self.heroConfig.Toward)
self.proImage.sprite =self.spLoader:LoadSprite(GetProStrImageByProNum(self.heroConfig.PropertyName))
self.heroName.text =GetLanguageStrById(self.heroConfig.ReadingName)
SetTextVerTial(self.heroName,Vector3.New(129.9,3.7,0))

View File

@ -150,6 +150,7 @@ function RecruitPanelNew:OnShow(sortingOrder)
local name = GetResourcePath(heroConfig.Live)
self.liveNode = poolManager:LoadLive(name, self.root.transform, Vector3.one *heroConfig.Scale, Vector3.New(heroConfig.Position[1], heroConfig.Position[2], 0))
self.liveNode.name = name
SetHEeroLiveToward(self.liveNode,heroConfig.Toward)
local SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic")
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle

View File

@ -413,6 +413,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData)
--TODO:动态加载立绘
testLiveGO = poolManager:LoadLive(GetResourcePath(heroStaticData.Live), self.live2dRoot.transform,
Vector3.one * heroStaticData.Scale, Vector3.New(heroStaticData.Position[1],heroStaticData.Position[2],0))
SetHEeroLiveToward(testLiveGO,heroStaticData.Toward)
local SkeletonGraphic = testLiveGO:GetComponent("SkeletonGraphic")
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle

View File

@ -364,9 +364,11 @@ function this:RightBtnOnClick()
this.curLiveObj = nil
end
Util.ClearChild(this.leftObj.transform)
this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj)
this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj)
SetHEeroLiveToward(this.leftLiveObj,leftHeroData.heroConfig.Toward)
this.curLiveObj = this.rightLiveObj
this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj)
this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj)
SetHEeroLiveToward(this.rightLiveObj,rightHeroData.heroConfig.Toward)
local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic")
SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
this.rightBtn:GetComponent("Button").enabled = true
@ -408,9 +410,11 @@ function this:LeftBtnOnClick()
this.curLiveObj = nil
end
Util.ClearChild(this.rightObj.transform)
this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj)
this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj)
SetHEeroLiveToward(this.rightLiveObj,rightHeroData.heroConfig.Toward)
this.curLiveObj = this.leftLiveObj
this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj)
this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj)
SetHEeroLiveToward(this.leftLiveObj,leftHeroData.heroConfig.Toward)
local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic")
SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
this.leftBtn:GetComponent("Button").enabled = true
@ -712,6 +716,7 @@ function this:ChangeCurentHeroSkinLive(herodata)
end
if herodata then
this.curLiveObj=HeroManager.LoadHerolive1(herodata,this.curObj)
SetHEeroLiveToward(this.curLiveObj,herodata.heroConfig.Toward)
-- 临时保存皮肤位置
curHeroPosition = herodata.Position
else
@ -727,9 +732,11 @@ function this:ChangeCurentHeroSkinLive(herodata)
end
this.force.text = WarPower
this.curLiveObj=HeroManager.LoadHerolive(curHeroData,this.curObj)
SetHEeroLiveToward(this.curLiveObj,curHeroData.heroConfig.Toward)
-- 清空临时保存的皮肤位置
curHeroPosition = nil
end
this:SetDragView()
end

View File

@ -241,6 +241,7 @@ function this.SingleHeroDataShow(_go,_heroData)
Util.GetGameObject(_go.transform, "card/name"):GetComponent("Text").text = GetLanguageStrById(heroData.heroConfig.ReadingName)
Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.painting)
SetHEeroLiveToward(Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image"),heroData.heroConfig.Toward)
-- Util.GetGameObject(_go.transform, "card/pos/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])