神魂提交

dev_chengFeng
jiaoyangna 2021-10-27 12:50:15 +08:00
parent edcdd0e81e
commit d398c21668
35 changed files with 3255 additions and 889 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7548c6c2d59db82429cbe8500b1b83f0
guid: bee77bdec9500c3408583877168d9e41
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
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: ff17fbe97a156fd4a9eb1b0117b9b6c6
spriteID: d7bbe86c4255b7a4d9ee7c9308377602
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8c7b6b9d723205147b475652d942bc6f
guid: a16aaea4369c2bc448b8a255ec43cdd2
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
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: 437be34ba4931414298bf621fdc8d56c
spriteID: 7a80235db73c2e945b962dd212e90337
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7df540e067f2586488978c5d5afb56be
guid: cd29b6e0a96eeae40862354b3ba783c2
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
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: 2cebd7d28e26d8b4ead93030dbe00b42
spriteID: 1565d9af7e4318349beb46203ba80f71
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 05123e6e61c3e824db0161f043ecc67f
guid: 73f32603bed5a134387f30024b17eb41
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
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: 247584492bfc9754bb3df14d6699605b
spriteID: 1eac2f567be29064cae8ebabe8fd93e0
vertices: []
indices:
edges: []

View File

@ -7216,8 +7216,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 28.500002, y: 28.999989}
m_SizeDelta: {x: 51.66, y: 51.67}
m_AnchoredPosition: {x: 31.000002, y: 30.999989}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2985862884813520727
CanvasRenderer:
@ -11824,8 +11824,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 28.5, y: -29}
m_SizeDelta: {x: 57, y: 58}
m_AnchoredPosition: {x: 31, y: -31}
m_SizeDelta: {x: 62, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3366739036116014475
CanvasRenderer:
@ -17321,7 +17321,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -2295.5, y: -405.15002}
m_SizeDelta: {x: 67, y: 58}
m_SizeDelta: {x: 72, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2085220266436213419
MonoBehaviour:
@ -19349,7 +19349,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5F53\u524D\u52A0\u6210"
m_Text: "\u4E00\u952E\u653E\u5165"
--- !u!1 &6823618120496866411
GameObject:
m_ObjectHideFlags: 0
@ -22377,7 +22377,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: 67, y: -29}
m_AnchoredPosition: {x: 72, y: -31}
m_SizeDelta: {x: 0, y: 33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4579686295789554606
@ -23451,7 +23451,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5F53\u524D\u52A0\u6210"
m_Text: "\u786E\u5B9A"
--- !u!1 &8626664211375287488
GameObject:
m_ObjectHideFlags: 0

View File

@ -119,14 +119,14 @@ RectTransform:
- {fileID: 7243046732601692507}
- {fileID: 1974363042441674858}
- {fileID: 2025960690052971106}
- {fileID: 1973877883734817856}
- {fileID: 4126197808121152527}
- {fileID: 2338646928782581046}
- {fileID: 5299528613146693474}
- {fileID: 2913791122365382009}
- {fileID: 458271444932364388}
- {fileID: 165381528669676981}
- {fileID: 3260307931949129323}
- {fileID: 1973877883734817856}
- {fileID: 165381528669676981}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -259,7 +259,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 164915241442772717}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -1390,7 +1390,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 164915241442772717}
m_RootOrder: 8
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -1893,7 +1893,7 @@ RectTransform:
- {fileID: 1956582454896893773}
- {fileID: 260420168377369215}
m_Father: {fileID: 164915241442772717}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -1966,7 +1966,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 164915241442772717}
m_RootOrder: 15
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -2091,7 +2091,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 164915241442772717}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -2355,7 +2355,7 @@ RectTransform:
- {fileID: 7502473627380909813}
- {fileID: 8222799376925158843}
m_Father: {fileID: 164915241442772717}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -2498,7 +2498,7 @@ RectTransform:
m_Children:
- {fileID: 2359267268905386541}
m_Father: {fileID: 164915241442772717}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@ -2647,7 +2647,7 @@ RectTransform:
m_Children:
- {fileID: 1873213904672093763}
m_Father: {fileID: 164915241442772717}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -52,10 +52,10 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Top: -9
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_Spacing: 6
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
@ -108,7 +108,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.0000607245}
m_AnchoredPosition: {x: 0, y: 0.000030114341}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &3981280066466389833
@ -337,7 +337,7 @@ RectTransform:
m_Children:
- {fileID: 3745660327078023259}
- {fileID: 2460528647847384588}
- {fileID: 4864859122014172380}
- {fileID: 8133986337164326410}
- {fileID: 855633051782579941}
- {fileID: 7083992215520858126}
- {fileID: 8544457263562664734}
@ -695,100 +695,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &4177261655291467561
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8229228852124316161}
- component: {fileID: 4458907802769224664}
- component: {fileID: 57776715771972343}
- component: {fileID: 1981108427329497773}
m_Layer: 0
m_Name: godItem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8229228852124316161
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4177261655291467561}
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: 4864859122014172380}
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.000020345, y: 9.76}
m_SizeDelta: {x: 29.24, y: 59.52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &4458907802769224664
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4177261655291467561}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, 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!222 &57776715771972343
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4177261655291467561}
m_CullTransparentMesh: 0
--- !u!114 &1981108427329497773
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4177261655291467561}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
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 &4384212767175285194
GameObject:
m_ObjectHideFlags: 0
@ -1024,7 +930,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &5283900474873480367
--- !u!1 &6002405682149771119
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1032,55 +938,92 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4864859122014172380}
- component: {fileID: 4737436409537813172}
m_Layer: 5
m_Name: godPre
- component: {fileID: 8731575896283159449}
- component: {fileID: 4506541224064688732}
- component: {fileID: 5036203003476015620}
- component: {fileID: 3714601200071388019}
m_Layer: 0
m_Name: godItem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4864859122014172380
--- !u!224 &8731575896283159449
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5283900474873480367}
m_GameObject: {fileID: 6002405682149771119}
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: 8229228852124316161}
m_Father: {fileID: 1192127436118750043}
m_RootOrder: 2
m_Children: []
m_Father: {fileID: 8133986337164326410}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -1437.3, y: -242.2}
m_SizeDelta: {x: 40, y: 40}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000019073486, y: 9.760002}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4737436409537813172
--- !u!95 &4506541224064688732
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6002405682149771119}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, 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!222 &5036203003476015620
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6002405682149771119}
m_CullTransparentMesh: 0
--- !u!114 &3714601200071388019
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5283900474873480367}
m_GameObject: {fileID: 6002405682149771119}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: 40
m_PreferredHeight: 40
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3}
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 &6097065128053805043
GameObject:
m_ObjectHideFlags: 0
@ -1356,6 +1299,63 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u9700\u8981\uFF1A"
--- !u!1 &7666310159943617012
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8133986337164326410}
- component: {fileID: 1261939006692365050}
m_Layer: 5
m_Name: godPre
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8133986337164326410
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7666310159943617012}
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: 8731575896283159449}
m_Father: {fileID: 1192127436118750043}
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: -7118.8, y: 56.1}
m_SizeDelta: {x: 26.9, y: 67.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1261939006692365050
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7666310159943617012}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: 26.9
m_PreferredHeight: 67.2
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &7785291308332354919
GameObject:
m_ObjectHideFlags: 0

