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

dev_chengFeng
gaoxin 2022-02-10 17:57:23 +08:00
commit 6f39aa9645
13 changed files with 21303 additions and 806 deletions

View File

@ -30,7 +30,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6157198575599046546}
- {fileID: 3745360341016640850}
- {fileID: 3456949296994544259}
- {fileID: 6296100240130870523}
m_Father: {fileID: 7301020580712938050}
@ -496,6 +496,101 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &704168234238995471
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1117330747498089113}
- component: {fileID: 4176292560204997969}
- component: {fileID: 7120593114457184631}
- component: {fileID: 1867367817867730403}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1117330747498089113
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704168234238995471}
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: 6046644362136523165}
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: -7.96, y: 0.21}
m_SizeDelta: {x: 106.51, y: 105.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4176292560204997969
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704168234238995471}
m_CullTransparentMesh: 0
--- !u!114 &7120593114457184631
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704168234238995471}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9843138, g: 0.909804, b: 0.56078434, 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: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "18\u5143"
--- !u!114 &1867367817867730403
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704168234238995471}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6862745, g: 0.4784314, b: 0.10588236, a: 0.5}
m_EffectDistance: {x: 1.5, y: -1.5}
m_UseGraphicAlpha: 1
--- !u!1 &714644459001502146
GameObject:
m_ObjectHideFlags: 0
@ -506,7 +601,8 @@ GameObject:
m_Component:
- component: {fileID: 4799306814106429235}
- component: {fileID: 4661878256046023183}
- component: {fileID: 7724174491585962220}
- component: {fileID: 570714755730235788}
- component: {fileID: 5442346987183311359}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -530,8 +626,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 39}
m_AnchoredPosition: {x: -7.96, y: 0.21}
m_SizeDelta: {x: 106.51, y: 105.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4661878256046023183
CanvasRenderer:
@ -541,7 +637,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 714644459001502146}
m_CullTransparentMesh: 0
--- !u!114 &7724174491585962220
--- !u!114 &570714755730235788
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -550,26 +646,141 @@ MonoBehaviour:
m_GameObject: {fileID: 714644459001502146}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.6901961, g: 0.65882355, b: 0.48235297, 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: 7d326efded35273479ca213776851301, 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
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "18\u5143"
--- !u!114 &5442346987183311359
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 714644459001502146}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.44705886, g: 0.3372549, b: 0.13725491, a: 0.5}
m_EffectDistance: {x: 1.5, y: -1.5}
m_UseGraphicAlpha: 1
--- !u!1 &730266691974805705
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3745360341016640850}
- component: {fileID: 8320324087515932539}
- component: {fileID: 6201493695334616405}
- component: {fileID: 9066558882436217658}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3745360341016640850
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 730266691974805705}
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: 5619197308840722705}
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: -7.96, y: 0.21}
m_SizeDelta: {x: 106.51, y: 105.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8320324087515932539
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 730266691974805705}
m_CullTransparentMesh: 0
--- !u!114 &6201493695334616405
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 730266691974805705}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6901961, g: 0.65882355, b: 0.48235297, 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: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "18\u5143"
--- !u!114 &9066558882436217658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 730266691974805705}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.44705886, g: 0.3372549, b: 0.13725491, a: 0.5}
m_EffectDistance: {x: 1.5, y: -1.5}
m_UseGraphicAlpha: 1
--- !u!1 &730860949144446631
GameObject:
m_ObjectHideFlags: 0
@ -880,6 +1091,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1213125985772751716
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5885292494882513412}
- component: {fileID: 1389884508449454462}
- component: {fileID: 250912736128292644}
- component: {fileID: 575614064578039097}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5885292494882513412
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1213125985772751716}
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: 3865777398004124759}
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: -7.96, y: 0.21}
m_SizeDelta: {x: 106.51, y: 105.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1389884508449454462
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1213125985772751716}
m_CullTransparentMesh: 0
--- !u!114 &250912736128292644
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1213125985772751716}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6901961, g: 0.65882355, b: 0.48235297, 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: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "18\u5143"
--- !u!114 &575614064578039097
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1213125985772751716}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.44705886, g: 0.3372549, b: 0.13725491, a: 0.5}
m_EffectDistance: {x: 1.5, y: -1.5}
m_UseGraphicAlpha: 1
--- !u!1 &1240416925317639214
GameObject:
m_ObjectHideFlags: 0
@ -39271,7 +39577,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1785626250951181298}
- {fileID: 5885292494882513412}
- {fileID: 3027172422762333908}
- {fileID: 3522782950735055791}
m_Father: {fileID: 7301020580712938050}
@ -39391,7 +39697,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 9012877642429734133}
- {fileID: 1117330747498089113}
m_Father: {fileID: 1827622887959451477}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -58963,80 +59269,6 @@ RectTransform:
m_AnchoredPosition: {x: 4.2, y: -272.9}
m_SizeDelta: {x: 1080.9, y: 1919.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7614315457775369332
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9012877642429734133}
- component: {fileID: 2004116907988043367}
- component: {fileID: 8669632771756880089}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9012877642429734133
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7614315457775369332}
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: 6046644362136523165}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2004116907988043367
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7614315457775369332}
m_CullTransparentMesh: 0
--- !u!114 &8669632771756880089
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7614315457775369332}
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: 38a25ea50f2918544b450a8b0c53d069, 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 &7708640474158185853
GameObject:
m_ObjectHideFlags: 0
@ -73436,80 +73668,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8125749947759857291}
m_CullTransparentMesh: 0
--- !u!1 &8249452742326429285
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1785626250951181298}
- component: {fileID: 8706785490226522164}
- component: {fileID: 9085802928117488892}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1785626250951181298
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8249452742326429285}
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: 3865777398004124759}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 77, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8706785490226522164
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8249452742326429285}
m_CullTransparentMesh: 0
--- !u!114 &9085802928117488892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8249452742326429285}
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: 9781bd16df34fe342a8e05e35c5faa83, 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 &8262412935377313249
GameObject:
m_ObjectHideFlags: 0
@ -78442,80 +78600,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8933236503346550858
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6157198575599046546}
- component: {fileID: 4903990147580067213}
- component: {fileID: 5416738527146912725}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6157198575599046546
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8933236503346550858}
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: 5619197308840722705}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 76, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4903990147580067213
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8933236503346550858}
m_CullTransparentMesh: 0
--- !u!114 &5416738527146912725
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8933236503346550858}
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: 78ef5a2e12c7b874ba187ece4e09f331, 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 &9017701672859025087
GameObject:
m_ObjectHideFlags: 0

