Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-08-28 10:19:03 +08:00
commit 4f64e56b95
16 changed files with 558 additions and 33 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -4363,7 +4363,7 @@ RectTransform:
m_Children:
- {fileID: 407214901555688405}
m_Father: {fileID: 3877862887809483861}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -14669,6 +14669,86 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &3889582380773490144
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2113935668306464302}
- component: {fileID: 3089526278750694217}
- component: {fileID: 4466427626236729324}
m_Layer: 5
m_Name: Tip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2113935668306464302
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3889582380773490144}
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: 3835777603823743098}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 163, y: -45}
m_SizeDelta: {x: 186, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3089526278750694217
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3889582380773490144}
m_CullTransparentMesh: 0
--- !u!114 &4466427626236729324
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3889582380773490144}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9245283, g: 0.8870058, b: 0.6497864, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u653B\u51FB\u52A0\u6210\uFF1A5%"
LanguageIndex: 11278
--- !u!1 &3964356147264308643
GameObject:
m_ObjectHideFlags: 0
@ -15059,6 +15139,7 @@ RectTransform:
- {fileID: 4136280709894719495}
- {fileID: 8977496321880658324}
- {fileID: 3515001552633387242}
- {fileID: 5617606851546670843}
- {fileID: 9205216737925071854}
- {fileID: 8217351224630860934}
m_Father: {fileID: 2925180131101153177}
@ -15625,6 +15706,82 @@ MonoBehaviour:
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &4428981516403878044
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6655237885043181859}
- component: {fileID: 8934551233574494761}
- component: {fileID: 5035563427308077647}
m_Layer: 5
m_Name: Content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6655237885043181859
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4428981516403878044}
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: 3835777603823743098}
m_Father: {fileID: 9016829080921391704}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.0000031017296}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &8934551233574494761
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4428981516403878044}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 135
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 300, y: 90}
m_Spacing: {x: 100, y: 0}
m_Constraint: 1
m_ConstraintCount: 2
--- !u!114 &5035563427308077647
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4428981516403878044}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &4499051017089739654
GameObject:
m_ObjectHideFlags: 0
@ -20536,6 +20693,95 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5F53\u524D\u79EF\u5206\uFF1A1000"
LanguageIndex: 11262
--- !u!1 &6488513017032108094
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9016829080921391704}
- component: {fileID: 2636180410101004073}
- component: {fileID: 5122127783635863340}
- component: {fileID: 3826782024206621900}
m_Layer: 5
m_Name: Viewport
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9016829080921391704
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6488513017032108094}
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: 6655237885043181859}
m_Father: {fileID: 5617606851546670843}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: -17}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2636180410101004073
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6488513017032108094}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!222 &5122127783635863340
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6488513017032108094}
m_CullTransparentMesh: 0
--- !u!114 &3826782024206621900
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6488513017032108094}
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: 10917, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6491840666562730131
GameObject:
m_ObjectHideFlags: 0
@ -23447,6 +23693,91 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7274631364748649779
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3835777603823743098}
- component: {fileID: 2886915251898753452}
- component: {fileID: 2890011534524699828}
- component: {fileID: 7713030028337703806}
m_Layer: 5
m_Name: Pre
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3835777603823743098
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7274631364748649779}
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: 1120490873898263703}
- {fileID: 2113935668306464302}
m_Father: {fileID: 6655237885043181859}
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: 285, y: -45}
m_SizeDelta: {x: 300, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2886915251898753452
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7274631364748649779}
m_CullTransparentMesh: 0
--- !u!114 &2890011534524699828
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7274631364748649779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 20
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 20
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 1
--- !u!114 &7713030028337703806
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7274631364748649779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &7276342537413594774
GameObject:
m_ObjectHideFlags: 0
@ -23994,7 +24325,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3041994081485414640
RectTransform:
m_ObjectHideFlags: 0
@ -24453,7 +24784,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &9205216737925071854
RectTransform:
m_ObjectHideFlags: 0
@ -24467,7 +24798,7 @@ RectTransform:
m_Children:
- {fileID: 8506003241810201444}
m_Father: {fileID: 3877862887809483861}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -26412,6 +26743,101 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &8576098089461548134
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1120490873898263703}
- component: {fileID: 3768361779311586249}
- component: {fileID: 8081604778129953653}
- component: {fileID: 6080262946726203209}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1120490873898263703
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8576098089461548134}
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: 3835777603823743098}
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: 25, y: -45}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3768361779311586249
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8576098089461548134}
m_CullTransparentMesh: 0
--- !u!114 &8081604778129953653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8576098089461548134}
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: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &6080262946726203209
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8576098089461548134}
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: 50
m_PreferredHeight: 50
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &8585971491395229052
GameObject:
m_ObjectHideFlags: 0
@ -26984,6 +27410,84 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8846243046883531082}
m_CullTransparentMesh: 0
--- !u!1 &8860201067443762686
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5617606851546670843}
- component: {fileID: 6814848901384458385}
- component: {fileID: 8940696677417228165}
m_Layer: 5
m_Name: ScrollView
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5617606851546670843
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8860201067443762686}
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: 9016829080921391704}
m_Father: {fileID: 3877862887809483861}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000030518, y: 8}
m_SizeDelta: {x: 936.8, y: 502.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6814848901384458385
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8860201067443762686}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 6655237885043181859}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 9016829080921391704}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_HorizontalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 2
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!222 &8940696677417228165
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8860201067443762686}
m_CullTransparentMesh: 0
--- !u!1 &8935471697483570858
GameObject:
m_ObjectHideFlags: 0