View File

@ -59028,7 +59028,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_ChildAlignment: 6
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0

View File

@ -409,11 +409,19 @@ end
--把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设
function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation)
local starSize = Vector2(35,35)
local starSize
if type == 3 then
starSize = Vector2.New(35.75,89.42)
else
starSize = Vector2(35,35)
end
if _starSize then
starSize = _starSize
end
local scale = -17.78
if type == 3 then
scale = -13.2
end
if _scale then
scale = _scale
end
@ -436,30 +444,28 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
starPre.transform:SetAsFirstSibling()
starPre:GetComponent("LayoutGroup").spacing = scale
starPre:GetComponent("RectTransform").pivot = pivot
if star < 6 then
if type and type == 3 then
for i = 1, 23 do
if i > 17 and i == star + 17 then
starPre.transform:GetChild(i - 1).gameObject:SetActive(true)
else
starPre.transform:GetChild(i - 1).gameObject:SetActive(false)
end
end
else
for i = 1, 23 do
if i <= star then
starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = spLoader:LoadSprite(GetHeroStarImage[1])
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize
if rotation then
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").rotation = Quaternion.Euler(rotation)
end
starPre.transform:GetChild(i - 1).gameObject:SetActive(true)
else
starPre.transform:GetChild(i - 1).gameObject:SetActive(false)
if star < 7 and type and type == 3 then
for i = 1, 23 do
if i > 17 and i <= star + 17 then
starPre.transform:GetChild(i - 1).gameObject:SetActive(true)
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize
else
starPre.transform:GetChild(i - 1).gameObject:SetActive(false)
end
end
elseif star < 6 then
for i = 1, 23 do
if i <= star then
starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = spLoader:LoadSprite(GetHeroStarImage[1])
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize
if rotation then
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").rotation = Quaternion.Euler(rotation)
end
starPre.transform:GetChild(i - 1).gameObject:SetActive(true)
else
starPre.transform:GetChild(i - 1).gameObject:SetActive(false)
end
end
elseif star > 5 and star < 10 then
for i = 1, 23 do
if i <= star - 5 then
@ -543,13 +549,19 @@ local star2index = {
[4] = {1, 2, 4, 5},
[5] = {1, 2, 3, 4, 5}
}
function SetCardStars(starGrid, star)
for i = 1, 15 do
function SetCardStars(starGrid, star,starType)
for i = 1, 21 do
starGrid.transform:GetChild(i - 1).gameObject:SetActive(false)
end
if star < 6 then
for _, i in ipairs(star2index[star]) do
starGrid.transform:GetChild(i - 1).gameObject:SetActive(true)
if starType == 3 then
for _, i in ipairs(star2index[star]) do
starGrid.transform:GetChild(16 + i - 1).gameObject:SetActive(true)
end
else
for _, i in ipairs(star2index[star]) do
starGrid.transform:GetChild(i - 1).gameObject:SetActive(true)
end
end
elseif star > 5 and star < 10 then
for _, i in ipairs(star2index[star-5]) do

View File