View File

@ -15000,6 +15000,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 2
resAbNameIndex: 0
- resName: q_xinnianqiandao_rukou
extension: .png
resPathIndex: 2
resAbNameIndex: 0
- resName: q_xinnianqiandao_rukoutu
extension: .png
resPathIndex: 2
resAbNameIndex: 0
- resName: s_sanshibei_beijingren
extension: .jpg
resPathIndex: 2
@ -39012,12 +39020,16 @@ MonoBehaviour:
extension: .mat
resPathIndex: 307
resAbNameIndex: 2546
- resName: longani 1
- resName: longani 1_anim
extension: .controller
resPathIndex: 308
resAbNameIndex: 2546
- resName: longani 1_ctrl
extension: .anim
resPathIndex: 308
resAbNameIndex: 2546
- resName: longani
extension: .anim
extension: .FBX
resPathIndex: 308
resAbNameIndex: 2546
- resName: longaniduan 1
@ -39025,6 +39037,18 @@ MonoBehaviour:
resPathIndex: 308
resAbNameIndex: 2546
- resName: longaniduan
extension: .FBX
resPathIndex: 308
resAbNameIndex: 2546
- resName: longaniduan_ctrl
extension: .controller
resPathIndex: 308
resAbNameIndex: 2546
- resName: longani_anim
extension: .anim
resPathIndex: 308
resAbNameIndex: 2546
- resName: longani_ctrl
extension: .controller
resPathIndex: 308
resAbNameIndex: 2546
@ -43448,7 +43472,7 @@ MonoBehaviour:
extension: .mat
resPathIndex: 521
resAbNameIndex: 2589
- resName: dajin_effect_12
- resName: dajin_effect_12_1
extension: .mat
resPathIndex: 521
resAbNameIndex: 2589
@ -51216,6 +51240,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 634
resAbNameIndex: 2604
- resName: c_yanchen
extension: .png
resPathIndex: 634
resAbNameIndex: 2604
- resName: c_y_0013_buff
extension: .png
resPathIndex: 634
@ -52368,6 +52396,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 634
resAbNameIndex: 2604
- resName: r_tongyong_hongse0_00
extension: .png
resPathIndex: 634
resAbNameIndex: 2604
- resName: sanchajian4
extension: .png
resPathIndex: 634
@ -52732,6 +52764,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 634
resAbNameIndex: 2604
- resName: t_chengyuankuang_hong_00
extension: .png
resPathIndex: 634
resAbNameIndex: 2604
- resName: T_noise_20_png
extension: .png
resPathIndex: 634
@ -63148,6 +63184,10 @@ MonoBehaviour:
extension: .mat
resPathIndex: 825
resAbNameIndex: 3237
- resName: dajin_effect_12
extension: .mat
resPathIndex: 825
resAbNameIndex: 3237
- resName: dajin_effect_13
extension: .mat
resPathIndex: 825
@ -65728,10 +65768,6 @@ MonoBehaviour:
extension: .png
resPathIndex: 829
resAbNameIndex: 3240
- resName: c_yanchen
extension: .png
resPathIndex: 829
resAbNameIndex: 3240
- resName: dg_011
extension: .png
resPathIndex: 829
@ -66848,10 +66884,6 @@ MonoBehaviour:
extension: .png
resPathIndex: 829
resAbNameIndex: 3240
- resName: r_tongyong_hongse0_00
extension: .png
resPathIndex: 829
resAbNameIndex: 3240
- resName: r_zjm_tequanpaizi_di
extension: .png
resPathIndex: 829
@ -67236,10 +67268,6 @@ MonoBehaviour:
extension: .png
resPathIndex: 829
resAbNameIndex: 3240
- resName: t_chengyuankuang_hong_00
extension: .png
resPathIndex: 829
resAbNameIndex: 3240
- resName: T_Effect_01 (20)
extension: .png
resPathIndex: 829
@ -79640,6 +79668,7 @@ MonoBehaviour:
- lz4/atlas/compoundheroatlas.unity3d
- lz4/atlas/popupatlas.unity3d
- lz4/atlas/publicatlas.unity3d
- lz4/atlas/zhizunhaoliatlas.unity3d
- lz4/bg/z_zhihuan_ditu.unity3d
- lz4/dynamicatlas/card/t_biandui_hong.unity3d
- lz4/dynamicatlas/card/t_zhandoukuang_hong01.unity3d
@ -80598,6 +80627,7 @@ MonoBehaviour:
- lz4/atlas/publicatlas.unity3d
- lz4/atlas/tagatlas.unity3d
- lz4/atlas/tagbuttonatlas.unity3d
- lz4/atlas/zhizunhaoliatlas.unity3d
- lz4/bg/g_gonghui_jisi_ditu.unity3d
- lz4/bg/g_gonghui_renshangxiamenghei.unity3d
- lz4/bg/g_gonghui_shijuezhen_bei.unity3d
@ -80931,6 +80961,7 @@ MonoBehaviour:
- lz4/publicartres/materials.unity3d
- assetBundleName: lz4/prefabs/ui/main.unity3d
dependences:
- lz4/atlas/activityaltas.unity3d
- lz4/atlas/commonatlas.unity3d
- lz4/atlas/jumpserver.unity3d
- lz4/atlas/mainatlas.unity3d

