root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【云游商人】提交

dev_chengFeng
ZhangBiao 2021-04-21 20:24:06 +08:00
parent 146929c099
commit 8e76fc3e5d
8 changed files with 343 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab
View File

@ -1,79 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &348512987324312774
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5033866329323408745}
- component: {fileID: 3722520375342281568}
- component: {fileID: 1961621544861120045}
m_Layer: 5
m_Name: titleIma
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5033866329323408745
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 348512987324312774}
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: 8478406734519293774}
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: 0.010009766, y: 647.75}
m_SizeDelta: {x: 1080, y: 476.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3722520375342281568
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 348512987324312774}
m_CullTransparentMesh: 0
--- !u!114 &1961621544861120045
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 348512987324312774}
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!1 &1290591318187227558
GameObject:
m_ObjectHideFlags: 0
@ -107,7 +33,7 @@ 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_AnchoredPosition: {x: -1086, y: 0}
m_SizeDelta: {x: 1080, y: 265}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6586228766960284520
@ -223,9 +149,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8671287736119384416}
- {fileID: 5033866329323408745}
- {fileID: 4416313184210075307}
- {fileID: 5261801766376235942}
- {fileID: 7105731049622345673}
m_Father: {fileID: 2384432804281337260}
m_RootOrder: 0
@ -272,80 +195,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2163297307120916195
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4416313184210075307}
- component: {fileID: 8294429838853327920}
- component: {fileID: 7877007698832320931}
m_Layer: 5
m_Name: titleTipBg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4416313184210075307
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2163297307120916195}
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: 8478406734519293774}
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: 0, y: 644.98755}
m_SizeDelta: {x: 1080, y: 470.98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8294429838853327920
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2163297307120916195}
m_CullTransparentMesh: 0
--- !u!114 &7877007698832320931
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2163297307120916195}
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: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2384432804281337261
GameObject:
m_ObjectHideFlags: 0
@ -543,86 +392,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4287555123627433639
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5261801766376235942}
- component: {fileID: 3710380387488401059}
- component: {fileID: 3843245318487694238}
m_Layer: 5
m_Name: titleTip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5261801766376235942
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4287555123627433639}
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: 8478406734519293774}
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: -167, y: 572}
m_SizeDelta: {x: 700, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3710380387488401059
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4287555123627433639}
m_CullTransparentMesh: 0
--- !u!114 &3843245318487694238
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4287555123627433639}
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.8425819, g: 0.8584906, b: 0.8382432, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
LanguageIndex: 0
--- !u!1 &5759065364542601348
GameObject:
m_ObjectHideFlags: 0
@ -790,7 +559,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8478406734519293774}
m_RootOrder: 4
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}

2
Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab
View File

@ -5082,7 +5082,7 @@ 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: 2262, y: -311}
m_AnchoredPosition: {x: 1155, y: -311}
m_SizeDelta: {x: 1080, y: 240}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2601667954024718418

158
Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab
View File

@ -33814,6 +33814,80 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &7129431158077971382
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4693936238204026768}
- component: {fileID: 8714951235807467066}
- component: {fileID: 5031217408243046854}
m_Layer: 5
m_Name: titleIma
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4693936238204026768
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7129431158077971382}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -26.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2542118471955123022}
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}
m_AnchoredPosition: {x: 0.010009766, y: 647.75}
m_SizeDelta: {x: 1080, y: 476.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8714951235807467066
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7129431158077971382}
m_CullTransparentMesh: 0
--- !u!114 &5031217408243046854
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7129431158077971382}
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!1 &7136434605234987920
GameObject:
m_ObjectHideFlags: 0
@ -33919,6 +33993,8 @@ RectTransform:
- {fileID: 908440470530249504}
- {fileID: 2494416448225732453}
- {fileID: 1898452653011862347}
- {fileID: 4693936238204026768}
- {fileID: 4510560238410325023}
m_Father: {fileID: 8494200122882599417}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -38699,6 +38775,86 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &8349047592718457035
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4510560238410325023}
- component: {fileID: 1226811690247165520}
- component: {fileID: 21522107339161612}
m_Layer: 5
m_Name: titleTip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4510560238410325023
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8349047592718457035}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -26.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2542118471955123022}
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}
m_AnchoredPosition: {x: 146, y: 638}
m_SizeDelta: {x: 700, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1226811690247165520
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8349047592718457035}
m_CullTransparentMesh: 0
--- !u!114 &21522107339161612
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8349047592718457035}
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.8425819, g: 0.8584906, b: 0.8382432, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
LanguageIndex: 0
--- !u!1 &8494200122882599416
GameObject:
m_ObjectHideFlags: 0
@ -43481,6 +43637,6 @@ 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.000024796, y: 0}
m_AnchoredPosition: {x: -962, y: 0}
m_SizeDelta: {x: 838.1, y: 224}
m_Pivot: {x: 0.5, y: 0.5}