@ -470,6 +470,7 @@ TEAMSIMPLEINFO_STAR_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_POSITION_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_SKINID_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO = protobuf.Descriptor();
TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
@ -5266,11 +5267,21 @@ TEAMSIMPLEINFO_SKINID_FIELD.default_value = 0
TEAMSIMPLEINFO_SKINID_FIELD.type = 5
TEAMSIMPLEINFO_SKINID_FIELD.cpp_type = 1
TEAMSIMPLEINFO_GODSOULLV_FIELD.name = "godSoulLv"
TEAMSIMPLEINFO_GODSOULLV_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.godSoulLv"
TEAMSIMPLEINFO_GODSOULLV_FIELD.number = 7
TEAMSIMPLEINFO_GODSOULLV_FIELD.index = 6
TEAMSIMPLEINFO_GODSOULLV_FIELD.label = 1
TEAMSIMPLEINFO_GODSOULLV_FIELD.has_default_value = false
TEAMSIMPLEINFO_GODSOULLV_FIELD.default_value = 0
TEAMSIMPLEINFO_GODSOULLV_FIELD.type = 5
TEAMSIMPLEINFO_GODSOULLV_FIELD.cpp_type = 1
TEAMSIMPLEINFO.name = "TeamSimpleInfo"
TEAMSIMPLEINFO.full_name = ".rpc.protocols.TeamSimpleInfo"
TEAMSIMPLEINFO.nested_types = {}
TEAMSIMPLEINFO.enum_types = {}
TEAMSIMPLEINFO.fields = {TEAMSIMPLEINFO_HEROID_FIELD, TEAMSIMPLEINFO_HEROTID_FIELD, TEAMSIMPLEINFO_STAR_FIELD, TEAMSIMPLEINFO_LEVEL_FIELD, TEAMSIMPLEINFO_POSITION_FIELD, TEAMSIMPLEINFO_SKINID_FIELD}
TEAMSIMPLEINFO.fields = {TEAMSIMPLEINFO_HEROID_FIELD, TEAMSIMPLEINFO_HEROTID_FIELD, TEAMSIMPLEINFO_STAR_FIELD, TEAMSIMPLEINFO_LEVEL_FIELD, TEAMSIMPLEINFO_POSITION_FIELD, TEAMSIMPLEINFO_SKINID_FIELD, TEAMSIMPLEINFO_GODSOULLV_FIELD}
TEAMSIMPLEINFO.is_extendable = false
TEAMSIMPLEINFO.extensions = {}
TEAMONETEAMINFO_TEAM_FIELD.name = "team"

View File

@ -525,7 +525,8 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroData.star])
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
SetCardStars(starGrid,heroData.star)
local star,starType = heroData.GetStar()
SetCardStars(starGrid,star,starType)
if heroData.star > 9 then
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
else
@ -759,7 +760,14 @@ function this.SingleHeroDataShow(_go, _heroData)
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
pos.sprite = this.spLoader:LoadSprite(heroData.professionIcon)
local star,starType = heroData.GetStar(1)
SetHeroStars(this.spLoader, starGrid, star,starType,Vector2.New(30,30),-8)
local starSize = Vector2.New(30,30)
local starScale = -8
if starType == 3 then
starSize = Vector2.New(33.43,83.61)
starScale = -16.86
end
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
--血量显示
local curHeroHpVal = FormationManager.GetFormationHeroHp(this.curFormationIndex,_heroData.dynamicId)
yuanImage:SetActive(heroData.createtype == 1)

View File

