diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 5d325290e7..684e75445a 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -5043,6 +5043,86 @@ MonoBehaviour:
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &2854168830860709693
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2794461961453412777}
+ - component: {fileID: 7009010040367424077}
+ - component: {fileID: 757626557383606599}
+ m_Layer: 0
+ m_Name: Star
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2794461961453412777
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2854168830860709693}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -93.25}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4250835300878011901}
+ 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: 312, y: 0}
+ m_SizeDelta: {x: 136.09998, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7009010040367424077
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2854168830860709693}
+ m_CullTransparentMesh: 0
+--- !u!114 &757626557383606599
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2854168830860709693}
+ 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.97647065, g: 0.7607844, b: 0.5058824, 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: 40
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 40
+ m_Alignment: 5
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u9700\u898130"
+ LanguageIndex: 0
--- !u!1 &2919348480456994023
GameObject:
m_ObjectHideFlags: 0
@@ -8155,6 +8235,80 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5208191871158868198
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3827739693979613605}
+ - component: {fileID: 4742467671142405772}
+ - component: {fileID: 2489786142445598379}
+ m_Layer: 0
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3827739693979613605
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5208191871158868198}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.7, y: 0.7, z: 0.8}
+ m_Children: []
+ m_Father: {fileID: 4250835300878011901}
+ 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: 405.6, y: 2.7}
+ m_SizeDelta: {x: 72, y: 70}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4742467671142405772
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5208191871158868198}
+ m_CullTransparentMesh: 0
+--- !u!114 &2489786142445598379
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5208191871158868198}
+ 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: 8908080ead3926f4e9e9951397b9e29b, 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 &5356778114707042482
GameObject:
m_ObjectHideFlags: 0
@@ -12433,6 +12587,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2313678692522721823}
+ - {fileID: 2794461961453412777}
+ - {fileID: 3827739693979613605}
m_Father: {fileID: 1126952660353491259}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
index ca9cc0e5de..e84afba83a 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
@@ -276,7 +276,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: -0.35732, y: 425}
+ m_AnchoredPosition: {x: -0.35732, y: 621}
m_SizeDelta: {x: 909.91, y: 76.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &200517447018466473
@@ -653,10 +653,10 @@ RectTransform:
m_Father: {fileID: 199198497822447983}
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.7999878, y: -43.5}
- m_SizeDelta: {x: 76.4, y: 854.6}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: -140}
+ m_SizeDelta: {x: 932.4, y: 1294.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &201167383377872827
CanvasRenderer:
@@ -992,8 +992,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 463.10007, y: 377.71997}
- m_SizeDelta: {x: 912.8, y: 224.5}
+ m_AnchoredPosition: {x: 463.10007, y: 573.72}
+ m_SizeDelta: {x: 912.8, y: 424.94}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &201531387265230511
CanvasRenderer:
@@ -1919,7 +1919,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: 56.52002}
+ m_AnchoredPosition: {x: 0, y: 184}
m_SizeDelta: {x: 856.10004, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &19442842446654225
@@ -1975,7 +1975,7 @@ MonoBehaviour:
- initV3: {x: 0, y: -300, z: 0}
initFloat: 0
isInit: 1
- changeV3: {x: 0, y: 0, z: 0}
+ changeV3: {x: 0, y: 100, z: 0}
changeFloat: 0
duration: 0.8
delay: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
index 768cc510cd..ff88ee0dbb 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
@@ -873,7 +873,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: 54.5, y: -39.799927}
+ m_AnchoredPosition: {x: 316, y: -39.799927}
m_SizeDelta: {x: 398.7, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222390358621317692
@@ -1162,7 +1162,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: 90, y: -38.4}
+ m_AnchoredPosition: {x: 338, y: -38.4}
m_SizeDelta: {x: 48, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222828081197013252
@@ -1750,7 +1750,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -2510,7 +2510,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -2760,7 +2760,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -2987,8 +2987,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -138, y: -39}
- m_SizeDelta: {x: 70, y: 76}
+ m_AnchoredPosition: {x: 112, y: -39}
+ m_SizeDelta: {x: 138, y: 86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6760419458894981537
CanvasRenderer:
@@ -3018,7 +3018,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 48323a0121f515044a999ca5bfe2f6c3, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 2afbd36bb3abea245896431bcb14b30c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -3556,7 +3556,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -4138,7 +4138,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -5131,7 +5131,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: 54.5, y: -39.799927}
+ m_AnchoredPosition: {x: 316, y: -39.799927}
m_SizeDelta: {x: 398.7, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3360534592408092687
@@ -5479,8 +5479,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -138, y: -39}
- m_SizeDelta: {x: 70, y: 76}
+ m_AnchoredPosition: {x: 112, y: -39}
+ m_SizeDelta: {x: 138, y: 86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6004770650672765777
CanvasRenderer:
@@ -5510,7 +5510,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 48323a0121f515044a999ca5bfe2f6c3, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 2afbd36bb3abea245896431bcb14b30c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -6379,7 +6379,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -6472,7 +6472,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -6632,7 +6632,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -7620,7 +7620,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -7769,7 +7769,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: 90, y: -38.4}
+ m_AnchoredPosition: {x: 338, y: -38.4}
m_SizeDelta: {x: 48, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1728879338439505814
@@ -7946,7 +7946,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -8078,7 +8078,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 398, y: -545.19995}
+ m_AnchoredPosition: {x: 398, y: -930.9}
m_SizeDelta: {x: 300, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &430177342777519911
@@ -8102,7 +8102,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9716981, g: 0.768542, b: 0.34376112, a: 1}
+ m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -8625,7 +8625,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -8704,7 +8704,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index cc46b6f328..b1a8f26fb9 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -2410,7 +2410,7 @@ BATTLE_TYPE = {
BACK_BATTLE = 1000, -- 系统战斗回放
EndlessMpaFight = 22, -- 无尽副本
}
---_1 本服 _2 跨服
+--_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1},
[2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 2},
[3] = { bgImage = "r_zjm_paihangbang_banner03_zh", name = Language[12098] ,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 3},
@@ -2435,6 +2435,11 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
[21] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 7},
[22] = { bgImage = "r_zjm_paihangbang_banner003_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 8},
+ [23] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_PERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 23},
+ [24] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 24},
+ [25] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLPERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 25},
+ [26] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLGUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 26},
+
}
SoulPrintSpriteByQuantity={
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
index 8e2131a646..ad0a72497a 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
@@ -52,6 +52,8 @@ function PracticeStatePreview:SetSingleData(index,_go,_data)
local specialText = Util.GetGameObject(_go,"SpecialText"):GetComponent("Text")
local textPre = Util.GetGameObject(_go,"Content/Text")
local content = Util.GetGameObject(_go,"Content")
+ local star = Util.GetGameObject(_go,"title/Star"):GetComponent("Text")
+ local starImg = Util.GetGameObject(_go,"title/Image")
if not self.textList[_go] then
self.textList[_go] = {}
end
@@ -102,6 +104,18 @@ function PracticeStatePreview:SetSingleData(index,_go,_data)
specialText.gameObject:SetActive(false)
end
title.text = string.format("%s期",_data.RealmName)
+ if _data.NeedStarNum ~= 0 then
+ star.gameObject:SetActive(true)
+ starImg.gameObject:SetActive(true)
+ if _data.NeedStarNum > PracticeManager.StarNum then
+ star.text = string.format("需要%s",_data.NeedStarNum)
+ else
+ star.text = string.format("需要%s",_data.NeedStarNum)
+ end
+ else
+ star.gameObject:SetActive(false)
+ starImg.gameObject:SetActive(false)
+ end
ForceRebuildLayout(_go.transform)
_go:SetActive(true)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
index 1a6ee2985f..cdb455f15a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
@@ -20,6 +20,7 @@ function PokemonGetInfoPopup:InitComponent()
proList[i] = Util.GetGameObject(self.transform,"bg/PokemonInfo/pro/singlePro ("..i..")")
end
+ this.skillLvGo=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage")
this.skillName=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/nameText"):GetComponent("Text")
this.skillLv=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage/skillLv"):GetComponent("Text")
this.skillIcon=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/icon"):GetComponent("Image")
@@ -69,7 +70,6 @@ function this.GetShowPanelData()
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, pokemonBackData.star,2,Vector2.New(60,60))
--属性
local allAddProVal=PokemonManager.GetSinglePokemonAddProDataByLvAndStar(pokemonBackData.tempId,pokemonBackData.level,pokemonBackData.star)
- proList[0]:SetActive(true)
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453]
Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = pokemonBackData.level
Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_jinengdian05")
@@ -96,6 +96,7 @@ function this.GetShowPanelData()
end
local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
this.skillName.text = GetLanguageStrById(curSkillConFig.Name)
+ this.skillLvGo:SetActive(true)
this.skillLv.text = curSkillConFig.Level
this.skillIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(curSkillConFig.Icon))
Util.AddOnceClick(this.skillBtn, function()
@@ -111,7 +112,9 @@ function this.NoGetShowPanelData()
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, 0,2,Vector2.New(60,60))
--属性
local allAddProVal = PokemonManager.GetSinglePokemonAddProDataBySid(pokemonSid) --this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star)
- proList[0]:SetActive(false)
+ Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453]
+ Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = "1/"..pokemonSData.MaxLevel
+ Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_jinengdian05")
local index = 0
for key, value in pairs(allAddProVal) do
index = index + 1
@@ -135,10 +138,12 @@ function this.NoGetShowPanelData()
end
local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
this.skillName.text = GetLanguageStrById(curSkillConFig.Name)
- this.skillLv.text = curSkillConFig.Level
+ this.skillLvGo:SetActive(false)
+ -- this.skillLv.text = curSkillConFig.Level
this.skillIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(curSkillConFig.Icon))
Util.AddOnceClick(this.skillBtn, function()
- UIManager.OpenPanel(UIName.PokemonSkillInfoPopup,pokemonSid,1,0)
+ -- UIManager.OpenPanel(UIName.PokemonSkillInfoPopup,pokemonSid,1,0)
+ UIManager.OpenPanel(UIName.PokemonAllSkillInfoPopup,pokemonSid,1,0)
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
index ac12db6eef..999043f3c7 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
@@ -1,5 +1,6 @@
require("Base/BasePanel")
RewardTalismanSingleShowPopup = Inherit(BasePanel)
+local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig)
local type
local dId
local sId
@@ -24,10 +25,12 @@ function RewardTalismanSingleShowPopup:InitComponent()
self.refineLv=Util.GetGameObject(self.transform, "Content/bg/armorInfo/refineLv"):GetComponent("Text")
self.curMainProscroll=Util.GetGameObject(self.transform, "Content/mainProScroll")
+ self.curMainProText=Util.GetGameObject(self.transform, "Content/mainProScroll/Text"):GetComponent("Text")
self.curMainProGrid=Util.GetGameObject(self.transform, "Content/mainProScroll/proGrid")
self.curotherProscroll=Util.GetGameObject(self.transform, "Content/otherProScroll")
self.otherProPre=Util.GetGameObject(self.transform, "Content/proPre")
self.otherProGrid=Util.GetGameObject(self.transform, "Content/otherProScroll/proGrid")
+ self.otherProText=Util.GetGameObject(self.transform, "Content/otherProScroll/Text"):GetComponent("Text")
self.curCastInfo=Util.GetGameObject(self.transform, "Content/skillObject/skillInfo"):GetComponent("Text")
self.castInfoObject=Util.GetGameObject(self.transform, "Content/skillObject")
self.castInfoObject:SetActive(false)
@@ -219,6 +222,10 @@ function RewardTalismanSingleShowPopup:OnShowPanelData()
if self.jumpViewList and #self.jumpViewList then
self.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,self.equipProGridCom.spacing*(#self.jumpViewList))
end
+
+ local data = jewelConfig[sId]
+ self.curMainProText.text = string.format("基础属性 [强化等级:%s/%s]",lv,data.Max[1])
+ self.otherProText.text = string.format("基础属性 [精炼等级:%s/%s]",refineLv,data.Max[2])
end
--道具 和 装备分解 发送请求后 回调
function RewardTalismanSingleShowPopup:SendBackResolveReCallBack(drop)
diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
index 0aa12efa8f..5ef4e6978b 100644
--- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
@@ -145,6 +145,7 @@ function this.GetPreViewData()
local data = {}
local configData = ConfigManager.GetConfigDataByKey(ConfigName.XiuXianConfig,"RealmId",i)
data.RealmName = configData.RealmName
+ data.NeedStarNum = configData.NeedStarNum
if configData.RealmDesc then
data.RealmDesc = configData.RealmDesc
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
index 35263a028f..18815b96d9 100644
--- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
@@ -23,17 +23,16 @@ function this.InitData(rankType,fun,id,rankIndex)
local isCross = 0
for i = 1, #rankKingList do
if rankType == rankKingList[i].rankType then
- if rankKingList[i].isRankingMainPanelShow >= 2 then
+ if rankKingList[i].isRankingMainPanelShow == 2 or rankKingList[i].isRankingMainPanelShow == 3 then
isCross = 1
end
+ if rankKingList[i].isRankingMainPanelShow == 4 then--跨服十绝阵判断
+ if PlayerManager.isCross == 1 then
+ isCross = 1
+ end
+ end
end
end
- --跨服十绝阵判断
- -- if cur_rankType == RANK_TYPE.GUILD_DEATHPOS_PERSON or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_GUILD or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_ALLPERSON or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_ALLGUILD then
- -- if PlayerManager.isCross == 1 then
- -- isCross = 1
- -- end
- -- end
-- LogYellow("cur_rankType "..cur_rankType.." isCross "..isCross)
NetManager.RequestRankInfo(rankType, function (msg)--请求数据
this.ReceiveRankingData(msg,fun)
@@ -50,9 +49,14 @@ function this.RequestNextWarPowerPageData(fun)
local isCross = 0
for i = 1, #rankKingList do
if cur_rankType == rankKingList[i].rankType then
- if rankKingList[i].isRankingMainPanelShow >= 2 then
+ if rankKingList[i].isRankingMainPanelShow == 2 or rankKingList[i].isRankingMainPanelShow == 3 then
isCross = 1
end
+ if rankKingList[i].isRankingMainPanelShow == 4 then
+ if PlayerManager.isCross == 1 then
+ isCross = 1
+ end
+ end
end
end
NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
index 29a8e37d6b..93f1c7f1f7 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
@@ -196,6 +196,7 @@ function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_
position = _position--treelv
end
function RoleEquipTreasureChangePopup:OnShow()
+ Log("openType:"..tostring(type))
--初始化
for i = 1, 2 do
this.treasurePanel[i].bg:SetActive(false)
@@ -223,8 +224,8 @@ function RoleEquipTreasureChangePopup:OnShow()
this.treasurePanel[1].EquipBtns:SetActive((type == 1) or (type == 2))
this.treasurePanel[2].EquipBtns:SetActive(type == 3)
this.treasurePanel[1].EquipBtnAdd:SetActive(type == 1)
- this.treasurePanel[1].EquipBtnStrong:SetActive(type == 1 or (type == 2) or (type == 4))
- this.treasurePanel[1].EquipBtnRefine:SetActive(type == 1 or (type == 2) or (type == 4))
+ this.treasurePanel[1].EquipBtnStrong:SetActive((type == 2) or (type == 4))
+ this.treasurePanel[1].EquipBtnRefine:SetActive((type == 2) or (type == 4))
this.treasurePanel[1].EquipBtnRemove:SetActive((type == 2) or (type == 4))
this.curEquipSign.gameObject:SetActive(type == 3)
@@ -336,7 +337,7 @@ function this.ShowEquipData(i)
end
this.treasurePanel[i].qualityText.text = GetStringByEquipQua(equipConfigData.Level,GetQuaStringByEquipQua(equipConfigData.Level))
- this.treasurePanel[i].EquipName.text = GetLanguageStrById(itemConfigData.Name)
+ this.treasurePanel[i].EquipName.text=GetStringByEquipQua(itemConfigData.Quantity,GetLanguageStrById(itemConfigData.Name))
this.treasurePanel[i].EquipTypeText.text = string.format(Language[11803],EquipTreasureTypeStr[equipConfigData.Location])
this.treasurePanel[i].EquipFrame.sprite = Util.LoadSprite(equipData[i].frame)
this.treasurePanel[i].EquipIcon.sprite = Util.LoadSprite(equipData[i].icon)