124
Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
View File

@ -5947,6 +5947,123 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &1248735169116997036
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 794508322796561265}
- component: {fileID: 2105235833848743481}
- component: {fileID: 183036745004406584}
- component: {fileID: 2726660459035886872}
m_Layer: 5
m_Name: equiped
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &794508322796561265
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248735169116997036}
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: 3587805045687122576}
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: -6.4, y: 15.7}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2105235833848743481
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248735169116997036}
m_CullTransparentMesh: 0
--- !u!114 &183036745004406584
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248735169116997036}
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: 369d888ee69e51c44a4880efad895252, 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 &2726660459035886872
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248735169116997036}
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: 0
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: 183036745004406584}
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 &1325366485123357523
GameObject:
m_ObjectHideFlags: 0
@ -17083,13 +17200,14 @@ RectTransform:
m_Children:
- {fileID: 1509959196885734116}
- {fileID: 8541680393093446218}
- {fileID: 794508322796561265}
m_Father: {fileID: 7168560341765080648}
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}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_AnchoredPosition: {x: -616, y: 9}
m_SizeDelta: {x: 150, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4243083436224165887
GameObject:
@ -29498,7 +29616,7 @@ 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_AnchoredPosition: {x: -10.3, y: 22.7}
m_SizeDelta: {x: 140, y: 125}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5435154210805497575

11
Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
View File

@ -3539,4 +3539,15 @@ function this.UpdateSingleHeroWarPower(dynamicId)
--LogGreen(heroDatas[dynamicId].heroConfig.ReadingName.." "..heroDatas[dynamicId].lv.." warPower ".. heroDatas[dynamicId].warPower)
end
end
function this.GetEquipedEquipList()
local EquipedEquipList = {}
for _, heroData in ipairs(this.heroDataLists) do
for i = 1, #heroData.equipIdList do
local data = heroData.equipIdList[i]
table.insert(EquipedEquipList,data)
end
end
return EquipedEquipList
end
return this

24
Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua
View File

@ -21,6 +21,7 @@ end
function CommonActPage:InitComponent()
self.bg = Util.GetGameObject(self.gameObject, "Bg/banner"):GetComponent("Image")
self.scrollItem = Util.GetGameObject(self.gameObject, "scrollItem")
self.time = Util.GetGameObject(self.gameObject, "time")
self.timeText = Util.GetGameObject(self.time, "timeText"):GetComponent("Text")
@ -28,9 +29,6 @@ function CommonActPage:InitComponent()
self.helpPosition = self.btnHelp:GetComponent("RectTransform").localPosition
self.itemPre = Util.GetGameObject(self.gameObject, "ItemPre")
self.titleBgIma = Util.GetGameObject(self.gameObject, "Bg/banner"):GetComponent("Image")
self.titleIma = Util.GetGameObject(self.gameObject, "Bg/titleIma"):GetComponent("Image")
self.titleTip = Util.GetGameObject(self.gameObject, "Bg/titleTip"):GetComponent("Text")
-- 设置循环滚动，万一内容不停地加
local rootHight = self.scrollItem.transform.rect.height
@ -79,25 +77,7 @@ function CommonActPage:OnShow(_sortingOrder)
end
end
if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then
self.titleBgIma.sprite = Util.LoadSprite(self.actConfig.Icon[3])
end
if self.actConfig.Icon[4] and self.actConfig.Icon[4] ~= "" then
self.titleIma.gameObject:SetActive(true)
self.titleIma.sprite = Util.LoadSprite(self.actConfig.Icon[4])
self.titleIma:SetNativeSize()
self.titleIma.transform.localPosition = Vector3.New(self.actConfig.TitleImapos[1],self.actConfig.TitleImapos[2],self.actConfig.TitleImapos[3])
else
self.titleIma.gameObject:SetActive(false)
end
if self.actConfig.TitleText and self.actConfig.TitleText ~= "" then
local str = string.split(GetLanguageStrById(self.actConfig.TitleText),"|")
self.titleTip.text = str[1]
self.titleTip.transform.localPosition = Vector3.New((str[2] or 0),(str[3] or 0),(str[4] or 0))
self.titleTip.gameObject:SetActive(true)
else
self.titleTip.gameObject:SetActive(false)
self.bg.sprite = Util.LoadSprite(self.actConfig.Icon[3])
end
--拿取数据

22
Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua
View File

@ -21,6 +21,9 @@ end
function ExpertPage:InitComponent()
self.bg = Util.GetGameObject(self.gameObject, "Bg/titleBg"):GetComponent("Image")
self.titleIma = Util.GetGameObject(self.gameObject, "Bg/titleIma"):GetComponent("Image")
self.titleTip = Util.GetGameObject(self.gameObject, "Bg/titleTip"):GetComponent("Text")
self.scrollItem = Util.GetGameObject(self.gameObject, "Scroll")
self.time = Util.GetGameObject(self.gameObject, "time")
self.timeText = Util.GetGameObject(self.time, "timeText"):GetComponent("Text")
@ -78,6 +81,25 @@ function ExpertPage:OnShow(_sortingOrder)
if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then
self.bg.sprite = Util.LoadSprite(self.actConfig.Icon[3])
end
if self.actConfig.Icon[4] and self.actConfig.Icon[4] ~= "" then
self.titleIma.gameObject:SetActive(true)
self.titleIma.sprite = Util.LoadSprite(self.actConfig.Icon[4])
self.titleIma:SetNativeSize()
self.titleIma.transform.localPosition = Vector3.New(self.actConfig.TitleImapos[1],self.actConfig.TitleImapos[2],self.actConfig.TitleImapos[3])
else
self.titleIma.gameObject:SetActive(false)
end
if self.actConfig.TitleText and self.actConfig.TitleText ~= "" then
local str = string.split(GetLanguageStrById(self.actConfig.TitleText),"|")
self.titleTip.text = str[1]
self.titleTip.transform.localPosition = Vector3.New((str[2] or 0),(str[3] or 0),(str[4] or 0))
self.titleTip.gameObject:SetActive(true)
else
self.titleTip.gameObject:SetActive(false)
end
if not self.actConfig.HelpId or self.actConfig.HelpId == "" or self.actConfig.HelpId == 0 then
self.btnHelp:SetActive(false)
else

33
Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua
View File

@ -56,10 +56,26 @@ function this:OnShow(_parent,...)
func = _args[2]
local list = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip)
local EquipedEquipList = HeroManager.GetEquipedEquipList()
for i = 1, #data.otherData.needItems do
for j = 1, #list do
if data.otherData.needItems[i] == list[j].itemConfig.Id then
table.insert(self.equipList,list[j])
local sdata = {}
sdata.Id = list[j].itemConfig.Id
sdata.Num = list[j].num
sdata.Equiped = false
table.insert(self.equipList,sdata)
end
end
end
for i = 1, #data.otherData.needItems do
for j = 1, #EquipedEquipList do
if data.otherData.needItems[i] == EquipedEquipList[j] then
local sdata = {}
sdata.Id = EquipedEquipList[j]
sdata.Num = 1
sdata.Equiped = true
table.insert(self.equipList,sdata)
end
end
end
@ -91,31 +107,36 @@ function this:ShowSingleData(item,sdata,index)
local itemtrans = Util.GetGameObject(item,"item")
local itemmask = Util.GetGameObject(item,"mask")
local maskImage = Util.GetGameObject(item,"mask/Image")
local equiped = Util.GetGameObject(item,"equiped")
maskImage:SetActive(false)
equiped:SetActive(sdata.Equiped)
if not self.itemList[index] then
self.itemList[index] = SubUIManager.Open(SubUIConfig.ItemView,itemtrans.transform)
self.itemList[index].gameObject:SetActive(false)
end
self.itemList[index]:OnOpen(false, {sdata.itemConfig.Id,sdata.num}, 1,false,false,false,sortingOrder)
LogGreen("index:"..tostring(index))
self.itemList[index]:OnOpen(false, {sdata.Id,sdata.Num}, 1,true,false,false,sortingOrder)
self.itemList[index].gameObject:SetActive(true)
self.maskList[index] = itemmask
self.maskImageList[index] = maskImage
self.maskImageList[index]:SetActive(data.otherData.selectId == sdata.itemConfig.Id)
self.maskImageList[index]:SetActive(data.otherData.selectId == sdata.Id)
Util.AddOnceClick(self.maskList[index],function ()
for i = 1, #self.maskImageList do
self.maskImageList[i]:SetActive(false)
end
if data.otherData.selectId == sdata.itemConfig.Id then
if data.otherData.selectId == sdata.Id then
self.maskImageList[index]:SetActive(false)
data.otherData.selectId = 0
else
self.maskImageList[index]:SetActive(true)
data.otherData.selectId = sdata.itemConfig.Id
data.otherData.selectId = sdata.Id
end
end)
Util.AddOnceClick(equiped,function ()
PopupTipPanel.ShowTip("装备穿戴中，请卸下装备后升星!")
end)
end
function this:OnClose()