@ -32,20 +32,37 @@ end
--绑定事件(用于子类重写)
function GeneralBigPopup_RoleGodSoulUp:BindEvent()
Util.AddClick(self.oneKeyBtn,function ()
local isenuough,enoughNums = GodSoulManager.CheckCanUpGodSoul(self.curHeroData,self.lv,self.allDatas)
local isenuough,enoughNums,enoughDatas,oldEnoughDatas = false,nil,nil,nil
self.choosedIdList = {}
for i = 1,#self.allDatas do
table.insert(self.choosedIdList,self.allDatas[i].herodata.dynamicId)
isenuough,enoughNums,enoughDatas = GodSoulManager.CheckCanUpGodSoul(self.curHeroData,self.lv,self.choosedIdList)
if isenuough then
self:RefreshCostItemNums()
self:RefreshItemDatas()
break
else
if not oldEnoughDatas then
oldEnoughDatas = enoughDatas
else
local ismove = true
for k,v in pairs(oldEnoughDatas) do
if v ~= enoughDatas[k] then
ismove = false
break
end
end
if ismove then
table.remove(self.choosedIdList,#self.choosedIdList)
end
oldEnoughDatas = enoughDatas
end
end
end
if not isenuough then
PopupTipPanel.ShowTip("无法满足激活条件!")
return
end
for i = 1,#self.allDatas do
self.choosedIdList = {}
table.insert(self.choosedIdList,self.allDatas[i].herodata.dynamicId)
isenuough,enoughNums = GodSoulManager.CheckCanUpGodSoul(self.curHeroData,self.lv,self.choosedIdList)
if isenuough then
self:RefreshCostItemNums()
break
end
end
end)
Util.AddClick(self.sureBtn,function()
local isSave = false
@ -154,7 +171,13 @@ function GeneralBigPopup_RoleGodSoulUp:SetSingleData(index,go,heroData)
self.itemlist[index].pos.sprite = self.spLoader:LoadSprite(self.itemlist[index].data.professionIcon)
local star,starType = self.itemlist[index].data.GetStar(1)
SetHeroStars(self.spLoader, self.itemlist[index].starGrid, star,starType,Vector2.New(30,30),-8)
local starSize = Vector2.New(30,30)
local starScale = -8
if starType == 3 then
starSize = Vector2.New(33.43,83.61)
starScale = -16.86
end
SetHeroStars(self.spLoader, self.itemlist[index].starGrid, star,starType,starSize,starScale)
self.itemlist[index].select.gameObject:SetActive(false)
self.itemlist[index].mask.gameObject:SetActive(false)

View File

@ -33,12 +33,12 @@ function this.InitializeTableData()
local config = heroRankupGroup[v.Soul[i][3]]
if config.Issame == 1 then
data.id = v.Id
data.property = v.PropertyName
data.profession = v.Profession
data.property = 0
data.profession = 0
elseif config.IsId > 0 then
data.id = config.IsId
data.property = heroConfig[config.IsId].PropertyName
data.profession = heroConfig[config.IsId].Profession
data.property = 0
data.profession = 0
else
data.id = 0
if config.IsSameClan == 1 then
@ -304,43 +304,58 @@ function this.CheckCanUpGodSoul(curHeroData,lv,datas)
end
end
local godData = this.GetGodSoulDataByLv(curHeroData.heroConfig.Id,lv)
local enoughData = {}
local enoughData = {} --每个条件满足的数量
local enoughDatas = {} --每个条件是否满足
for j = 1,#godData do
if not enoughData[j] then
enoughData[j] = 0
end
end
for j = 1,#godData do
if not enoughDatas[j] then
enoughDatas[j] = false
end
end
local s = function()
local isAll = true
enoughDatas = {}
for i = 1,#enoughData do
if enoughData[i] < godData[i].num then
isAll = false
return isAll,enoughData
enoughDatas[i] = false
else
enoughDatas[i] = true
end
end
return isAll,enoughData
return isAll,enoughData,enoughDatas
end
if godData then
for k,v in pairs(godDatas) do
if this.CheckExistBindHeroDataByDid(curHeroData.dynamicId,v.dynamicId) > 0 then
for k,v in pairs(godDatas) do
local isChoosed = this.CheckExistBindHeroDataByDid(curHeroData.dynamicId,v.dynamicId)
if isChoosed and isChoosed ~= lv then
else
for j = 1,#godData do
if (godData[j].id == 0 or v.id == godData[j].id)
and (v.star >= godData[j].star)
and (godData[j].property == 0 or v.property == godData[j].property)
and (godData[j].profession == 0 or v.profession == godData[j].profession)
and v.dynamicId ~= curHeroData.dynamicId then
enoughData[j] = enoughData[j] + 1
if v.star >= godData[j].star then
if godData[j].id > 0 and v.heroConfig.Id == godData[j].id then
enoughData[j] = enoughData[j] + 1
elseif godData[j].property > 0 and v.property == godData[j].property then
enoughData[j] = enoughData[j] + 1
elseif godData[j].profession > 0 and v.profession == godData[j].profession then
enoughData[j] = enoughData[j] + 1
elseif godData[j].property == 0 and godData[j].profession == 0 and godData[j].id == 0 then
enoughData[j] = enoughData[j] + 1
end
local isAll,enoughData,enoughDatas = s()
if isAll then
return isAll,enoughData,enoughDatas
end
end
end
if s() then
break
end
end
end
end
end
return s()
end
return false,enoughData
return false,enoughData,enoughDatas
end
function this.GetHeroGodSoulDatas(dynamicId,id,_lv)

View File

@ -3,11 +3,13 @@ HandBookHeroInfoPanel = Inherit(BasePanel)
local this = HandBookHeroInfoPanel
local tabs = {
[1] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11093], sub = SubUIConfig.HandBookRoleInfoLayout
[RoleInfoPanelIndex.qingbao] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11093], sub = SubUIConfig.HandBookRoleInfoLayout
},
[2] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11095], sub = SubUIConfig.RoleStoryLayout
[RoleInfoPanelIndex.shenhun] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = "神魂",sub = SubUIConfig.RoleGodSoulLayout
},
[3] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11816], sub = SubUIConfig.HandBookRoleSkinPanel
[RoleInfoPanelIndex.chuanshuo] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11095], sub = SubUIConfig.RoleStoryLayout
},
[RoleInfoPanelIndex.pifu] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11816], sub = SubUIConfig.HandBookRoleSkinPanel
},
}
@ -112,7 +114,7 @@ function HandBookHeroInfoPanel:OnOpen(...)
if(temp[3]) then
_curStar=temp[3]
end
_CurPageIndex = 1
_CurPageIndex = RoleInfoPanelIndex.qingbao
heroDatas = PlayerManager.heroHandBookListData[_curStar]
for i = 1, #heroDatas do
if heroConFigData.Id == heroDatas[i].Id then
@ -229,7 +231,7 @@ function this:UpdateHeroInfoData()
this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroConFigData.Profession))
this.posText.text=GetLanguageStrById(heroConFigData.HeroLocation)
SetTextVerTial(self.posText,Vector3.New(72,0,0))
if _CurPageIndex == 3 then
if _CurPageIndex == RoleInfoPanelIndex.pifu then
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id)
local HeoSkin = {}
for i = 1 ,#configs do
@ -238,7 +240,11 @@ function this:UpdateHeroInfoData()
end
end
if LengthOfTable(HeoSkin) < 2 then
_CurPageIndex = 1
_CurPageIndex = RoleInfoPanelIndex.qingbao
end
elseif _CurPageIndex == RoleInfoPanelIndex.shenhun then
if heroConFigData.IsSoulOpen == 0 then
_CurPageIndex = RoleInfoPanelIndex.qingbao
end
end
self:SetPanelBg(heroConFigData)
@ -259,35 +265,43 @@ function HandBookHeroInfoPanel:UpdateBtnList()
for k,v in pairs(tabsList) do
tabsList[k].gameObject:SetActive(false)
end
for k,v in ipairs(tabs) do
if not tabsList[k] then
tabsList[k] = newObjToParent(this.btnPre,this.btnList)
end
if k == 3 then
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id)
local HeoSkin = {}
for i = 1 ,#configs do
if not HeoSkin[configs[i].Type] and configs[i].Show == 1 then
HeoSkin[configs[i].Type] = configs[i]
for k = 1,10 do
if tabs[k] then
if not tabsList[k] then
tabsList[k] = newObjToParent(this.btnPre,this.btnList)
end
if k == RoleInfoPanelIndex.pifu then
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id)
local HeoSkin = {}
for i = 1 ,#configs do
if not HeoSkin[configs[i].Type] and configs[i].Show == 1 then
HeoSkin[configs[i].Type] = configs[i]
end
end
end
if LengthOfTable(HeoSkin) > 1 then
if LengthOfTable(HeoSkin) > 1 then
tabsList[k].gameObject:SetActive(true)
else
tabsList[k].gameObject:SetActive(false)
end
elseif k == RoleInfoPanelIndex.shenhun then
if heroConFigData.IsSoulOpen == 0 then
tabsList[k].gameObject:SetActive(false)
else
tabsList[k].gameObject:SetActive(true)
end
else
tabsList[k].gameObject:SetActive(true)
else
tabsList[k].gameObject:SetActive(false)
end
else
tabsList[k].gameObject:SetActive(true)
local title = Util.GetGameObject(tabsList[k], "Text"):GetComponent("Text")
title.text = GetCurLanguage() == 0 and tabs[k].title or "<size=45>"..tabs[k].title.."</size>"
Util.AddOnceClick(tabsList[k],function()
if k == _CurPageIndex then
else
self:SetSelectBtn(k)
self:OnPageTabChange(k)
end
end)
end
local title = Util.GetGameObject(tabsList[k], "Text"):GetComponent("Text")
title.text = GetCurLanguage() == 0 and v.title or "<size=45>"..v.title.."</size>"
Util.AddOnceClick(tabsList[k],function()
if k == _CurPageIndex then
else
self:SetSelectBtn(k)
self:OnPageTabChange(k)
end
end)
end
end

