Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
e99f8c285f
Binary file not shown.
After Width: | Height: | Size: 1.9 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c2658e130a761bc4089e86824750a4dc
|
||||
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: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: d9d898e1c8155524a9af734273c90669
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: GodSoulAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0add84481daf0ef4d82ae14e3b07aa55
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -632,7 +632,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -874,7 +874,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -8171,7 +8171,6 @@ GameObject:
|
|||
- component: {fileID: 7865542922754469003}
|
||||
- component: {fileID: 2504112372184753927}
|
||||
- component: {fileID: 5193286714285430077}
|
||||
- component: {fileID: 4266512214192313381}
|
||||
m_Layer: 5
|
||||
m_Name: shenhun
|
||||
m_TagString: Untagged
|
||||
|
@ -8236,35 +8235,6 @@ MonoBehaviour:
|
|||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!114 &4266512214192313381
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2232382934175097675}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2306151611164505418
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8495,7 +8465,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -19868,7 +19838,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -19962,7 +19932,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -22249,6 +22219,7 @@ GameObject:
|
|||
- component: {fileID: 3721606396940629678}
|
||||
- component: {fileID: 6334925928787415273}
|
||||
- component: {fileID: 4935696372960233156}
|
||||
- component: {fileID: 1754060725223895464}
|
||||
m_Layer: 5
|
||||
m_Name: RoleInfo1
|
||||
m_TagString: Untagged
|
||||
|
@ -22313,6 +22284,35 @@ MonoBehaviour:
|
|||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!114 &1754060725223895464
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8836010557236507833}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &8850260071372032392
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -22697,7 +22697,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -4901,6 +4901,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 224999014420418594}
|
||||
- component: {fileID: 222881125231045872}
|
||||
- component: {fileID: 965078877586962259}
|
||||
m_Layer: 5
|
||||
m_Name: bg
|
||||
m_TagString: Untagged
|
||||
|
@ -4939,6 +4940,35 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1174415740829578}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &965078877586962259
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1174415740829578}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1220597380626970
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -104,7 +104,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1160826661265422651}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -484,7 +484,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1160826661265422651}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -2395,7 +2395,7 @@ Animator:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6002405682149771119}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2}
|
||||
m_CullingMode: 0
|
||||
|
@ -2434,7 +2434,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -2474,7 +2474,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1160826661265422651}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -2855,6 +2855,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 3599049602624176386}
|
||||
- {fileID: 8933159185613508280}
|
||||
- {fileID: 9059419964941814418}
|
||||
- {fileID: 3745660327078023259}
|
||||
|
@ -2864,7 +2865,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -4.8, y: 0}
|
||||
m_AnchoredPosition: {x: 5, y: 0}
|
||||
m_SizeDelta: {x: 929.6, y: 175.1}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &6025562427588020142
|
||||
|
@ -3419,7 +3420,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 9179485860400109938}
|
||||
m_Father: {fileID: 1160826661265422651}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -3632,11 +3633,6 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 8133986337164326410}
|
||||
m_Modifications:
|
||||
- target: {fileID: 8073956589681315700, guid: 9e34ca2105307f24b96ade2cbf305e62,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: fx_shenhun
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2033830630954937158, guid: 9e34ca2105307f24b96ade2cbf305e62,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
@ -3742,6 +3738,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8073956589681315700, guid: 9e34ca2105307f24b96ade2cbf305e62,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: fx_shenhun
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9e34ca2105307f24b96ade2cbf305e62, type: 3}
|
||||
--- !u!224 &178265486883988764 stripped
|
||||
|
@ -3750,3 +3751,78 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2179968353669353050}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &4406935478022353509
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1160826661265422651}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1446842028934486629, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: fx_zhuangbeijiemian2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0add84481daf0ef4d82ae14e3b07aa55, type: 3}
|
||||
--- !u!4 &3599049602624176386 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4406935478022353509}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -295,7 +295,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.00004492931}
|
||||
m_AnchoredPosition: {x: 0, y: -0.0000008518533}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &7575507291051525301
|
||||
|
@ -922,9 +922,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7723528773779627565}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 540.00006, y: -919.80005}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 35}
|
||||
m_SizeDelta: {x: 750, y: 906.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5994138449505195560
|
||||
|
|
|
@ -1,5 +1,182 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &417073253
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 417073254}
|
||||
- component: {fileID: 417073257}
|
||||
- component: {fileID: 417073256}
|
||||
- component: {fileID: 417073255}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &417073254
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 417073253}
|
||||
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: 1730522388}
|
||||
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.000014263172, y: 0.000044589866}
|
||||
m_SizeDelta: {x: 379.2, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &417073257
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 417073253}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &417073256
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 417073253}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 1, b: 0.4, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 42
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &417073255
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 417073253}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &1730522387
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1730522388}
|
||||
- component: {fileID: 1730522390}
|
||||
- component: {fileID: 1730522389}
|
||||
m_Layer: 5
|
||||
m_Name: Scroll
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1730522388
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1730522387}
|
||||
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:
|
||||
- {fileID: 417073254}
|
||||
m_Father: {fileID: 7117605566439973675}
|
||||
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}
|
||||
m_AnchoredPosition: {x: 0, y: -2.8999176}
|
||||
m_SizeDelta: {x: 379.2, y: 256.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1730522390
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1730522387}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Content: {fileID: 417073254}
|
||||
m_Horizontal: 0
|
||||
m_Vertical: 1
|
||||
m_MovementType: 1
|
||||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_Viewport: {fileID: 0}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 0}
|
||||
m_HorizontalScrollbarVisibility: 2
|
||||
m_VerticalScrollbarVisibility: 2
|
||||
m_HorizontalScrollbarSpacing: -3
|
||||
m_VerticalScrollbarSpacing: -3
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &1730522389
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1730522387}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &68800249841692746
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5435,7 +5612,7 @@ ParticleSystem:
|
|||
--- !u!199 &3447803802487261251
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -10200,7 +10377,7 @@ ParticleSystem:
|
|||
--- !u!199 &3448436361607758249
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -10276,7 +10453,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4492416899189015336
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -10311,7 +10488,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3463041959843326024}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
|
@ -15324,7 +15501,7 @@ ParticleSystem:
|
|||
--- !u!199 &4141603992395181126
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -20080,7 +20257,7 @@ ParticleSystem:
|
|||
--- !u!199 &4142096904690902444
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -20177,7 +20354,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 104.63, y: -26.8}
|
||||
m_AnchoredPosition: {x: 104.630005, y: -26.800003}
|
||||
m_SizeDelta: {x: 209.26, y: 53.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5105460874341393129
|
||||
|
@ -20652,6 +20829,7 @@ RectTransform:
|
|||
- {fileID: 8982201631689377852}
|
||||
- {fileID: 1358314236051475038}
|
||||
- {fileID: 4492416899189015336}
|
||||
- {fileID: 1730522388}
|
||||
m_Father: {fileID: 4147245335766002681}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -25461,7 +25639,7 @@ ParticleSystem:
|
|||
--- !u!199 &8150055608921953722
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -30300,7 +30478,7 @@ ParticleSystem:
|
|||
--- !u!199 &8150093881506533526
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -34908,7 +35086,7 @@ ParticleSystem:
|
|||
--- !u!199 &8149844058021750556
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -40067,7 +40245,7 @@ ParticleSystem:
|
|||
--- !u!199 &8150313071393215758
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -44702,7 +44880,7 @@ ParticleSystem:
|
|||
--- !u!199 &8149659266324971368
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -49494,7 +49672,7 @@ ParticleSystem:
|
|||
--- !u!199 &8149944050700344892
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -54250,7 +54428,7 @@ ParticleSystem:
|
|||
--- !u!199 &8150391816981997660
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -58948,7 +59126,7 @@ ParticleSystem:
|
|||
--- !u!199 &8149946920513474104
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -309,7 +309,7 @@ MonoBehaviour:
|
|||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 3
|
||||
m_ChildAlignment: 6
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
|
|
|
@ -1078,6 +1078,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 224669665164019098}
|
||||
- component: {fileID: 5492817785588821158}
|
||||
m_Layer: 0
|
||||
m_Name: scroll
|
||||
m_TagString: Untagged
|
||||
|
@ -1104,6 +1105,14 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 7.5000114, y: -36.800003}
|
||||
m_SizeDelta: {x: 920, y: 1189.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5492817785588821158
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1571024332592318}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1787199283794164
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -1,35 +1,36 @@
|
|||
require("Base/BasePanel")
|
||||
DropGetSSRHeroShopPanel = Inherit(BasePanel)
|
||||
local heroConfigData = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||
local passiveSkillConfig=ConfigManager.GetConfig(ConfigName.PassiveSkillConfig)
|
||||
local passiveSkillLogicConfig=ConfigManager.GetConfig(ConfigName.PassiveSkillLogicConfig)
|
||||
local heroRankupConfig=ConfigManager.GetConfig(ConfigName.HeroRankupConfig)
|
||||
local heroBackData = {}
|
||||
local callBack
|
||||
local orginLayer
|
||||
--初始化组件(用于子类重写)
|
||||
function DropGetSSRHeroShopPanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
|
||||
orginLayer = 0
|
||||
self.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")
|
||||
self.bg = Util.GetGameObject(self.gameObject, "bg")
|
||||
self.bg2 = Util.GetGameObject(self.gameObject, "bg2")
|
||||
screenAdapte(self.bg2)
|
||||
self.heroName = Util.GetGameObject(self.transform, "rolePanel/rolePanel1/nameAndPossLayout/heroName"):GetComponent("Text")
|
||||
--self.profession = Util.GetGameObject(self.transform, "rolePanel/rolePanel1/nameAndPossLayout/posImage/posImage/posImage"):GetComponent("Image")
|
||||
Util.GetGameObject(self.transform, "rolePanel/rolePanel1/nameAndPossLayout/posImage"):SetActive(false)
|
||||
self.proImage = Util.GetGameObject(self.transform, "rolePanel/rolePanel1/nameAndPossLayout/proImage/proImage"):GetComponent("Image")
|
||||
self.starGrid = Util.GetGameObject(self.transform, "rolePanel/rolePanel1/sartAndLvLayout")
|
||||
self.sureBtn = Util.GetGameObject(self.transform, "sureBtn")
|
||||
--self.dragView = SubUIManager.Open(SubUIConfig.DragView, self.gameObject.transform)
|
||||
--self.dragView.transform:SetSiblingIndex(1)
|
||||
self.UI_Effect_chouka = Util.GetGameObject(self.transform, "bg/UI_Effect_chouka")
|
||||
--self.quality=Util.GetGameObject(self.transform,"rolePanel/rolePanel1/nameAndPossLayout/quality/quality"):GetComponent("Image")
|
||||
--self.qualityImage=Util.GetGameObject(self.transform,"quality"):GetComponent("Image")
|
||||
--self.quality=Util.GetGameObject(self.transform,"quality/qualityText")
|
||||
Util.GetGameObject(self.transform,"quality"):SetActive(false)
|
||||
self.doubleQuality=Util.GetGameObject(self.transform,"quality/qualityDoubleText")
|
||||
self.posImage=Util.GetGameObject(self.transform,"Pos/PosImage"):GetComponent("Image")
|
||||
self.pos = Util.GetGameObject(self.transform,"Pos")
|
||||
self.posText=Util.GetGameObject(self.pos ,"PosText"):GetComponent("Text")
|
||||
|
||||
|
||||
self.sureBtn = Util.GetGameObject(self.transform, "sureBtn")
|
||||
self.rolePanel = Util.GetGameObject(self.transform, "rolePanel")
|
||||
self.heroName = Util.GetGameObject(self.transform, "rolePanel/Panel/name/heroName"):GetComponent("Text")
|
||||
self.proImage = Util.GetGameObject(self.transform, "rolePanel/Panel/name/proImage/proImage/proImage"):GetComponent("Image")
|
||||
self.starGrid = Util.GetGameObject(self.transform, "rolePanel/Panel/star")
|
||||
self.posImage=Util.GetGameObject(self.transform,"rolePanel/Pos/PosImage"):GetComponent("Image")
|
||||
self.posText=Util.GetGameObject(self.transform,"rolePanel/Pos/PosText"):GetComponent("Text")
|
||||
self.info=Util.GetGameObject(self.gameObject,"rolePanel/Panel/Info")
|
||||
self.infoTitleBg=Util.GetGameObject(self.info,"TitleBg")
|
||||
self.infoTitle=Util.GetGameObject(self.infoTitleBg,"Title"):GetComponent("Text")
|
||||
self.infoBody=Util.GetGameObject(self.info,"BodyBg/Viewport/Body"):GetComponent("Text")
|
||||
self.infoBodyGo=Util.GetGameObject(self.info,"BodyBg")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -38,13 +39,6 @@ function DropGetSSRHeroShopPanel:BindEvent()
|
|||
Util.AddClick(self.sureBtn, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
--Util.AddClick(this.dragView.gameObject, function ()
|
||||
-- local testLive= Util.GetGameObject(this.live2dRoot, "testLive")
|
||||
-- if testLive then
|
||||
-- local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic")
|
||||
-- SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
|
||||
-- end
|
||||
--end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
@ -67,10 +61,9 @@ function DropGetSSRHeroShopPanel:OnOpen(_heroBackData,func)
|
|||
end
|
||||
|
||||
function DropGetSSRHeroShopPanel:OnSortingOrderChange()
|
||||
|
||||
Util.AddParticleSortLayer(self.bg, self.sortingOrder - orginLayer)
|
||||
self.live2dRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder + 10
|
||||
Util.GetGameObject(self.transform,"Pos"):GetComponent("Canvas").sortingOrder = self.sortingOrder + 20
|
||||
self.rolePanel:GetComponent("Canvas").sortingOrder = self.sortingOrder + 100
|
||||
orginLayer = self.sortingOrder
|
||||
end
|
||||
|
||||
|
@ -90,21 +83,62 @@ function DropGetSSRHeroShopPanel:OnShow()
|
|||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle
|
||||
end)
|
||||
|
||||
--self.dragView:SetDragGO(testLiveGO)
|
||||
self.posImage.sprite=self.spLoader:LoadSprite(GetHeroPosStr(heroStaticData.Profession))
|
||||
self.posText.text=GetLanguageStrById(heroStaticData.HeroLocation)
|
||||
SetTextVerTial(self.posText.transform,Vector3.New(67.01,0.3,0),"MiddleLeft")
|
||||
local starSize = Vector2.New(60,60)
|
||||
SetHeroStars(self.spLoader, self.starGrid, heroBackData.star,2,starSize,-10,Vector2.New(0.5,0.5))
|
||||
self.infoTitle.text=GetLanguageStrById(heroStaticData.HeroLocationDesc1)
|
||||
SetHeroStars(self.spLoader, self.starGrid, heroStaticData.Star,1,Vector2.New(52,52),-2,Vector2.New(0.5,0.5))
|
||||
-- self.profession.sprite = self.spLoader:LoadSprite(GetJobSpriteStrByJobNum(heroStaticData.Profession))
|
||||
self.proImage.sprite =self.spLoader:LoadSprite(GetProStrImageByProNum(heroStaticData.PropertyName))
|
||||
self.heroName.text =GetLanguageStrById(heroStaticData.ReadingName)
|
||||
--self.quality.sprite=self.spLoader:LoadSprite(GetQualityIconByQualityNumer(heroStaticData.Natural))
|
||||
--self.qualityImage.sprite=GetQuantityImage(self.spLoader, heroStaticData.Natural)
|
||||
--self.quality:SetActive(heroStaticData.Natural < 10)
|
||||
--self.doubleQuality:SetActive(heroStaticData.Natural >= 10)
|
||||
--self.quality:GetComponent("Text").text = heroStaticData.Natural
|
||||
--self.doubleQuality:GetComponent("Text").text = heroStaticData.Natural
|
||||
self.heroName.text =GetLanguageStrById(heroStaticData.ReadingName) --string.format("lv.%s", heroData.lv)
|
||||
Util.GetGameObject(self.transform,"Pos"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetHeroPosBgStr(heroStaticData.Profession))
|
||||
self.posImage.sprite=self.spLoader:LoadSprite(GetHeroPosStr(heroStaticData.Profession))
|
||||
self.posText.text=GetLanguageStrById(heroStaticData.HeroLocation)
|
||||
SetTextVerTial(self.posText.gameObject,Vector3.New(63.76,1.5,0),"MiddleLeft")
|
||||
--指定星级开启info
|
||||
self.info:SetActive(heroStaticData.Star == 5 or heroStaticData.Star == 4)
|
||||
self.infoBodyGo:SetActive(heroStaticData.Star == 5)
|
||||
self.infoTitle.text=GetLanguageStrById(heroStaticData.HeroLocationDesc1)
|
||||
if heroStaticData.Star == 5 then
|
||||
local t={}
|
||||
local upStarSkillDataList={} --数据容器
|
||||
--获取几星激活数据
|
||||
for i = 1, #heroStaticData.OpenPassiveSkillRules do
|
||||
if heroStaticData.OpenPassiveSkillRules[i][1] == 2 then
|
||||
local passiveSkillConfig = passiveSkillConfig[heroStaticData.OpenPassiveSkillRules[i][3]]
|
||||
if passiveSkillConfig and passiveSkillLogicConfig[passiveSkillConfig.Id].Judge == 1 and string.len(passiveSkillConfig.Desc) > 1 then
|
||||
local d = {}
|
||||
d.passiveSkillConfig = passiveSkillConfig
|
||||
d.OpenPassiveSkillRules = heroStaticData.OpenPassiveSkillRules[i]
|
||||
d.titleStr = "<size=34><color=#5AC383>"..NumToSimplenessFont[heroRankupConfig[heroStaticData.OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11718]
|
||||
table.insert(upStarSkillDataList,d)
|
||||
end
|
||||
end
|
||||
end
|
||||
--数据插入t
|
||||
for j = 1, #upStarSkillDataList do
|
||||
if passiveSkillLogicConfig[upStarSkillDataList[j].passiveSkillConfig.Id].Judge == 1 then
|
||||
table.insert(t,upStarSkillDataList[j].titleStr..GetLanguageStrById(upStarSkillDataList[j].passiveSkillConfig.Desc).."\n")
|
||||
end
|
||||
end
|
||||
|
||||
--获取法宝数据
|
||||
local dTalis = ConfigManager.GetConfigData(ConfigName.HeroConfig,heroStaticData.Id).EquipTalismana--当前法宝数据 data[1]星级 data[2]法宝ID
|
||||
local dowerAllData= ConfigManager.GetAllConfigsDataByKey(ConfigName.EquipTalismana,"TalismanaId",dTalis[2])--当前法宝全部天赋数据(天赋可能为空)
|
||||
local dowerData={}--当前法宝全部技能数据(天赋不为空)
|
||||
for k=1,#dowerAllData do
|
||||
if dowerAllData[k].OpenSkillRules then
|
||||
table.insert(dowerData, dowerAllData[k])
|
||||
end
|
||||
end
|
||||
--数据插入t,保证在星数据后
|
||||
for n=1,#dowerData do
|
||||
if dowerData[n].Level==25 then
|
||||
table.insert(t,Language[11719]..GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc).."\n")
|
||||
end
|
||||
end
|
||||
local s=table.concat(t)--将表里字符串拼接
|
||||
--看这下面 是全角空格哦~
|
||||
self.infoBody.text=string.sub(s,1,-2)--去除最后\n
|
||||
end
|
||||
|
||||
PlayUIAnim(self.transform)
|
||||
end
|
||||
|
||||
|
@ -122,7 +156,6 @@ end
|
|||
--界面销毁时调用(用于子类重写)
|
||||
function DropGetSSRHeroShopPanel:OnDestroy()
|
||||
self.spLoader:Destroy()
|
||||
|
||||
end
|
||||
|
||||
return DropGetSSRHeroShopPanel
|
||||
|
|
|
@ -93,7 +93,7 @@ function RoleInfoPopup:BindEvent()
|
|||
Util.AddClick(this.ShenhunBtn,function()
|
||||
local s = function()
|
||||
local pro = {}
|
||||
local lv = GodSoulManager.GetGodSoulLv(curHeroData.dynamicId)
|
||||
local lv = curHeroData.godSoulLv
|
||||
local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0)
|
||||
|
||||
for i = 1,LengthOfTable(skillList) do
|
||||
|
@ -290,7 +290,6 @@ function this.RoleInfo1()
|
|||
this.pinjieRoot.gameObject:SetActive(false)
|
||||
this.shenhunRoot.gameObject:SetActive(true)
|
||||
for i = 1,#this.shenhunList do
|
||||
Util.SetGray(this.shenhunList[i].go,true)
|
||||
if i > star then
|
||||
this.shenhunList[i].fx_shenhun.gameObject:SetActive(false)
|
||||
this.shenhunList[i].goItem.gameObject:SetActive(true)
|
||||
|
|
|
@ -58,9 +58,9 @@ function TempPool:RecycleAll()
|
|||
end
|
||||
end
|
||||
function TempPool:Destroy()
|
||||
self.MomNode = nil
|
||||
self.NodeList = nil
|
||||
self.UsedIndex = nil
|
||||
self.MomNode = {}
|
||||
self.NodeList = {}
|
||||
self.UsedIndex = {}
|
||||
end
|
||||
|
||||
-- 按钮开闭状态改变
|
||||
|
@ -148,12 +148,6 @@ function GiveMePowerPanel:BindEvent()
|
|||
end)
|
||||
end
|
||||
|
||||
-- 初始化Tab管理器
|
||||
this.TabCtrl = TabBox.New()
|
||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||
this.TabCtrl:SetChangeTabCallBack(this.OnTabChange)
|
||||
this.TabCtrl:Init(this.tabbox, _TabData)
|
||||
|
||||
-- 初始化对象池
|
||||
TempPool:Init()
|
||||
--TempPool:Register("res1", this.resItem1)
|
||||
|
@ -590,6 +584,13 @@ function GiveMePowerPanel:OnOpen(...)
|
|||
-- 检测任务
|
||||
-- UKnowNothingToThePowerManager.CheckTask()
|
||||
--
|
||||
|
||||
-- 初始化Tab管理器
|
||||
this.TabCtrl = TabBox.New()
|
||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||
this.TabCtrl:SetChangeTabCallBack(this.OnTabChange)
|
||||
this.TabCtrl:Init(this.tabbox, _TabData)
|
||||
|
||||
if this.TabCtrl then
|
||||
this.TabCtrl:ChangeTab(1)
|
||||
end
|
||||
|
|
|
@ -25,6 +25,7 @@ function RoleGodSoulLayout:InitComponent()
|
|||
self.grid = Util.GetGameObject(self.gameObject,"bgdi/scroll/grid")
|
||||
self.gridPos = self.grid:GetComponent("RectTransform").anchoredPosition
|
||||
self.gridList = {}
|
||||
self.effectbaijin = Util.GetGameObject(self.gameObject,"bgdi/topLayout/fx_zhuangbeijiemian2")
|
||||
end
|
||||
|
||||
function RoleGodSoulLayout:OnSortingOrderChange()
|
||||
|
@ -85,6 +86,7 @@ function RoleGodSoulLayout:OnShow()
|
|||
self.gameObject:SetActive(true)
|
||||
self:SetData()
|
||||
Util.SetParticleSortLayer(self.bgdi,self.sortingOrder + 1)
|
||||
Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1)
|
||||
end
|
||||
|
||||
function RoleGodSoulLayout:SetData()
|
||||
|
@ -217,8 +219,18 @@ function RoleGodSoulLayout:UpdataSingleGod2(index)
|
|||
self.gridList[index].godLvList[i] = newObjToParent(self.godPre,self.gridList[index].godGrid)
|
||||
end
|
||||
self.gridList[index].godLvList[i].gameObject:SetActive(true)
|
||||
local shenhun = Util.GetGameObject(self.gridList[index].godLvList[i],"fx_shenhun")
|
||||
local shenhunImage = Util.GetGameObject(self.gridList[index].godLvList[i],"godItem")
|
||||
if index <= self.lv then
|
||||
shenhun.gameObject:SetActive(true)
|
||||
shenhunImage.gameObject:SetActive(false)
|
||||
else
|
||||
shenhun.gameObject:SetActive(false)
|
||||
shenhunImage.gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
self.gridList[index].add.gameObject:SetActive(true)
|
||||
self.gridList[index].addImage.gameObject:SetActive(true)
|
||||
Util.SetGray(self.gridList[index].addImage,false)
|
||||
|
|
|
@ -294,6 +294,9 @@ function this:SortHeroDatas(_heroDatas)
|
|||
if a.lv == b.lv then
|
||||
--判断战力是否相同
|
||||
if a.warPower == b.warPower then
|
||||
local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
|
||||
local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
|
||||
if aGodLv == bGodLv then
|
||||
---判断星级是否相同
|
||||
if a.star == b.star then
|
||||
--返回图鉴排序
|
||||
|
@ -301,6 +304,9 @@ function this:SortHeroDatas(_heroDatas)
|
|||
else
|
||||
return a.star > b.star
|
||||
end
|
||||
else
|
||||
return aGodLv >bGodLv
|
||||
end
|
||||
else
|
||||
return a.warPower > b.warPower
|
||||
end
|
||||
|
@ -309,6 +315,9 @@ function this:SortHeroDatas(_heroDatas)
|
|||
end
|
||||
--根据品阶排列
|
||||
elseif sortType==SortTypeConst.Natural then
|
||||
local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
|
||||
local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
|
||||
if aGodLv == bGodLv then
|
||||
--是否星级相同
|
||||
if a.star == b.star then
|
||||
--判断战力是否相同
|
||||
|
@ -326,6 +335,9 @@ function this:SortHeroDatas(_heroDatas)
|
|||
else
|
||||
return a.star > b.star
|
||||
end
|
||||
else
|
||||
return aGodLv >bGodLv
|
||||
end
|
||||
end
|
||||
else
|
||||
--一个在一个不在先返回在的+不在的
|
||||
|
|
|
@ -32,7 +32,7 @@ function TalismanUpStarSuccessPanel:InitComponent()
|
|||
|
||||
--特性提升
|
||||
self.speciality=Util.GetGameObject(self.gameObject,"Info/Panel/Speciality")
|
||||
self.specialityText=Util.GetGameObject(self.speciality,"Text"):GetComponent("Text")
|
||||
self.specialityText=Util.GetGameObject(self.speciality,"Scroll/Text"):GetComponent("Text")
|
||||
end
|
||||
|
||||
function TalismanUpStarSuccessPanel:BindEvent()
|
||||
|
@ -135,6 +135,7 @@ function TalismanUpStarSuccessPanel:ShowProAndSkillData()
|
|||
if (curLv+1)==dowerData[n].Level then
|
||||
self.speciality:SetActive(true)
|
||||
self.specialityText.text=GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc)
|
||||
self.specialityText.transform.localPosition = Vector3.New(0, -100, 0)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
|
|
@ -253,13 +253,13 @@ function this.SingleRideClickShowInfo(data,go)
|
|||
this.skillList[i].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(data.Icon[i]))
|
||||
Util.AddOnceClick(this.skillList[i].btn,function()
|
||||
this.skillDes.gameObject:SetActive(true)
|
||||
local data = {}
|
||||
data.icon = GetResourcePath(data.Icon[i])
|
||||
local data1 = {}
|
||||
data1.icon = GetResourcePath(data.Icon[i])
|
||||
local strs = string.split(data.SkillEffect,"|")
|
||||
local strDes = string.split(strs[i],"#")
|
||||
data.title = strDes[1]
|
||||
data.des = strDes[2]
|
||||
this.SetSkillDes(data)
|
||||
data1.title = strDes[1]
|
||||
data1.des = strDes[2]
|
||||
this.SetSkillDes(data1)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -167,13 +167,21 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
|
|||
local heroData=HeroManager.GetSingleHeroData(heroTid)
|
||||
self.Heros[index][hero.position].hero:SetActive(true)
|
||||
local star,starType = heroData.GetStar(1)
|
||||
SetHeroStars(self.spLoader, self.Heros[index][hero.position].starGrid, star,starType)
|
||||
local starScale = -15
|
||||
local starSize = Vector2.New(32,32)
|
||||
if starType == 3 then
|
||||
starScale = -16
|
||||
starSize = Vector2.New(0.8,-15)
|
||||
elseif starType == 2 then
|
||||
starSize = Vector2.New(48,48)
|
||||
end
|
||||
SetHeroStars(self.spLoader, self.Heros[index][hero.position].starGrid, star,starType,starSize,starScale)
|
||||
Util.SetParticleSortLayer(self.Heros[index][hero.position].starGrid,self.sortingOrder + 1)
|
||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
|
||||
allPower=allPower+heroData.warPower
|
||||
self.Heros[index][hero.position].proIconsprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
self.Heros[index][hero.position].levelText.text = heroData.lv
|
||||
self.Heros[index][hero.position].framesprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||
self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||
SetHeroIcon(self.spLoader, hero,self.Heros[index][hero.position].icon,heroConfig)
|
||||
local heroData = {}
|
||||
Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function()
|
||||
|
|
|
@ -168,6 +168,7 @@ function this.RankNodeAdapter(node, data,index)
|
|||
newHero.level=pro[1]
|
||||
newHero.heroid=hero.realId
|
||||
newHero.star=hero.star
|
||||
newHero.godSoulLv = hero.godSoulLv
|
||||
newHero.position=hero.position
|
||||
newHero.skinId=hero.skinId
|
||||
table.insert(heroTeam.team,newHero)
|
||||
|
@ -182,6 +183,7 @@ function this.RankNodeAdapter(node, data,index)
|
|||
newHero.level=pro[1]
|
||||
newHero.heroid=hero.realId
|
||||
newHero.star=hero.star
|
||||
newHero.godSoulLv = hero.godSoulLv
|
||||
newHero.position=hero.position
|
||||
newHero.skinId=hero.skinId
|
||||
table.insert(enTeam.team,newHero)
|
||||
|
|
Loading…
Reference in New Issue