Merge branch 'china/dev' into china/test

dev_chengFeng
wangzhenxing 2022-07-06 14:33:03 +08:00
commit eab0e11e44
19 changed files with 897 additions and 95 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 MiB

After

Width:  |  Height:  |  Size: 1.9 MiB

View File

@ -184,7 +184,7 @@ RectTransform:
- {fileID: 262793656545805022}
- {fileID: 2849168688064822341}
m_Father: {fileID: 1012972711}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -10223,7 +10223,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -110.7, y: -45}
m_AnchoredPosition: {x: -110.70001, y: -45}
m_SizeDelta: {x: -267, y: -109.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &796774150
@ -10384,7 +10384,7 @@ RectTransform:
- {fileID: 917411733590987729}
- {fileID: 5427344268651350439}
m_Father: {fileID: 1012972711}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -10511,6 +10511,7 @@ RectTransform:
- {fileID: 698392784}
- {fileID: 5391497229806396012}
- {fileID: 1876058329}
- {fileID: 6691372472164639446}
- {fileID: 969518017}
- {fileID: 2110103215}
- {fileID: 107230295}
@ -21216,7 +21217,7 @@ RectTransform:
- {fileID: 2213520785919958966}
- {fileID: 2696028058082798374}
m_Father: {fileID: 1012972711}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -42314,6 +42315,138 @@ MonoBehaviour:
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &1075340097994303621
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6691372472164639446}
- component: {fileID: 8264674552433995876}
- component: {fileID: 1897133737153531227}
- component: {fileID: 8975441646232041914}
- component: {fileID: 1510572586510085843}
m_Layer: 5
m_Name: btnFirstRecharge
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6691372472164639446
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075340097994303621}
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: 7791392159515502658}
- {fileID: 7315696869711782995}
- {fileID: 1322404926923880864}
- {fileID: 414752713198513141}
m_Father: {fileID: 1012972711}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 112, y: 168.13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8264674552433995876
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075340097994303621}
m_CullTransparentMesh: 0
--- !u!114 &1897133737153531227
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075340097994303621}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1510572586510085843}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &8975441646232041914
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075340097994303621}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, 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!114 &1510572586510085843
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075340097994303621}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &1110159733065212668
GameObject:
m_ObjectHideFlags: 0
@ -53377,6 +53510,159 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2081923965676803354
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 414752713198513141}
- component: {fileID: 1467723388192968753}
- component: {fileID: 2554166314839614243}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &414752713198513141
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081923965676803354}
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: 6691372472164639446}
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: 52.9, y: -61.7}
m_SizeDelta: {x: 146, y: 31}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1467723388192968753
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081923965676803354}
m_CullTransparentMesh: 0
--- !u!114 &2554166314839614243
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081923965676803354}
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: 21300000, guid: 38b276d9f3804ed448fbb95355df1aeb, 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 &2107367858283709901
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1322404926923880864}
- component: {fileID: 2714578184293178092}
- component: {fileID: 2759173853870487632}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1322404926923880864
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2107367858283709901}
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: 6691372472164639446}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 21.409988, y: 17.4}
m_SizeDelta: {x: 97.58, y: 97.92}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2714578184293178092
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2107367858283709901}
m_CullTransparentMesh: 0
--- !u!114 &2759173853870487632
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2107367858283709901}
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: 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_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5C71\u6CB3\u793E\u7A37\u56FE"
--- !u!1 &2143568878716041121
GameObject:
m_ObjectHideFlags: 0
@ -53730,6 +54016,80 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5C71\u6CB3\u793E\u7A37\u56FE"
--- !u!1 &2273828341469011254
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7791392159515502658}
- component: {fileID: 1790775417553678977}
- component: {fileID: 8335867790129723609}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7791392159515502658
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273828341469011254}
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: 6691372472164639446}
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: 52.9, y: 18.259972}
m_SizeDelta: {x: 177, y: 182}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1790775417553678977
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273828341469011254}
m_CullTransparentMesh: 0
--- !u!114 &8335867790129723609
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273828341469011254}
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: 239b0ff3c49592b4c8ce997cc66de408, 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 &2300064317699619474
GameObject:
m_ObjectHideFlags: 0
@ -75164,6 +75524,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &3835184131548970617
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7315696869711782995}
- component: {fileID: 909896324596727097}
- component: {fileID: 4273556714744785718}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7315696869711782995
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3835184131548970617}
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: 6691372472164639446}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 113, y: 71.45998}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &909896324596727097
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3835184131548970617}
m_CullTransparentMesh: 0
--- !u!114 &4273556714744785718
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3835184131548970617}
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &3944293176626243123
GameObject:
m_ObjectHideFlags: 0
@ -146582,15 +147016,15 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3}
--- !u!1 &1533186584701823329 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0}
--- !u!224 &830511510176938944 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1533186584701823329 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0}