View File

@ -6036,7 +6036,7 @@ function NetManager.HeroGodSoulBindRequest(heroId,lv,bindheros,func)
table.insert(returnData.godSoulList,singledata)
GodSoulManager.UnBindHeroDatas(heroId,lv,true)
GodSoulManager.BindHeroDatas(returnData)
Game.GlobalEvent.DispatchEvent(GameEvent.Role.UpdateSodSoulLayout)
Game.GlobalEvent:DispatchEvent(GameEvent.Role.UpdateSodSoulLayout)
if func then
func()
end

View File

@ -334,8 +334,13 @@ function this.FormationAdapter(teamInfo)
if demonId then
local heroGo = Util.GetGameObject(this.Demons[hero.position], "hero")
heroGo:SetActive(true)
LogGreen("hero.Star:"..hero.star.." hero.godsoul:"..hero.godSoulLv)
local star,starType = GetStarOrGodSoulLv(1,hero)
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType)
local starSize = Vector2.New(35,35)
if starType == 3 then
starSize = Vector2.New(35.75,89.42)
end
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType,starSize)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level

View File

@ -74,10 +74,43 @@ function RoleInfoPopup:InitComponent()
this.soulPrintInfo = Util.GetGameObject(self.transform, "Panel/Scroll View/Viewport/Content/SoulPrintInfo")
this.soulPrintGrid = Util.GetGameObject(this.soulPrintInfo, "Grid")
this.soulPrintPre=Util.GetGameObject(this.soulPrintGrid,"SoulPrintPre")
this.shenhunList = {}
this.shenhunRoot = Util.GetGameObject(this.roleInfo1,"shenhun")
for i = 1,6 do
if not this.shenhunList[i] then
this.shenhunList[i] = {}
end
this.shenhunList[i].go = Util.GetGameObject(this.shenhunRoot, "shenhunPre"..i)
LogGreen("this.shenhunList[i].go:"..tostring(this.shenhunList[i].go.name))
this.shenhunList[i].goItem = Util.GetGameObject(this.shenhunList[i].go, "godItem"):GetComponent("Animator")
end
this.ShenhunBtn = Util.GetGameObject(this.shenhunRoot,"ShenhunBtn")
end
--绑定事件(用于子类重写)
function RoleInfoPopup:BindEvent()
Util.AddClick(this.ShenhunBtn,function()
local s = function()
local pro = {}
local lv = GodSoulManager.GetGodSoulLv(curHeroData.dynamicId)
local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0)
local color = "000000"
for i = 1,6 do
if lv >= i then
color = "FF0000"
end
table.insert(pro,string.format("<color=#%s>%s</color>",color,skillList[i].skill))
end
return pro
end
local data = {}
local singData = {}
singData.title = "神魂效果"
singData.pro = s()
table.insert(data,singData)
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.WuJinShuXing,data)
end)
Util.AddClick(this.talentBtn,function()
UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
end)
@ -242,23 +275,41 @@ function this.RoleInfo1()
this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession))
this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation)
SetTextVerTial(this.posText.gameObject,Vector3.New(64,0,0),"MiddleLeft")
--品阶
local pId=0
if curHeroData.breakId~=0 then
pId= heroRankupConfig[curHeroData.breakId].Phase[2]
end
local hruConfig= ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.HeroRankupConfig,"Star",curHeroData.heroConfig.Star,"Show",1) --动态获取不同英雄最大突破等阶
for i = 1, #hruConfig do --动态生成
local item=this.pinjieList[i]
if not item then
item= newObjToParent(this.pinjiePre,this.pinjieRoot)
item.name="Pre"..i
this.pinjieList[i]=item
local star,starType = curHeroData.GetStar(1)
if starType == 3 then
this.pinjieRoot.gameObject:SetActive(false)
this.shenhunRoot.gameObject:SetActive(true)
for i = 1,#this.shenhunList do
if i > star then
Util.SetGray(this.shenhunList[i].go,true)
this.shenhunList[i].godItem.enabled = false
else
Util.SetGray(this.shenhunList[i].go,false)
this.shenhunList[i].godItem.enabled = true
end
end
else
this.shenhunRoot.gameObject:SetActive(false)
this.pinjieRoot.gameObject:SetActive(true)
--品阶
local pId=0
if curHeroData.breakId~=0 then
pId= heroRankupConfig[curHeroData.breakId].Phase[2]
end
local hruConfig= ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.HeroRankupConfig,"Star",curHeroData.heroConfig.Star,"Show",1) --动态获取不同英雄最大突破等阶
for i = 1, #hruConfig do --动态生成
local item=this.pinjieList[i]
if not item then
item= newObjToParent(this.pinjiePre,this.pinjieRoot)
item.name="Pre"..i
this.pinjieList[i]=item
end
this.pinjieList[i]:GetComponent("Image").sprite=this.spLoader:LoadSprite(i<=pId and pinjieImage[2] or pinjieImage[1])
end
for n = 1, this.pinjieRoot.transform.childCount - 1 do --超过品阶关闭显示
this.pinjieRoot.transform:GetChild(n).gameObject:SetActive(n<=#hruConfig)
end
this.pinjieList[i]:GetComponent("Image").sprite=this.spLoader:LoadSprite(i<=pId and pinjieImage[2] or pinjieImage[1])
end
for n = 1, this.pinjieRoot.transform.childCount - 1 do --超过品阶关闭显示
this.pinjieRoot.transform:GetChild(n).gameObject:SetActive(n<=#hruConfig)
end
--基础属性

View File

@ -148,7 +148,13 @@ function this.RefreshPanel()
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName))
lv.text=v.level
local star,starType = GetStarOrGodSoulLv(1,v)
SetHeroStars(this.spLoader, star, star,starType,Vector2.New(30,30),-8.21)
local starSize = Vector2.New(30,30)
local starScale = -8.21
if starType == 3 then
starSize = Vector2.New(35.75,89.42)
starScale = -10
end
SetHeroStars(this.spLoader, star, star,starType,starSize,starScale)
--血量相关
hpExp.value=v.heroHp/10000
Util.SetGray(o,v.heroHp<=0)