View File

@ -1672,7 +1672,7 @@
[11671] = "点击任意卡牌,向神明祈福吧!本次祈福消耗",
[11672] = "活动不可刷新",
[11673] = "当前时间不可刷新",
[11674] = "本轮祈福还未全部结束,刷新后会重置祈福次数与累计奖励,确认刷新祈福奖励吗?",
[11674] = "本轮祈福还未全部结束,确认刷新祈福奖励吗?",
[11675] = "%d年%d月%d日",
[11676] = "恭喜你完成了第 ",
[11677] = " 次祈福!",
@ -2364,8 +2364,8 @@
[12363] = "即可<color=#C94943>激活30天月卡</color>",
[12364] = "是否消耗<color=#0BE102>%s</color>%s购买一次挑战次数",
[12365] = "天宫秘宝",
[12366] = "<color=#95523B>解锁秘宝可以领取额外专属奖励并直接获得200积分</color>,<color=#CC4325>可获取1980妖晶邮件领取</color>",
[12367] = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级,</color><color=#CC4325>可获取1980妖晶邮件领取</color>",
[12366] = "<color=#95523B>解锁秘宝可以领取额外专属奖励并直接获得200积分<color=#CC4325>可获取1980妖晶邮件领取</color></color>",
[12367] = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+直升15级<color=#CC4325>可获取1980妖晶邮件领取</color></color>",
[12368] = "等级购买成功",
[12369] = "购买%s级升至%s级",
[12370] = "升至%s级可立即解锁%s件奖励",

View File