View File

@ -347,6 +347,7 @@ RectTransform:
m_LocalScale: {x: 1.0004462, y: 1.0004462, z: 1.0004462}
m_Children:
- {fileID: 4469683468750599681}
- {fileID: 1186578651053264938}
m_Father: {fileID: 1102052322136090187}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3331,7 +3332,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u4E3B\u7EBF\u5173\u5361\u5361"
m_Text: "\u5956\u52B1"
LanguageIndex: 0
--- !u!1 &1786804384331322804
GameObject:
@ -9676,6 +9677,81 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5108616311650332514
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1186578651053264938}
- component: {fileID: 9188574295627705102}
- component: {fileID: 3413783486708343544}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1186578651053264938
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5108616311650332514}
m_LocalRotation: {x: 0, y: 0, z: 0.05826097, w: 0.99830145}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1490639867638591168}
m_Father: {fileID: 4162933811339121748}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 6.68}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -15, y: 59}
m_SizeDelta: {x: 145.27, y: 85.77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9188574295627705102
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5108616311650332514}
m_CullTransparentMesh: 0
--- !u!114 &3413783486708343544
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5108616311650332514}
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: 258d0de9bff365c4fb4b323882169a9c, 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 &5128744676066453791
GameObject:
m_ObjectHideFlags: 0
@ -12124,6 +12200,101 @@ RectTransform:
m_AnchoredPosition: {x: 750.4, y: -204.875}
m_SizeDelta: {x: 168, y: 352.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6700314147855198333
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1490639867638591168}
- component: {fileID: 7530403232714161594}
- component: {fileID: 5741218370385024171}
- component: {fileID: 7688365355073319887}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1490639867638591168
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6700314147855198333}
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: 1186578651053264938}
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: -12.3, y: -3.4}
m_SizeDelta: {x: 91.06, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7530403232714161594
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6700314147855198333}
m_CullTransparentMesh: 0
--- !u!114 &5741218370385024171
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6700314147855198333}
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.99215686, g: 0.98039216, b: 0.78431374, 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: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u53CC\u6708\u5361\u4E13\u4EAB"
--- !u!114 &7688365355073319887
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6700314147855198333}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.42745098, g: 0.25490198, b: 0.1764706, a: 1}
m_EffectDistance: {x: 2, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &6709248652871501660
GameObject:
m_ObjectHideFlags: 0

View File

@ -1,5 +1,109 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &419905862
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 419905863}
- component: {fileID: 419905866}
- component: {fileID: 419905865}
- component: {fileID: 419905864}
m_Layer: 5
m_Name: jiantou
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &419905863
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419905862}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9997861, y: 0.9997861, z: 0.9997861}
m_Children: []
m_Father: {fileID: 1272852733815832172}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000061035156, y: -717.15}
m_SizeDelta: {x: 130, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &419905866
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419905862}
m_CullTransparentMesh: 0
--- !u!114 &419905865
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419905862}
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: 304cd1273b4e17b44818e6d598d13b88, 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!114 &419905864
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 419905862}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 0, y: 0, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 1
duration: 0.5
delay: 0
curveType: 1
changeType: 6
sequeueType: 1
loop: 9999
loopType: 1
targetObj: {fileID: 419905863}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &20686387920211730
GameObject:
m_ObjectHideFlags: 0
@ -5004,7 +5108,7 @@ ParticleSystem:
--- !u!199 &926036590701637610
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9716,7 +9820,7 @@ ParticleSystem:
--- !u!199 &7161790114800665152
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15217,7 +15321,7 @@ ParticleSystem:
--- !u!199 &608777245163409351
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15973,10 +16077,10 @@ RectTransform:
m_Father: {fileID: 8199983033545063705}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 25, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5903031530968450716
CanvasRenderer:
@ -16130,7 +16234,7 @@ RectTransform:
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: 0, y: 50}
m_SizeDelta: {x: 136, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3108775219584601888
MonoBehaviour:
@ -22262,7 +22366,7 @@ ParticleSystem:
--- !u!199 &5590763315395979240
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -28358,7 +28462,7 @@ ParticleSystem:
--- !u!199 &5835294107039667155
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33455,7 +33559,7 @@ ParticleSystem:
--- !u!199 &5835345885398115607
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38499,7 +38603,7 @@ ParticleSystem:
--- !u!199 &1330598074007223494
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38629,10 +38733,10 @@ RectTransform:
m_Father: {fileID: 8199983033545063705}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 93, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 93, y: -25}
m_SizeDelta: {x: 86, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5714047808390805826
CanvasRenderer:
@ -39032,7 +39136,7 @@ RectTransform:
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: 0, y: 40}
m_SizeDelta: {x: 105, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &999754687884629988
CanvasRenderer:
@ -39828,6 +39932,7 @@ RectTransform:
- {fileID: 1207664692133758490}
- {fileID: 3673471341400026499}
- {fileID: 1216994767185876133}
- {fileID: 419905863}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -45139,7 +45244,7 @@ ParticleSystem:
--- !u!199 &4708017834303641089
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -37022,7 +37022,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5148739484638376218
RectTransform:
m_ObjectHideFlags: 0
@ -51277,6 +51277,7 @@ GameObject:
- component: {fileID: 6743334599692215934}
- component: {fileID: 4942739253467920590}
- component: {fileID: 4047812234912289829}
- component: {fileID: 7620457998452544379}
m_Layer: 5
m_Name: boxIcon
m_TagString: Untagged
@ -51325,7 +51326,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -51359,6 +51360,48 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &7620457998452544379
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7739183248647446308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 4942739253467920590}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &7748943483106170027
GameObject:
m_ObjectHideFlags: 0