View File

@ -110,7 +110,13 @@ function this.SingleHeroDataShow(go,_heroData)
--Util.GetGameObject(_go.transform, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
local starGrid = Util.GetGameObject(_go.transform, "star")
local star,starType = heroData.GetStar(1)
SetHeroStars(this.spLoader, starGrid, star,starType,Vector2.New(32.5,32.5),-15)
local starSize = Vector2.New(32.5,32.5)
local starScale = -15
if starType == 3 then
starSize = Vector2.New(35.75,89.42)
starScale = -16.86
end
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
local choosed =Util.GetGameObject(_go.transform, "choosed")
local formationMask =Util.GetGameObject(_go.transform, "formationMask")
Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh")

View File

@ -144,7 +144,11 @@ function this.SingleHeroDataShow(go,_heroData)
--Util.GetGameObject(_go.transform, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
local starGrid = Util.GetGameObject(_go.transform, "star")
local star,starType = heroData.GetStar(1)
SetHeroStars(this.spLoader, starGrid, star,starType,nil,-15)
local starScale = -15
if starType == 3 then
starScale = -16.86
end
SetHeroStars(this.spLoader, starGrid, star,starType,nil,starScale)
local choosed =Util.GetGameObject(_go.transform, "choosed")
local formationMask =Util.GetGameObject(_go.transform, "formationMask")
Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh")

View File

@ -71,8 +71,14 @@ function RoleAwakeSuccessPanel:OnOpen(_curHeroData,_nextHeroUpStarId,_curHeroRan
this.LiveName = GetResourcePath(curHeroData.heroConfig.Live)
this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform,
Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0))
local star,starType = curHeroData.GetStar(1)
SetHeroStars(this.spLoader, this.starGrid, star,starType,Vector2.New(60,60),-11,Vector2.New(0.5,0.5))
local star,starType = curHeroData.GetStar(1)
local starSize = Vector2.New(60,60)
local starScale = -11
if starType == 3 then
starSize = Vector2.New(55.3,138.2)
starScale = -13
end
SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,starScale,Vector2.New(0.5,0.5))
this.profession.sprite = this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession))
this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
this.heroName.text =GetLanguageStrById(curHeroData.heroConfig.ReadingName)

View File

@ -573,7 +573,11 @@ function this.ShowHeroEquip()
this.heroIcon.sprite = this.spLoader:LoadSprite(curHeroData.painting)
this.heroProIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
local star,starType = curHeroData.GetStar(1)
SetHeroStars(this.spLoader, this.heroStarGrid, star,starType,nil,-10)
local starScale = -10
if starType == 3 then
starScale = -13.2
end
SetHeroStars(this.spLoader, this.heroStarGrid, star,starType,nil,starScale)
--装备的数据
curHeroEquipDatas = {}
for i = 1, #curHeroData.equipIdList do

View File