View File

@ -556,6 +556,24 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer)
end
end
function GetPassiveByMaxStar(heroConfig,list)
--local OpenPassiveSkillRules = list
local heroRankUp=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",heroConfig.MaxRank)
if not heroRankUp then
list=heroConfig.OpenPassiveSkillRules
end
local aaa={}
if list then
for i = 1,#list do
if list[i][2]<=heroRankUp.Id then
table.insert(aaa,list[i])
end
end
end
return aaa
end
--把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设
function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation)

View File

@ -14,6 +14,8 @@ local missionIndex = {
[198] = {selectIma = "r_mrcz_198_zh",selectImaRMB = "r_mrcz_198_zh",defaultIma = "r_mrcz_19801_zh",defaultImaRMB = "r_mrcz_19801_zh"},
[328] = {selectIma = "r_mrcz_328_zh",selectImaRMB = "r_mrcz_328_zh",defaultIma = "r_mrcz_32801_zh",defaultImaRMB = "r_mrcz_32801_zh"},
[648] = {selectIma = "r_mrcz_648_zh",selectImaRMB = "r_mrcz_648_zh",defaultIma = "r_mrcz_64801_zh",defaultImaRMB = "r_mrcz_64801_zh"},
[50] = {selectIma = "r_mrcz_50_zh",selectImaRMB = "r_mrcz_50_zh",defaultIma = "r_mrcz_5001_zh",defaultImaRMB = "r_mrcz_5001_zh"},
[100] = {selectIma = "r_mrcz_100_zh",selectImaRMB = "r_mrcz_100_zh",defaultIma = "r_mrcz_10001_zh",defaultImaRMB = "r_mrcz_10001_zh"},
}
@ -25,14 +27,15 @@ function DailyRechargePanel:InitComponent()
self.title = Util.GetGameObject(self.backBtn, "bg/title"):GetComponent("Image")
self.select = Util.GetGameObject(self.backBtn, "bg/select")
self.selectIma = Util.GetGameObject(self.select, "Text"):GetComponent("Image")
--self.selectIma = Util.GetGameObject(self.select, "Text"):GetComponent("Image")
self.selectIma = Util.GetGameObject(self.select, "Text"):GetComponent("Text")
self.grid = Util.GetGameObject(self.backBtn, "bg/grid")
self.items = {}
for i = 1,self.grid.transform.childCount do
self.items[i] = {}
self.items[i].go = Util.GetGameObject(self.grid,"item"..i)
self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Image")
--self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Image")
self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Text")
self.items[i].redpot = Util.GetGameObject(self.items[i].go,"red")
end
@ -171,11 +174,12 @@ function DailyRechargePanel:SetGrid()
else
self.items[i].go.gameObject:SetActive(true)
local config = actRewardConfig[self.actInfo.mission[i].missionId]
if MoneyUtil.MT == MoneyType.RMB then
self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultImaRMB)
else
self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultIma)
end
-- if MoneyUtil.MT == MoneyType.RMB then
-- self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultImaRMB)
-- else
-- self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultIma)
-- end
self.items[i].priceText.text = MoneyUtil.GetMoneyUnitNameWithMoney(config.Values[1][1])
self.items[i].priceText:SetNativeSize()
end
end
@ -223,12 +227,13 @@ function DailyRechargePanel:SetSelectBtn()
self.select.transform:SetParent(self.items[index].go.transform)
self.select.transform:SetSiblingIndex(1)
self.select.transform.localPosition = Vector3.zero
if MoneyUtil.MT == MoneyType.RMB then
self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectImaRMB)
else
self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectIma)
end
self.selectIma:SetNativeSize()
self.selectIma.text = MoneyUtil.GetMoneyUnitNameWithMoney(actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1])
-- if MoneyUtil.MT == MoneyType.RMB then
-- self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectImaRMB)
-- else
-- self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectIma)
-- end
--self.selectIma:SetNativeSize()
end
function DailyRechargePanel:RefreshPanel()