View File

@ -206,22 +206,27 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId)
self.level.transform.parent.gameObject:SetActive(not self.isBoss)
self.elementImg.transform.parent.gameObject:SetActive(not self.isBoss)
self.rageSlider.transform.parent.gameObject:SetActive(not self.isBoss)
if BattlePanel and BattlePanel.guideType then
LogError("BattlePanel.guidetype=="..BattlePanel.guideType)
if BattlePanel.guideType==3 then
self.nameObj:SetActive(true)
-- if BattlePanel and BattlePanel.guideType then
-- LogError("BattlePanel.guidetype=="..BattlePanel.guideType)
-- if BattlePanel.guideType==3 then
-- self.nameObj:SetActive(true)
-- self.nameParent:SetActive(false)
-- self.proPar:SetActive(false)
-- self.nameText.transform.parent.gameObject:SetActive(false)
-- self.elementImg.transform.parent.gameObject:SetActive(false)
-- else
-- self.nameParent:SetActive(true)
-- self.proPar:SetActive(true)
-- self.nameObj:SetActive(false)
-- end
-- else
-- self.nameObj:SetActive(false)
-- end
self.nameObj:SetActive(true)
self.nameParent:SetActive(false)
self.proPar:SetActive(false)
self.nameText.transform.parent.gameObject:SetActive(false)
self.elementImg.transform.parent.gameObject:SetActive(false)
else
self.nameParent:SetActive(true)
self.proPar:SetActive(true)
self.nameObj:SetActive(false)
end
else
self.nameObj:SetActive(false)
end
end
--

View File

@ -86,20 +86,22 @@ function PlayerView:onCreate(go, role, position, root)
Util.GetGameObject(go, "GameObject/pro"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
self.nameObj=Util.GetGameObject(go, "GameObject")
self.nameObj:SetActive(false)
if BattlePanel and BattlePanel.guideType then
LogError("11111111111111==="..BattlePanel.guideType)
if BattlePanel.guideType==3 then
LogError("222222222")
self.nameParent:SetActive(true)
self.proPar:SetActive(true)
else
self.nameParent:SetActive(false)
self.proPar:SetActive(false)
end
else
self.nameParent:SetActive(false)
self.proPar:SetActive(false)
end
-- if BattlePanel and BattlePanel.guideType then
-- LogError("11111111111111==="..BattlePanel.guideType)
-- if BattlePanel.guideType==3 then
-- LogError("222222222")
-- self.nameParent:SetActive(true)
-- self.proPar:SetActive(true)
-- else
-- self.nameParent:SetActive(false)
-- self.proPar:SetActive(false)
-- end
-- else
-- self.nameParent:SetActive(false)
-- self.proPar:SetActive(false)
-- end
self.nameParent:SetActive(true)
self.proPar:SetActive(true)
self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[role.roleData.star])
self.starGrid = Util.GetGameObject(go, "StarGrid")