@ -53,8 +53,18 @@ function RoleGodSoulLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,
end
function RoleGodSoulLayout:UpdateGodList()
self.lv = GodSoulManager.GetGodSoulLv(self.curHeroData.dynamicId)
self.godDatas = GodSoulManager.GetGodSoulDataByLv(self.curHeroData.heroConfig.Id,0)
if self.curHeroData.dynamicId then
self.lv = GodSoulManager.GetGodSoulLv(self.curHeroData.dynamicId)
self.addShow = true
self.heroConfig = self.curHeroData.heroConfig
else
self.lv = 0
self.addShow = false
self.heroConfig = self.curHeroData
end
self.godDatas = GodSoulManager.GetGodSoulDataByLv(self.heroConfig.Id,0)
if not self.gridList then
self.gridList = {}
end
@ -91,61 +101,67 @@ function RoleGodSoulLayout:UpdataSingleGod(index)
end
end
--绿色
self.gridList[index].des.text = self.godDatas[index].skill --神魂效果 绿色 未激活时置灰
for i = 1,math.max(#self.gridList[index].costList,#self.godDatas[index]) do
if not self.godDatas[index][i] then
self.gridList[index].costList[i].go.gameObject:SetActive(false)
else
if not self.gridList[index].costList[i] then
self.gridList[index].costList[i] = {}
self.gridList[index].costList[i].go = newObjToParent(self.costPre,self.gridList[index].costGrid)
self.gridList[index].costList[i].frame = Util.GetGameObject(self.gridList[index].costList[i].go,"frame"):GetComponent("Image")
self.gridList[index].costList[i].icon = Util.GetGameObject(self.gridList[index].costList[i].frame.transform,"icon"):GetComponent("Image")
self.gridList[index].costList[i].num = Util.GetGameObject(self.gridList[index].costList[i].go,"num"):GetComponent("Text")
end
self.gridList[index].costList[i].go.gameObject:SetActive(true)
if index <= self.lv + 1 then
self.gridList[index].tip.text = "<color=#B5AA95>需要:</color>" --未解锁红色
self.gridList[index].costGrid.gameObject:SetActive(true)
for i = 1,math.max(#self.gridList[index].costList,#self.godDatas[index]) do
if not self.godDatas[index][i] then
self.gridList[index].costList[i].go.gameObject:SetActive(false)
else
if not self.gridList[index].costList[i] then
self.gridList[index].costList[i] = {}
self.gridList[index].costList[i].go = newObjToParent(self.costPre,self.gridList[index].costGrid)
self.gridList[index].costList[i].frame = Util.GetGameObject(self.gridList[index].costList[i].go,"frame"):GetComponent("Image")
self.gridList[index].costList[i].icon = Util.GetGameObject(self.gridList[index].costList[i].frame.transform,"icon"):GetComponent("Image")
self.gridList[index].costList[i].num = Util.GetGameObject(self.gridList[index].costList[i].go,"num"):GetComponent("Text")
end
self.gridList[index].costList[i].go.gameObject:SetActive(true)
if self.godDatas[index][i].id > 0 then
if self.godDatas[index][i].star > 10 then
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_zuanshitouxiangkuang")
else
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_hong")
end
self.gridList[index].costList[i].icon.gameObject:SetActive(true)
self.gridList[index].costList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroConfig[self.godDatas[index][i].id].Icon))
elseif self.godDatas[index][i].property > 0 then
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(PropertySmallIcon[self.godDatas[index][i].star][self.godDatas[index][i].property])
elseif self.godDatas[index][i].profession > 0 then
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(GodSoulProfession[self.godDatas[index][i].star][self.godDatas[index][i].profession])
if self.godDatas[index][i].id > 0 then
if self.godDatas[index][i].star > 10 then
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_zuanshitouxiangkuang")
else
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(StarImage[self.godDatas[index][i].star])
end
if index == self.lv + 1 then --未激活时红色,图标置灰
self.gridList[index].costList[i].num.text = string.format("<color=#FF0000>×%s</color>",self.godDatas[index][i].num)
Util.SetGray(self.gridList[index].costList[i].frame.gameObject,true)
else --激活时绿色,图标不置灰
self.gridList[index].costList[i].num.text = string.format("<color=#00FF00>×%s</color>",self.godDatas[index][i].num)
Util.SetGray(self.gridList[index].costList[i].frame.gameObject,false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_hong")
end
self.gridList[index].costList[i].icon.gameObject:SetActive(true)
self.gridList[index].costList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroConfig[self.godDatas[index][i].id].Icon))
elseif self.godDatas[index][i].property > 0 then
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(PropertySmallIcon[self.godDatas[index][i].star][self.godDatas[index][i].property])
elseif self.godDatas[index][i].profession > 0 then
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(GodSoulProfession[self.godDatas[index][i].star][self.godDatas[index][i].profession])
else
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(StarImage[self.godDatas[index][i].star])
end
if not self.addShow then
self.gridList[index].costList[i].num.text = string.format("<color=#B5AA95>×%s</color>",self.godDatas[index][i].num)
Util.SetGray(self.gridList[index].costList[i].frame.gameObject,false)
elseif index == self.lv + 1 then --未激活时红色,图标置灰
self.gridList[index].costList[i].num.text = string.format("<color=#FF0000>×%s</color>",self.godDatas[index][i].num)
Util.SetGray(self.gridList[index].costList[i].frame.gameObject,true)
else --激活时绿色,图标不置灰
self.gridList[index].costList[i].num.text = string.format("<color=#00FF00>×%s</color>",self.godDatas[index][i].num)
Util.SetGray(self.gridList[index].costList[i].frame.gameObject,false)
end
end
end
self.gridList[index].des.text = string.format("<color=#FF0000>%s</color>",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰
if not self.addShow then
self.gridList[index].tip.text = "<color=#B5AA95>需要:</color>" --未解锁红色
self.gridList[index].costGrid.gameObject:SetActive(true)
self.gridList[index].add.gameObject:SetActive(false)
Util.SetGray(self.gridList[index].godGrid,false)
Util.SetGray(self.gridList[index].des.gameObject,false)
self.gridList[index].des.text = string.format("<color=#B5AA95>%s</color>",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰
elseif index <= self.lv + 1 then
self.gridList[index].tip.text = "<color=#B5AA95>需要:</color>" --未解锁红色
self.gridList[index].costGrid.gameObject:SetActive(true)
self.gridList[index].add.gameObject:SetActive(true)
if index == self.lv + 1 then
Util.SetGray(self.gridList[index].godGrid,true) --勾魂图标 未激活时置灰
--Util.SetGray(self.gridList[index].tip.gameObject,true)
Util.SetGray(self.gridList[index].des.gameObject,true)
else
Util.SetGray(self.gridList[index].godGrid,false)
--Util.SetGray(self.gridList[index].tip.gameObject,false)
Util.SetGray(self.gridList[index].des.gameObject,false)
end
else
@ -154,7 +170,6 @@ function RoleGodSoulLayout:UpdataSingleGod(index)
--红色
self.gridList[index].tip.text = string.format("<color=#FF0000>激活%s级神魂后解锁:</color>",index - 1)
Util.SetGray(self.gridList[index].godGrid,true)
Util.SetGray(self.gridList[index].tip.gameObject,false)
Util.SetGray(self.gridList[index].des.gameObject,true)
end

View File

@ -624,7 +624,12 @@ function this:UpdateHeroInfoData()
local starSize = Vector2.New(60,60)
local star,starType = curHeroData.GetStar(2)
SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,-10,Vector2.New(0.5,0.5))
local starScale = -10
if starType == 3 then
starSize = Vector2.New(55.3,138.2)
starScale = -13.2
end
SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,starScale)--,Vector2.New(0.5,0.5))
this.posImage.sprite =this.spLoader:LoadSprite(curHeroData.professionIcon)
this.heroName.text = curHeroData.name
this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
@ -675,6 +680,7 @@ function this:UpdateHeroInfoData()
else
this.imprintBtn:SetActive(false)
end
ForceRebuildLayout(this.starGrid.transform)
end
function this:ChangeCurentHeroSkinLive(herodata)