View File

@ -305,6 +305,7 @@ function this:UpdateHeroInfoData()
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
local OpenPassiveSkillRules = heroStar >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
OpenPassiveSkillRules=GetPassiveByMaxStar(heroConFigData,OpenPassiveSkillRules)
if OpenPassiveSkillRules then
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
self.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum

View File

@ -152,6 +152,7 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv)
Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SkillIconType[aaa])
Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image"):SetNativeSize()
local OpenPassiveSkillRules = star >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
OpenPassiveSkillRules=GetPassiveByMaxStar(heroConFigData,OpenPassiveSkillRules)
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
if star==11 then
Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..10

View File

@ -2912,6 +2912,7 @@ function this.GetAllPassiveSkillIds(heroConfig, breakId, upStarId)
local compoundNum = 0
local compoundOPenNum = 0
local OpenPassiveSkillRules = (upStarId and upStarId ~=0 and heroRankUpConfig[upStarId].OpenStar >= this.awakeNextStarIndex) and heroConfig.Awaken or heroConfig.OpenPassiveSkillRules
OpenPassiveSkillRules=GetPassiveByMaxStar(heroConfig,OpenPassiveSkillRules)
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == 1 then --突破

View File

@ -294,6 +294,7 @@ function this.RoleInfo0()
--local talentBtnImage = curHeroData.star == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
this.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
local OpenPassiveSkillRules = curHeroData.star >= HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules)
if OpenPassiveSkillRules then
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum

View File

@ -2,7 +2,7 @@ local EveryDayGiftNew = {}
local rechargeNum = 0
local growData = {}
local rechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
local onKeyPackId = 1008
local onKeyPackId = 1004
function EveryDayGiftNew:New(gameObject)
local b = {}
b.gameObject = gameObject
@ -49,36 +49,38 @@ function EveryDayGiftNew:InitComponent()
--=================Rewards=================
self.Reward = Util.GetGameObject(self.newPage,"Reward")
self.Button = Util.GetGameObject(self.newPage,"Button")
self.btn1 = Util.GetGameObject(self.Button,"btn1")
self.btn1Red = Util.GetGameObject(self.btn1,"red")
self.btn2 = Util.GetGameObject(self.Button,"btn2")
self.btn2Text = Util.GetGameObject(self.btn2,"Text"):GetComponent("Text")
self.Reward:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,1026.7)
self.endTimeBg = Util.GetGameObject(self.newPage,"growPack/Time")
self.endTime = Util.GetGameObject(self.endTimeBg,"Text"):GetComponent("Text")
local rootHight = self.Reward.transform.rect.height
local width = self.Reward.transform.rect.width
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Reward.transform,
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 10))
self.scrollView.moveTween.MomentumAmount = 1
self.scrollView.moveTween.Strength = 2
self.scrollView.elastic = false
self.ItemList = {}
self.sortingOrder = 0
--=================extraTitle================
self.extarTitle = Util.GetGameObject(self.newPage,"extarTitle")
self.extarTitle:SetActive(false)
self.extarFreeBtn = Util.GetGameObject(self.extarTitle,"freeBtn")
self.freeBtnAnim = Util.GetGameObject(self.extarFreeBtn,"UI_effect_TanSuo_Box"):GetComponent("Animator")
self.freeBtnRed = Util.GetGameObject(self.extarFreeBtn,"redPoint")
self.extarStoreBtn = Util.GetGameObject(self.extarTitle,"Bg/store")
self.UI_Effect_jinkuang_Yuan = Util.GetGameObject(self.extarStoreBtn, "UI_Effect_jinkuang_Yuan")
self.extarOneKeyBtn = Util.GetGameObject(self.extarTitle,"Bg/oneKey/oneKeyBtn")
self.allSaoGuang = Util.GetGameObject(self.extarOneKeyBtn, "saoguang")
self.extarOneKeyprice1 = Util.GetGameObject(self.extarTitle,"Bg/oneKey/nowPrice"):GetComponent("Text")
self.extarOneKeyprice2 = Util.GetGameObject(self.extarTitle,"Bg/oneKey/oriPrice"):GetComponent("Text")
self.lightList = {
Util.GetGameObject(self.freeBtnAnim.gameObject,"bg_ray"),
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 1"),
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 2"),
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 3"),
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 4"),
}
end
function EveryDayGiftNew:BindEvent()
Util.AddOnceClick(self.btn2,function ()
for i = 1, #self.shopData do
if self.shopData[i].data.boughtNum > 0 then
PopupTipPanel.ShowTip("需要未购买每日礼包时才可使用!")
return
end
end
Util.AddOnceClick(self.extarOneKeyBtn,function ()
if self.actType ~= FUNCTION_OPEN_TYPE.MeiRiLiBao then return end
PayManager.Pay(onKeyPackId, function(id)
FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId)
PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0)
@ -87,6 +89,10 @@ function EveryDayGiftNew:BindEvent()
self:RefreshData(nil,false,false)
end)
end)
Util.AddOnceClick(self.extarStoreBtn,function()
if self.actType ~= FUNCTION_OPEN_TYPE.MeiRiLiBao then return end
JumpManager.GoJump(40020)
end)
end
--界面打开时调用(用于子类重写)
@ -99,12 +105,12 @@ end
function EveryDayGiftNew:OnSortingOrderChange(_sortingOrder)
self.sortingOrder = _sortingOrder
Util.SetParticleSortLayer(self.UI_Effect_jinkuang_Yuan, _sortingOrder + 1)
end
-- 打开,重新打开时回调
function EveryDayGiftNew:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
self.Button:SetActive(false)
self.sortingOrder = _sortingOrder or self.sortingOrder
self.actId = self.actConfig.ActId
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
@ -135,20 +141,35 @@ function EveryDayGiftNew:RefreshData(none,isTop,isAni)
self.shopData = DynamicActivityManager.GetGiftDataByType(self.actConfig.ShopData)
--成长礼包
self:SetGrowGift()
--特殊处理部分
Log("actType:"..tostring(self.actType))
if self.actType == FUNCTION_OPEN_TYPE.MeiRiLiBao then
self.extarTitle:SetActive(true)
--每日礼
self:RefreshFreeData()
-- 刷新一键购买显示
self:RefreshOneKeyShow()
self.Reward:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,752)
end
if not self.scrollView then
--更改完空间大小后再生成滚动条
local rootHight = self.Reward.transform.rect.height
local width = self.Reward.transform.rect.width
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Reward.transform,
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 10))
self.scrollView.moveTween.MomentumAmount = 1
self.scrollView.moveTween.Strength = 2
self.scrollView.elastic = false
end
-- 刷新剩余时间
self:GetRemainTime()
-- 刷新商品数据
self:RefreshGiftData(isTop,isAni)
--特殊处理部分
Log("actType:"..tostring(self.actType))
if self.actType == ActivityTypeDef.MeiRiLiBao then
self.Button:SetActive(true)
--每日礼
self:RefreshFreeData()
-- 刷新一键购买显示
self:RefreshOneKeyShow()
end
end
--==============================成长礼包部分==========================(rechargeViewNew和EveryDayGiftNew中有完全相同的部分复制过去)
@ -410,11 +431,11 @@ function EveryDayGiftNew:GetRemainTime()
end
self:RefreshData(nil,true,true)
end
if actData then
self.btn2Text.text = string.format("剩余%s天",math.ceil(packFreshTime/86400))
else
self.btn2Text.text = string.format("60元七天特惠")
end
-- if actData then
-- self.btn2Text.text = string.format("剩余%s天",math.ceil(packFreshTime/86400))
-- else
-- self.btn2Text.text = string.format("60元七天特惠")
-- end
freshTime = freshTime - 1
packFreshTime = packFreshTime - 1
end, 1, -1, true)
@ -425,24 +446,31 @@ end
--==============================每日特惠特殊处理部分===================
--刷新一键购买显示
function EveryDayGiftNew:RefreshOneKeyShow()
Util.SetGray(self.btn2,false)
Util.SetParticleSortLayer(self.UI_Effect_jinkuang_Yuan, self.sortingOrder + 1)
Util.SetGray(self.extarOneKeyBtn,false)
self.extarOneKeyBtn:GetComponent("Button").interactable = true
self.allSaoGuang:SetActive(true)
-- 计算总价
local ori = 0
for i = 1 , #self.shopData do
ori = ori + self.shopData[i].data.finalNum
end
-- 计算现价
local now = 0
now = now + MoneyUtil.GetMoney(ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,1004).Price)
local actData = ActivityGiftManager.GetActivityTypeInfo(89)
if actData then
Util.SetGray(self.btn2,true)
self.btn2:GetComponent("Button").interactable = false
self.btn2Text.text = string.format("剩余%s天",math.ceil((actData.endTime - GetTimeStamp())/86400))
else
Util.SetGray(self.btn2,false)
self.btn2:GetComponent("Button").interactable = true
self.btn2Text.text = string.format("60元七天特惠")
for i = 1, #self.shopData do
if self.shopData[i].data.boughtNum > 0 then
Util.SetGray(self.btn2,true)
break
end
self.extarOneKeyprice2.text = Language[10582] .. string.format(MoneyUtil.GetMoneyUnitName(),ori)
self.extarOneKeyprice1.text = Language[10644] .. string.format(MoneyUtil.GetMoneyUnitName(),now)
for i = 1, #self.shopData do
if self.shopData[i].data.boughtNum > 0 then
Util.SetGray(self.extarOneKeyBtn,true)
self.extarOneKeyBtn:GetComponent("Button").interactable = false
self.allSaoGuang:SetActive(false)
break
end
end
end
--刷新每日免费礼包
@ -451,11 +479,14 @@ function EveryDayGiftNew:RefreshFreeData()
local boughtNum = ShopManager.GetShopItemHadBuyTimes(SHOP_TYPE.FREE_GIFT, freeData[1].id)
local limitNum = ShopManager.GetShopItemLimitBuyCount(freeData[1].id)
local isCanBuy = limitNum - boughtNum >= 1
self.btn1Red:SetActive(isCanBuy)
Util.SetGray(self.btn1,not isCanBuy)
self.freeBtnAnim.enabled = isCanBuy
self.freeBtnRed:SetActive(isCanBuy)
-- 光效显隐
for _, light in ipairs(self.lightList) do
light:SetActive(isCanBuy)
end
CheckRedPointStatus(RedPointType.DailyGift)
Util.AddOnceClick(self.btn1,function()
Util.AddOnceClick(self.extarFreeBtn,function()
if isCanBuy then
ShopManager.RequestBuyShopItem(SHOP_TYPE.FREE_GIFT, freeData[1].id, 1, function()
self:RefreshFreeData()

View File

@ -112,6 +112,7 @@ function RoleAwakeLayout:UpdateHeroUpStarData()
this.curLvEnd.text= HeroManager.GetCurHeroStarLvEnd(1,curHeroData)
this.nextLvEnd.text= HeroManager.GetCurHeroStarLvEnd(2,curHeroData,curHeroData.breakId,upStarRankUpConfig.Id)
local OpenPassiveSkillRules = curHeroData.star == HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules)
local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
this.talent1Progress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
this.talent2Progress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum

View File

@ -430,8 +430,10 @@ function this.GetSkillsData()
heroSkill.Skilltips = nil
local OpenPassiveSkillRules = curHeroData.star >= HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules)
if OpenPassiveSkillRules then
local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum)
heroSkill.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
heroSkill.state = 1
if curHeroData.star == 12 then

View File

@ -58,6 +58,7 @@ function RoleTalentPopup:GetTalentDataShow()
LogError("upstarid =="..upStarId)
local openNum=0
local OpenPassiveSkillRules = (upStarId and upStarId ~=0 and heroRankUpConfig[upStarId].OpenStar >= HeroManager.awakeNextStarIndex) and heroConfig.Awaken or heroConfig.OpenPassiveSkillRules
OpenPassiveSkillRules=GetPassiveByMaxStar(heroConfig,OpenPassiveSkillRules)
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == 1 then--突破