View File

@ -267,6 +267,11 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
table.insert(patFaceAllData,v)
end
end
elseif v.Type==23 then--首充拍脸
if PlayerPrefs.GetInt(PlayerManager.uid.."FirstRecharge") == 0 then
UIManager.OpenPanel(UIName.FirstRechargePanel)
PlayerPrefs.SetInt(PlayerManager.uid.."FirstRecharge",1)
end
else
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
table.insert(patFaceAllData,v)

View File

@ -223,6 +223,9 @@ function FightPointPassMainPanel:InitComponent()
-- 开服福利
this.UI_Effect_MuBiaoJiangLi = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnOpenSeverWelfare/UI_Effect_MuBiaoJiangLi")
this.btnOpenSeverWelfare = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnOpenSeverWelfare")
this.btnFirstRechar = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnFirstRecharge")
Util.GetGameObject(this.btnFirstRechar, "Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite("r_zjm_huodongicon-shunwukongshouchong_zh")
this.firstRedPoint=Util.GetGameObject(this.btnFirstRechar, "redPoint")
this.OpenSeverWelfare = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnOpenSeverWelfare/bg")
this.OpenSeverWelfareicon = Util.GetGameObject(this.UI_Effect_MuBiaoJiangLi, "UI_MuBiaoJiangLi_Import_05"):GetComponent("Image")
this.OpenSeverWelfareiconText = Util.GetGameObject(this.OpenSeverWelfare, "iconText"):GetComponent("Image")
@ -312,6 +315,9 @@ function FightPointPassMainPanel:BindEvent()
Util.AddClick(this.goVipButton, function()
UIManager.OpenPanel(UIName.VipPanelV2)
end)
Util.AddClick(this.btnFirstRechar, function()
UIManager.OpenPanel(UIName.FirstRechargePanel)
end)
Util.AddClick(this.getRewardButton, function()
local t, task = VipManager.GetVipTaskShowInFight()
@ -326,6 +332,7 @@ function FightPointPassMainPanel:BindEvent()
BindRedPointObject(RedPointType.DailyTaskMain, this.dailyRedPoint)
BindRedPointObject(RedPointType.SecretTer_IsCanFight, this.fightRP)
BindRedPointObject(RedPointType.XiaoYaoYouRedPoint, this.xiaoyaoRedPoint)
BindRedPointObject(RedPointType.FirstRecharge, this.firstRedPoint)
-- BindRedPointObject(RedPointType.FightLevel, this.btnFightLevelRedPoint)
end
@ -401,6 +408,12 @@ end
-- 从战斗出来会加载两次
function FightPointPassMainPanel:OnShow()
CheckRedPointStatus(RedPointType.XiaoYaoYouRedPoint)
local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FirstRecharge)
if activityId and activityId~=0 and DynamicActivityManager.IsQualifiled(1) then
this.btnFirstRechar:SetActive(true)
else
this.btnFirstRechar:SetActive(false)
end
-- 功能引导存在时不再显示成长界面
if FightPointPassManager.GetIsOpenRewardUpTip() and not GuideManager.IsFunctionGuideExist() then
local oldLevelId = FightPointPassManager.lastPassFightId
@ -813,6 +826,7 @@ function FightPointPassMainPanel:OnDestroy()
ClearRedPointObject(RedPointType.DailyTaskMain, this.dailyRedPoint)
ClearRedPointObject(RedPointType.SecretTer_IsCanFight, this.fightRP)
ClearRedPointObject(RedPointType.XiaoYaoYouRedPoint, this.xiaoyaoRedPoint)
ClearRedPointObject(RedPointType.FirstRecharge, this.firstRedPoint)
-- ClearRedPointObject(RedPointType.FightLevel, this.btnFightLevelRedPoint)
-- 头像层级
if this.playerInfoView then

View File

@ -408,7 +408,7 @@ function this.CheckBtnShow()
-- 新人商城显示判断
local xrId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop)
if xrId and xrId > 0 then
this.btnXinRen:SetActive(true)
this.btnXinRen:SetActive(false)
this.RefreshXinRenShow()
else
this.btnXinRen:SetActive(false)