@ -139,8 +139,8 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
local formationMask = Util.GetGameObject(go.transform, "formationMask")
-- formationMask:SetActive(false)
formationMask:SetActive( #heroData.formationList ~= 0 or heroData.lockState == 1)--(heroData.isFormation ~= "" and heroData.isFormation ~= Language[11108])
Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(#heroData.formationList ~= 0)
formationMask:SetActive( LengthOfTable(heroData.formationList) ~= 0 or heroData.lockState == 1)--(heroData.isFormation ~= "" and heroData.isFormation ~= Language[11108])
Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(LengthOfTable(heroData.formationList) ~= 0)
Util.GetGameObject(formationMask.transform, "lockImage"):SetActive( heroData.lockState == 1)
Util.GetGameObject(go.transform, "noumenon"):SetActive( heroData.id == curHeroData.Id )
local starGrid = Util.GetGameObject(go.transform, "star")
@ -163,9 +163,9 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
end)
Util.AddOnceClick(formationMask, function()
if #heroData.formationList ~= 0 then
if LengthOfTable(heroData.formationList) ~= 0 then
local text = ""
for index, value in ipairs(heroData.formationList) do
for index, value in pairs(heroData.formationList) do
text = HeroManager.GetHeroFormationStr(index)
end
PopupTipPanel.ShowTip(text)
@ -209,7 +209,7 @@ function CompoundHeroUpStarListPanel:AutoSelectHero()
LogGreen("sssssssssssssssssssss")
curSelectHeroList = {}
for i = 1, #heroDataList do
if LengthOfTable(curSelectHeroList) < curNeedRoleNum and #heroDataList[i].formationList == 0 and heroDataList[i].lockState == 0 then--
if LengthOfTable(curSelectHeroList) < curNeedRoleNum and LengthOfTable(heroDataList[i].formationList) == 0 and heroDataList[i].lockState == 0 then--
LogGreen("heroDataList[i].dynamicId "..heroDataList[i].dynamicId)
curSelectHeroList[heroDataList[i].dynamicId]=heroDataList[i]
end

View File

@ -287,7 +287,7 @@ function this.AutoSelectUpStarHeroList(_curUpStarData)
-- curSelectUpStarGo = needHeros[i + 1]
for j = 1, LengthOfTable(upStarHeroListData) do
if #curSelectHeroList < _curUpStarData.upStarData[i][4] then
if upStarHeroListData[j] and upStarHeroListData[j].dynamicId and upStarHeroListData[j].lockState == 0 and (curSelectHero.heroConfig and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId) and upStarHeroListData[i].isFormation == "" then
if upStarHeroListData[j] and upStarHeroListData[j].dynamicId and upStarHeroListData[j].lockState == 0 and (curSelectHero.heroConfig and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId) and upStarHeroListData[j].isFormation == "" then
table.insert(curSelectHeroList,upStarHeroListData[j])
end
end

View File

@ -112,6 +112,9 @@ function this.SingleHeroDataShow(_go, _heroData)
Util.GetGameObject(go, "yuanImage"):SetActive(heroData.createtype == 1)
--剩余血量 无尽副本才显示
local hpExp = Util.GetGameObject(go, "hpExp")
if not ExpeditionManager.heroInfo[heroData.dynamicId] then
ExpeditionManager.InitHeroHpValue(heroData.dynamicId)
end
local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp
local starGrid = Util.GetGameObject(go, "star")
SetHeroStars(starGrid, heroData.star)

View File

@ -158,7 +158,10 @@ function this.SingleHeroDataShow(_go, _heroData)
Util.GetGameObject(go, "yuanImage"):SetActive(heroData.createtype == 1)
--剩余血量 无尽副本才显示
local hpExp = Util.GetGameObject(go, "info/hpExp")
local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp
if not ExpeditionManager.heroInfo[heroData.dynamicId] then
ExpeditionManager.InitHeroHpValue(heroData.dynamicId)
end
local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp
local starGrid = Util.GetGameObject(go, "info/star")
SetHeroStars(starGrid, heroData.star)
this.SetHeroBlood(hpExp, heroHp, go)

View File

@ -595,11 +595,11 @@ end
--获取所有英雄信息
function this.GetAllHeroDatas(heros,_lvLimit)
local lvLimit = 0
local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP)
--local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP)
if _lvLimit then lvLimit = _lvLimit end
--local heros = {}
for i, v in pairs(heroDatas) do
if v.lv >= lvLimit or allUpZhenHeroList[v.dynamicId] then
if v.lv >= lvLimit then--or allUpZhenHeroList[v.dynamicId] then
table.insert(heros,v)
end
end
@ -610,7 +610,7 @@ end
--通过属性筛选英雄
function this.GetHeroDataByProperty(heros,_property,_lvLimit)
local lvLimit = 0
local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP)
--local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP)
if _lvLimit then lvLimit = _lvLimit end
local index = 1
if heros and #heros > 0 then
@ -618,7 +618,7 @@ function this.GetHeroDataByProperty(heros,_property,_lvLimit)
end
for i, v in pairs(heroDatas) do
if v.property == _property then
if v.lv >= lvLimit or allUpZhenHeroList[v.dynamicId] then
if v.lv >= lvLimit then--or allUpZhenHeroList[v.dynamicId] then
heros[index] = v
index = index + 1
end
@ -626,6 +626,7 @@ function this.GetHeroDataByProperty(heros,_property,_lvLimit)
end
return heros
end
--获取单个英雄数据
function this.GetSingleHeroData(heroDId)
if heroDatas[heroDId] then