View File

@ -252,7 +252,13 @@ function this.SingleHeroDataShow(_go,_heroData)
local starPre = Util.GetGameObject(_go.transform, "starPre")
--Util.ClearChild(starGrid.transform)
local star,starType = heroData.GetStar(1)
SetHeroStars(this.spLoader, starGrid, star,starType,Vector2(32.5,32.5),-10)
local starSize = Vector2.New(32.5,32.5)
local starScale = -10
if starType == 3 then
starSize = Vector2.New(35.75,89.42)
starScale = -13.2
end
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
--local cardBtn = Util.GetGameObject(_go.transform, "card(Clone)")
SoulPrintManager.UnLockSoulPrintPos(heroData)
local soulPrintIsOpen = table.nums(SoulPrintManager.hasUnlockPos)>=1

View File

@ -85,7 +85,11 @@ function this.OnShowSingleCardData(go,heroData)
Util.GetGameObject(formationMask.transform, "lockImage"):SetActive( heroData.lockState == 1)
local starGrid = Util.GetGameObject(go.transform, "star")
local star,starType = heroData.GetStar(1)
SetHeroStars(this.spLoader, starGrid, star,starType,nil,-15)
local starScale = -15
if starType == 3 then
starScale = -16.86
end
SetHeroStars(this.spLoader, starGrid, star,starType,nil,starScale)
local cardBtn = Util.GetGameObject(go.transform, "icon")
Util.AddOnceClick(cardBtn, function()

View File

@ -547,7 +547,11 @@ function this.SetTeamInfo(_go,teamData,type)
heroGo:SetActive(true)
Util.GetGameObject(heroGo, "starGrid").transform.localScale=Vector3.one*0.7
local star,starType = GetStarOrGodSoulLv(1,hero)
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType,nil,-15)
local starScale = -15
if starType == 3 then
starScale = -16
end
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType,nil,starScale)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid)
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level

View File

@ -62,6 +62,12 @@ function RoleItemView:OnOpen(_heroDId,_isShowHeroName,_isShowHeroHp,_hpVal,_effe
end
function RoleItemView:OnShowHeroData(effectLayer)
local star,starType = self.heroData.GetStar(1) or self.heroData.heroConfig.Star
local starSize = Vector2.New(32,32)
local starScale = -10
if starType == 3 then
starSize = Vector2.New(35.75,89.42)
starScale = -13
end
SetHeroBg(this.spLoader, Util.GetGameObject(self.gameObject, "iconMask"),self.frame,star,self.heroData.heroConfig.Quality)
self.icon.sprite = this.spLoader:LoadSprite(self.heroData.painting)
self.lv.text=self.heroData.lv
@ -71,7 +77,7 @@ function RoleItemView:OnShowHeroData(effectLayer)
self.roleEffect:SetActive(self.heroData.star >= 5)--
Util.AddParticleSortLayer(self.roleEffect, effectLayer - self.EffectOrginLayer)
self.EffectOrginLayer = effectLayer
SetHeroStars(this.spLoader, self.starGrid,star,starType,Vector2.New(32,32),-10)
SetHeroStars(this.spLoader, self.starGrid,star,starType,starSize,starScale)
self.heroNameText.text=GetLanguageStrById(self.heroData.heroConfig.ReadingName)
if self.hpVal and self.isShowHeroHp then