View File

@ -371,16 +371,23 @@ function this.ShowDayDataActivityReward()
else
Util.AddOnceClick(getBtn, function()
if isGetState then
NetManager.GetActivityRewardRequest(curRewardTaskData.missionId, activityData.activityId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
btnText.text = "已领取"
getBtn:GetComponent("Button").enabled = false
Util.SetGray(getBtn,true)
redPoint:SetActive(false)
CheckRedPointStatus(RedPointType.JourneyWithWind)
this.ShowDayBtnsData()
if MonthCardManager.GetMonthCardIsOpen(MONTH_CARD_TYPE.LUXURYMONTHCARD) and MonthCardManager.GetMonthCardIsOpen(MONTH_CARD_TYPE.GIFT) then
NetManager.GetActivityRewardRequest(curRewardTaskData.missionId, activityData.activityId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
btnText.text = "已领取"
getBtn:GetComponent("Button").enabled = false
Util.SetGray(getBtn,true)
redPoint:SetActive(false)
CheckRedPointStatus(RedPointType.JourneyWithWind)
this.ShowDayBtnsData()
end)
end)
end)
else
MsgPanel.ShowTwo("当前仍有未激活的月卡,是否前往查看激活?", function()
end, function()
JumpManager.GoJump(36004)
end, Language[10731], Language[10019],nil, false)
end
else
if curRewardTaskData.state == 0 then
PopupTipPanel.ShowTip("完成当日所有目标才可领取!")
@ -424,7 +431,7 @@ function this.ShowDayDataGiftBag()
local btnFinish = Util.GetGameObject(go, "pre2/btnFinish")
btnFinish:SetActive(false)
local headName = Util.GetGameObject(go, "headImage/name")
headName:GetComponent("Text").text = "额外礼包"
headName:GetComponent("Text").text = "免费礼包"
local size = headName:GetComponent("RectTransform").sizeDelta
size.x = 108.3
headName.transform.sizeDelta = size

View File

@ -279,7 +279,6 @@ function this:SingleTask(rewardItem, rewardSingleData)
end
end
end
for i = 1, #rewardSingleData.Reward do
if not itemsList[rewardItem][i] then
itemsList[rewardItem][i] = SubUIManager.Open(SubUIConfig.ItemView,box1.transform)
@ -287,7 +286,7 @@ function this:SingleTask(rewardItem, rewardSingleData)
maskList[rewardItem][i] = newObjToParent(mask, itemsList[rewardItem][i])
maskList[rewardItem][i].transform:DOAnchorPos(Vector3(0.7,-3,0),0)
end
if rewardSingleData.Reward[i] then
if rewardSingleData.Reward[i] and rewardSingleData.Reward[i].item[1] and rewardSingleData.Reward[i].item[1]~=0 then
if rewardSingleData.Reward[i].type == 1 then
itemsList[rewardItem][i].gameObject.transform:SetParent(box1.transform)
else
@ -296,7 +295,6 @@ function this:SingleTask(rewardItem, rewardSingleData)
itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
itemsList[rewardItem][i].gameObject:SetActive(true)
itemsList[rewardItem][i]:OnOpen(false, rewardSingleData.Reward[i].item, 0.8,false,false,false,sortingOrder)
SetMask(rewardItem,i,rewardSingleData.Reward[i].type)
else
itemsList[rewardItem][i].gameObject:SetActive(false)
@ -344,7 +342,6 @@ function this:OnBtnDealClicked(rewardItem,rewardSingleData)
if (rewardSingleData.state == 0) or--任务未领取
(rewardSingleData.state == 1 and treasureState) then--任务未领取+礼包已购买
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
LogBlue("activityId:"..id)
NetManager.GetActivityRewardRequest(rewardSingleData.level,id,function(msg)
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1)
--需要刷新界面

View File

@ -159,6 +159,11 @@ function this.RefreshMonthCardRedPoint(type)
end
--所有月卡红点检测
function this.AllRefreshMonthCardRedPoint()
--PlayerPrefs.SetInt(PlayerManager.uid.."monthCard", 0)
local aaa=PlayerPrefs.GetInt(PlayerManager.uid.."monthCard",0)
if aaa==0 then
return true
end
for i = 1, #monthCardData do
if monthCardData[i].state == 1 then
return true

View File