View File

@ -18,7 +18,8 @@ function this.Init(root,...)
end
--- 获取需要显示的编队id
function this.GetFormationIndex()
return this.teamId and this.teamId or FormationManager.curFormationIndex
return FormationTypeDef.FORMATION_NORMAL
-- this.teamId and this.teamId or FormationManager.curFormationIndex
end
--- 关闭界面事件

View File

@ -164,7 +164,9 @@ end
function this.SetHeroFormationList(heroDid,teamId,isAddOrDel)
if heroDatas[heroDid] then
LogRed("this.heroResolveLicence[teamId]:"..tostring(this.heroResolveLicence[teamId]))
if isAddOrDel and this.heroResolveLicence[teamId] then
LogRed("添加了")
heroDatas[heroDid].formationList[teamId] = teamId
else
heroDatas[heroDid].formationList[teamId] = nil
@ -2915,15 +2917,16 @@ function this.ByCompoundHeroGetAllHeros()
local downSoryHeroList = {}
for i, v in pairs(heroDatas) do
if v.star == 4 or v.star == 5 or v.star == 3 then--四星 五星 才能加 3星 是狗粮
if #v.formationList ~= 0 then
if LengthOfTable(v.formationList) ~= 0 then
local text = ""
for index, value in ipairs(v.formationList) do
text = HeroManager.GetHeroFormationStr(index)
for index, value in pairs(v.formationList) do
text = HeroManager.GetHeroFormationStr(value)
end
LogRed("text:"..text)
v.isFormation = text
end
table.insert(upSortHeroList,v)
table.insert(downSoryHeroList,v)
table.insert(downSoryHeroList,v)
end
end
table.sort(downSoryHeroList, function(a,b)

View File

@ -1408,10 +1408,15 @@ function this.TimeFormat()
if not isOpen or not baseInfo or not baseInfo.battleStage or baseInfo.battleStage == TOP_MATCH_STAGE.OVER then
SetTopMatchActive(false)
elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then
SetTopMatchActive(true)
local startTime = ArenaTopMatchManager.GetTopMatchTime()
local tempTime = startTime - PlayerManager.serverTime
this.topMatchTime.text = "距开始\n"..TimeToHMS(tempTime)
-- 当日五点开始显示
if tempTime < 16 * 60 * 60 then
SetTopMatchActive(true)
this.topMatchTime.text = "距开始\n"..TimeToHMS(tempTime)
else
SetTopMatchActive(false)
end
else
SetTopMatchActive(true)
this.topMatchTime.text = "鏖战中"

View File

@ -59,7 +59,11 @@ end
--界面销毁时调用(用于子类重写)
function BuffChoosePanel:OnDestroy()
this.logic.Destroy()
for i, logic in pairs(_LogicConfig) do
if logic.Destroy then
logic.Destroy()
end
end
end
return BuffChoosePanel

View File

@ -101,7 +101,7 @@ function this.PlayerInfoRequest(func)
PlayerManager.gem = msg.player.gem
PlayerManager.chargeGem = msg.player.chargeGem
PlayerManager.curMapId = msg.player.curMapId
MapManager.isInMap = PlayerManager.curMapId ~= 0 and PlayerManager.curMapId > 100
MapManager.isInMap = false --PlayerManager.curMapId ~= 0 and PlayerManager.curMapId > 100
PlayerManager.maxForce = msg.player.maxForce
-- RecruitManager.randCount = msg.randCount % 100 --钻石抽卡已招募次数 用不上了 协议没删
RecruitManager.isTenRecruit = msg.firstTenth --首次十连

View File

@ -20,7 +20,7 @@ function this:InitComponent(gameObject)
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
this.upTip=Util.GetGameObject(gameObject,"UpTip"):GetComponent("Text")
this.bottomTip=Util.GetGameObject(gameObject,"BottomTip"):GetComponent("Text")
this.root=Util.GetGameObject(gameObject,"Root")
this.root=Util.GetGameObject(gameObject,"ScrollView/Viewport/Content")
this.pre=Util.GetGameObject(this.root,"Pre")
this.goBtn=Util.GetGameObject(gameObject,"GoBtn")
end

View File

@ -62,7 +62,7 @@ public class GameStart : MonoBehaviour
Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent<Image>();
image2.DOFade(1, 0).OnComplete(() =>{
image.DOFade(0, 0).SetDelay(2).OnComplete(() =>{
image2.DOFade(0, 0).SetDelay(2).OnComplete(() =>{
image.color = new Color(image.color.r, image.color.g, image.color.b, 0);
image.DOFade(1, 1).OnComplete(() => {
image.DOFade(0, 1).SetDelay(2).OnComplete(() => {

View File

@ -1671,7 +1671,7 @@
11671,点击任意卡牌,向神明祈福吧!本次祈福消耗
11672,活动不可刷新
11673,当前时间不可刷新
11674,本轮祈福还未全部结束,刷新后会重置祈福次数与累计奖励,确认刷新祈福奖励吗?
11674,本轮祈福还未全部结束,确认刷新祈福奖励吗?
11675,%d年%d月%d日
11676,恭喜你完成了第
11677, 次祈福!
@ -1878,7 +1878,7 @@
11878,升星被动技能id
11879,新增技能
11880,道具不足!
11881,赠送1个元神玉和20个置换玉
11881,赠送1个元神玉
11882,赠送1个妖灵玉
11883,活动结束!
11884,赠送10个元神玉
@ -2363,8 +2363,8 @@
12363,即可<color=#C94943>激活30天月卡</color>
12364,是否消耗<color=#0BE102>%s</color>%s购买一次挑战次数
12365,天宫秘宝
12366,<color=#95523B>解锁秘宝可以领取额外专属奖励并直接获得200积分</color>
12367,<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级</color>
12366,<color=#95523B>解锁秘宝可以领取额外专属奖励并直接获得200积分<color=#CC4325>可获取1980妖晶邮件领取</color></color>
12367,<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+直升15级<color=#CC4325>可获取1980妖晶邮件领取</color></color>
12368,等级购买成功
12369,购买%s级升至%s级
12370,升至%s级可立即解锁%s件奖励
@ -2385,3 +2385,4 @@
12385,五星成长礼
12386,极速排名
12387,军团副本
12388,该神将在巅峰战阵容中已上阵

1 10001 没有ActivityTypeDef为%s任务Id为%s的数据
1671 11671 点击任意卡牌,向神明祈福吧!本次祈福消耗
1672 11672 活动不可刷新
1673 11673 当前时间不可刷新
1674 11674 本轮祈福还未全部结束,刷新后会重置祈福次数与累计奖励,确认刷新祈福奖励吗? 本轮祈福还未全部结束,确认刷新祈福奖励吗?
1675 11675 %d年%d月%d日
1676 11676 恭喜你完成了第
1677 11677 次祈福!
1878 11878 升星被动技能id
1879 11879 新增技能
1880 11880 道具不足!
1881 11881 赠送1个元神玉和20个置换玉 赠送1个元神玉
1882 11882 赠送1个妖灵玉
1883 11883 活动结束!
1884 11884 赠送10个元神玉
2363 12363 即可<color=#C94943>激活30天月卡</color>
2364 12364 是否消耗<color=#0BE102>%s</color>%s购买一次挑战次数?
2365 12365 天宫秘宝
2366 12366 <color=#95523B>解锁秘宝,可以领取额外专属奖励,并直接获得200积分</color> <color=#95523B>解锁秘宝,可以领取额外专属奖励,并直接获得200积分,<color=#CC4325>可获取1980妖晶,邮件领取</color></color>
2367 12367 <color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级</color> <color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+直升15级,<color=#CC4325>可获取1980妖晶,邮件领取</color></color>
2368 12368 等级购买成功
2369 12369 购买%s级,升至%s级
2370 12370 升至%s级,可立即解锁%s件奖励
2385 12385 五星成长礼
2386 12386 极速排名
2387 12387 军团副本
2388 12388 该神将在巅峰战阵容中已上阵