@ -99,6 +99,7 @@ function MonthCardPage:OnShow(_sortingOrder)
sortingOrder = _sortingOrder
MonthCardManager.RefreshMonthCardEnd()
PlayerPrefs.SetInt(PlayerManager.uid.."monthCard", 1)
self:RefreshStoneShow()
end

View File

@ -106,6 +106,7 @@ function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.BaoGeTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_ChangeHeroProConfirm",0)
PlayerPrefs.SetInt("IsCheckWeekCard_"..PlayerManager.uid, 0)
PlayerPrefs.SetInt(PlayerManager.uid.."monthCard", 0)
PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen,0)
end

View File

@ -230,30 +230,33 @@ function this:showRewardQinglong()
for j=1,#reward.Reward do
local id = reward.Reward[j].item[1]
local num = reward.Reward[j].item[2]
if reward.Reward[j].type == 2 then
if not indirect[id] then
indirect[id] = 0
end
indirect[id] = indirect[id] + num
if reward.state ~= -1 then
if level >= reward.level then
if not direct[id] then
direct[id] = 0
end
direct[id] = direct[id] + num
if id~=0 then
if reward.Reward[j].type == 2 then
if not indirect[id] then
indirect[id] = 0
end
end
else
if reward.state == 0 or reward.state == -2 then
if level >= reward.level then
if not direct[id] then
direct[id] = 0
indirect[id] = indirect[id] + num
if reward.state ~= -1 then
if level >= reward.level then
if not direct[id] then
direct[id] = 0
end
direct[id] = direct[id] + num
end
end
else
if reward.state == 0 or reward.state == -2 then
if level >= reward.level then
if not direct[id] then
direct[id] = 0
end
direct[id] = direct[id] + num
end
direct[id] = direct[id] + num
end
end
end
end
end
this:SetItem(direct,indirect)
@ -273,7 +276,7 @@ function this:SetDataList(rewardData)
for i = 1, #rewardData do
local id = rewardData[i].id
local num = rewardData[i].num
if not temp[id] then
if not temp[id] and id~=0 then
temp[id] = 0
end
temp[id] = temp[id] + num

View File

@ -80,12 +80,12 @@ function this:Caculate(templv)
for j=1,#reward.Reward do
local id = reward.Reward[j].item[1]
local num = reward.Reward[j].item[2]
if reward.Reward[j].type == 1 then
if reward.Reward[j].type == 1 and id~=0 then
if not direct[id] then
direct[id] = 0
end
direct[id] = direct[id] + num
elseif reward.Reward[j].type == 2 and treasureState then
elseif reward.Reward[j].type == 2 and treasureState and id~=0 then
if not direct[id] then
direct[id] = 0
end

View File

@ -22,6 +22,7 @@ function this:InitComponent(gameObject)
this.okBtnTxt=Util.GetGameObject(gameObject,"OkBtn/Text"):GetComponent("Text")
this.okBtnTxt.text="领 取"
this.anim = Util.GetGameObject(gameObject, "Body/boxIcon"):GetComponent("Animator")
this.boxBtn = Util.GetGameObject(gameObject, "Body/boxIcon")
end
function this:BindEvent()
@ -41,6 +42,9 @@ function this:BindEvent()
--this:ShowInfo()
end)
end)
Util.AddClick(this.boxBtn,function()
UIManager.OpenPanel(UIName.RewardBoxPanel,nil,81185)
end)
end

View File

@ -68,7 +68,7 @@ function EveryDayGiftNew:InitComponent()
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.jiantou=Util.GetGameObject(self.gameObject, "jiantou")
self.lightList = {
Util.GetGameObject(self.freeBtnAnim.gameObject,"bg_ray"),
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 1"),
@ -101,6 +101,11 @@ function EveryDayGiftNew:OnOpen(_activityConfig,_index,parent)
self.pageIndex = _index
self.parent = parent
self.gameObject.name = "EveryDayGiftNew"..self.actConfig.Id
if self.actConfig.Id==89 or self.actConfig.Id==61 or self.actConfig.Id==60 or self.actConfig.Id==67 then
self.jiantou.gameObject:SetActive(true)
local jiantouAnim = self.jiantou.gameObject:GetComponent(typeof(PlayFlyAnim))
jiantouAnim:PlayAnim(false)
end
end
function EveryDayGiftNew:OnSortingOrderChange(_sortingOrder)