diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 402da501f7..36b90e7768 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -43549,7 +43549,6 @@ GameObject: m_Component: - component: {fileID: 369711104} - component: {fileID: 369711108} - - component: {fileID: 369711107} - component: {fileID: 369711106} - component: {fileID: 369711105} m_Layer: 5 @@ -43600,23 +43599,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &369711107 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 369711103} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!222 &369711106 CanvasRenderer: m_ObjectHideFlags: 0 @@ -44063,7 +44045,6 @@ GameObject: m_Component: - component: {fileID: 601964300} - component: {fileID: 601964304} - - component: {fileID: 601964303} - component: {fileID: 601964302} - component: {fileID: 601964301} m_Layer: 5 @@ -44114,23 +44095,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &601964303 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601964299} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!222 &601964302 CanvasRenderer: m_ObjectHideFlags: 0 @@ -220923,12 +220887,7 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -220953,7 +220912,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221088,12 +221052,7 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221118,7 +221077,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221398,12 +221362,7 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221428,7 +221387,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221563,12 +221527,7 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221593,7 +221552,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221728,12 +221692,7 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221758,7 +221717,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221893,12 +221857,7 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -221923,7 +221882,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index 30ea53992d..177b98e4b2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -173,7 +173,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: 1.3, y: 55.49997} + m_AnchoredPosition: {x: 0, y: 55.49997} m_SizeDelta: {x: 920, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4146893012571655265 @@ -247,7 +247,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: 371.9, y: 1.2001038} + m_AnchoredPosition: {x: 300, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8042439069031667320 @@ -6885,7 +6885,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: -3, y: -297} + m_AnchoredPosition: {x: 0, y: -297} m_SizeDelta: {x: 821.5, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4757695694222023466 @@ -12893,7 +12893,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: 376.6, y: 1.2001038} + m_AnchoredPosition: {x: 300, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7719582181164328458 @@ -12967,7 +12967,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.6, y: 55.49997} + m_AnchoredPosition: {x: 0, y: 55.49997} m_SizeDelta: {x: 920, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7176301689861227510 @@ -13084,7 +13084,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: 3.5, y: -312} + m_AnchoredPosition: {x: 0, y: -312} m_SizeDelta: {x: 608.6, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4475819037436970315 @@ -14178,7 +14178,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.6, y: 40} + m_AnchoredPosition: {x: 0, y: 40} m_SizeDelta: {x: 920, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5925393246020135104 @@ -25267,7 +25267,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: 377.1, y: 1.2001038} + m_AnchoredPosition: {x: 300, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2879338420787377633 @@ -25500,7 +25500,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: -375.3, y: 1.2001038} + m_AnchoredPosition: {x: -300, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5077245990613367403 @@ -26488,7 +26488,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: -375.7, y: 1.2001038} + m_AnchoredPosition: {x: -300, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1021194518210858520 @@ -31649,7 +31649,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: -371, y: 1.2001038} + m_AnchoredPosition: {x: -300, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4233380083872590995 @@ -42583,7 +42583,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: -25.625, y: -300.7} + m_AnchoredPosition: {x: 0, y: -300.7} m_SizeDelta: {x: 776.25, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6671624442038027724 @@ -48484,15 +48484,15 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -48504,17 +48504,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -48649,15 +48649,15 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -48669,17 +48669,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -48814,15 +48814,15 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -48834,17 +48834,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -48979,15 +48979,15 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -48999,17 +48999,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -49144,15 +49144,15 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -49164,17 +49164,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -49309,15 +49309,15 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -49329,17 +49329,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 diff --git a/Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua index f513c27a0f..f0aa837dd7 100644 --- a/Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua @@ -23,7 +23,6 @@ CHATINFO_PRIORITYLEVEL_FIELD = protobuf.FieldDescriptor(); CHATINFO_FREQUENCY_FIELD = protobuf.FieldDescriptor(); CHATINFO_SPEED_FIELD = protobuf.FieldDescriptor(); CHATINFO_MULTIPLE_FIELD = protobuf.FieldDescriptor(); -CHATINFO_USERTITLE_FIELD = protobuf.FieldDescriptor(); GETCHATMESSAGEINFOREQUEST = protobuf.Descriptor(); GETCHATMESSAGEINFOREQUEST_CHATTYPE_FIELD = protobuf.FieldDescriptor(); GETCHATMESSAGEINFOREQUEST_MESSAGEID_FIELD = protobuf.FieldDescriptor(); @@ -229,21 +228,11 @@ CHATINFO_MULTIPLE_FIELD.default_value = 0 CHATINFO_MULTIPLE_FIELD.type = 5 CHATINFO_MULTIPLE_FIELD.cpp_type = 1 -CHATINFO_USERTITLE_FIELD.name = "userTitle" -CHATINFO_USERTITLE_FIELD.full_name = ".rpc.protocols.ChatInfo.userTitle" -CHATINFO_USERTITLE_FIELD.number = 22 -CHATINFO_USERTITLE_FIELD.index = 19 -CHATINFO_USERTITLE_FIELD.label = 1 -CHATINFO_USERTITLE_FIELD.has_default_value = false -CHATINFO_USERTITLE_FIELD.default_value = 0 -CHATINFO_USERTITLE_FIELD.type = 5 -CHATINFO_USERTITLE_FIELD.cpp_type = 1 - CHATINFO.name = "ChatInfo" CHATINFO.full_name = ".rpc.protocols.ChatInfo" CHATINFO.nested_types = {} CHATINFO.enum_types = {} -CHATINFO.fields = {CHATINFO_SENDERID_FIELD, CHATINFO_SENDERNAME_FIELD, CHATINFO_SENDERLEVEL_FIELD, CHATINFO_SENDERVIP_FIELD, CHATINFO_TIMES_FIELD, CHATINFO_MSG_FIELD, CHATINFO_HEAD_FIELD, CHATINFO_FRAME_FIELD, CHATINFO_SOULVAL_FIELD, CHATINFO_MESSAGEID_FIELD, CHATINFO_MESSAGETYPE_FIELD, CHATINFO_ITEMID_FIELD, CHATINFO_TYPE_FIELD, CHATINFO_STARTTIME_FIELD, CHATINFO_ENDTIME_FIELD, CHATINFO_PRIORITYLEVEL_FIELD, CHATINFO_FREQUENCY_FIELD, CHATINFO_SPEED_FIELD, CHATINFO_MULTIPLE_FIELD, CHATINFO_USERTITLE_FIELD} +CHATINFO.fields = {CHATINFO_SENDERID_FIELD, CHATINFO_SENDERNAME_FIELD, CHATINFO_SENDERLEVEL_FIELD, CHATINFO_SENDERVIP_FIELD, CHATINFO_TIMES_FIELD, CHATINFO_MSG_FIELD, CHATINFO_HEAD_FIELD, CHATINFO_FRAME_FIELD, CHATINFO_SOULVAL_FIELD, CHATINFO_MESSAGEID_FIELD, CHATINFO_MESSAGETYPE_FIELD, CHATINFO_ITEMID_FIELD, CHATINFO_TYPE_FIELD, CHATINFO_STARTTIME_FIELD, CHATINFO_ENDTIME_FIELD, CHATINFO_PRIORITYLEVEL_FIELD, CHATINFO_FREQUENCY_FIELD, CHATINFO_SPEED_FIELD, CHATINFO_MULTIPLE_FIELD} CHATINFO.is_extendable = false CHATINFO.extensions = {} GETCHATMESSAGEINFOREQUEST_CHATTYPE_FIELD.name = "chatType" diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index 4eaec232ac..184bad4b22 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -457,7 +457,6 @@ TEAMONEINFO_HEADFRAME_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO_GUILDNAME_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO_TEAM_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO_ISAPPLYED_FIELD = protobuf.FieldDescriptor(); -TEAMONEINFO_USERTITLE_FIELD = protobuf.FieldDescriptor(); MONSTERRANKINFO = protobuf.Descriptor(); MONSTERRANKINFO_NAME_FIELD = protobuf.FieldDescriptor(); MONSTERRANKINFO_SCORE_FIELD = protobuf.FieldDescriptor(); @@ -557,7 +556,6 @@ REDONEDETAIL_TIME_FIELD = protobuf.FieldDescriptor(); REDONEDETAIL_COUNT_FIELD = protobuf.FieldDescriptor(); REDONEDETAIL_ITEMID_FIELD = protobuf.FieldDescriptor(); REDONEDETAIL_POSITION_FIELD = protobuf.FieldDescriptor(); -REDONEDETAIL_USERTITLE_FIELD = protobuf.FieldDescriptor(); EXPEDITIONSIMPLEBOSSINFO = protobuf.Descriptor(); EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD = protobuf.FieldDescriptor(); EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD = protobuf.FieldDescriptor(); @@ -4984,21 +4982,11 @@ TEAMONEINFO_ISAPPLYED_FIELD.default_value = 0 TEAMONEINFO_ISAPPLYED_FIELD.type = 5 TEAMONEINFO_ISAPPLYED_FIELD.cpp_type = 1 -TEAMONEINFO_USERTITLE_FIELD.name = "userTitle" -TEAMONEINFO_USERTITLE_FIELD.full_name = ".rpc.protocols.TeamOneInfo.userTitle" -TEAMONEINFO_USERTITLE_FIELD.number = 9 -TEAMONEINFO_USERTITLE_FIELD.index = 8 -TEAMONEINFO_USERTITLE_FIELD.label = 1 -TEAMONEINFO_USERTITLE_FIELD.has_default_value = false -TEAMONEINFO_USERTITLE_FIELD.default_value = 0 -TEAMONEINFO_USERTITLE_FIELD.type = 5 -TEAMONEINFO_USERTITLE_FIELD.cpp_type = 1 - TEAMONEINFO.name = "TeamOneInfo" TEAMONEINFO.full_name = ".rpc.protocols.TeamOneInfo" TEAMONEINFO.nested_types = {} TEAMONEINFO.enum_types = {} -TEAMONEINFO.fields = {TEAMONEINFO_UID_FIELD, TEAMONEINFO_LEVEL_FIELD, TEAMONEINFO_NAME_FIELD, TEAMONEINFO_HEAD_FIELD, TEAMONEINFO_HEADFRAME_FIELD, TEAMONEINFO_GUILDNAME_FIELD, TEAMONEINFO_TEAM_FIELD, TEAMONEINFO_ISAPPLYED_FIELD, TEAMONEINFO_USERTITLE_FIELD} +TEAMONEINFO.fields = {TEAMONEINFO_UID_FIELD, TEAMONEINFO_LEVEL_FIELD, TEAMONEINFO_NAME_FIELD, TEAMONEINFO_HEAD_FIELD, TEAMONEINFO_HEADFRAME_FIELD, TEAMONEINFO_GUILDNAME_FIELD, TEAMONEINFO_TEAM_FIELD, TEAMONEINFO_ISAPPLYED_FIELD} TEAMONEINFO.is_extendable = false TEAMONEINFO.extensions = {} MONSTERRANKINFO_NAME_FIELD.name = "name" @@ -5942,21 +5930,11 @@ REDONEDETAIL_POSITION_FIELD.default_value = 0 REDONEDETAIL_POSITION_FIELD.type = 5 REDONEDETAIL_POSITION_FIELD.cpp_type = 1 -REDONEDETAIL_USERTITLE_FIELD.name = "userTitle" -REDONEDETAIL_USERTITLE_FIELD.full_name = ".rpc.protocols.RedOneDetail.userTitle" -REDONEDETAIL_USERTITLE_FIELD.number = 9 -REDONEDETAIL_USERTITLE_FIELD.index = 8 -REDONEDETAIL_USERTITLE_FIELD.label = 1 -REDONEDETAIL_USERTITLE_FIELD.has_default_value = false -REDONEDETAIL_USERTITLE_FIELD.default_value = 0 -REDONEDETAIL_USERTITLE_FIELD.type = 5 -REDONEDETAIL_USERTITLE_FIELD.cpp_type = 1 - REDONEDETAIL.name = "RedOneDetail" REDONEDETAIL.full_name = ".rpc.protocols.RedOneDetail" REDONEDETAIL.nested_types = {} REDONEDETAIL.enum_types = {} -REDONEDETAIL.fields = {REDONEDETAIL_UID_FIELD, REDONEDETAIL_HEAD_FIELD, REDONEDETAIL_HEADFRAME_FIELD, REDONEDETAIL_NAME_FIELD, REDONEDETAIL_TIME_FIELD, REDONEDETAIL_COUNT_FIELD, REDONEDETAIL_ITEMID_FIELD, REDONEDETAIL_POSITION_FIELD, REDONEDETAIL_USERTITLE_FIELD} +REDONEDETAIL.fields = {REDONEDETAIL_UID_FIELD, REDONEDETAIL_HEAD_FIELD, REDONEDETAIL_HEADFRAME_FIELD, REDONEDETAIL_NAME_FIELD, REDONEDETAIL_TIME_FIELD, REDONEDETAIL_COUNT_FIELD, REDONEDETAIL_ITEMID_FIELD, REDONEDETAIL_POSITION_FIELD} REDONEDETAIL.is_extendable = false REDONEDETAIL.extensions = {} EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD.name = "heroTid" diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua index c22d1b4d03..62634df104 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua @@ -96,7 +96,7 @@ end function ArenaMainPanel:OnDestroy() SubUIManager.Close(this.UpView) -- 清除红点 - ClearRedPointObject(RedPointType.Arena_Shop) + -- ClearRedPointObject(RedPointType.Arena_Shop) -- 调用销毁方法 for index, logic in pairs(this.ViewLogicList) do if logic.OnDestroy then diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index ac1e6ecf77..155062f4d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -314,7 +314,7 @@ this.curAttackNodeInfo = {} function this.ExecuteFightBattle(_nodeId,_teamId,_expInfo, callBack) local num = 1 if this.curAttackNodeInfo and this.curAttackNodeInfo.bossTeaminfo.teamInfo and this.curAttackNodeInfo.bossTeaminfo.teamInfo > 0 then - num = 0 + num = 1 else num = 1 end diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua index 5f805ef1ad..bc0547d78d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua @@ -61,10 +61,11 @@ function this:FormationAdapter() this.power.text = monsterData.bossTeaminfo.totalForce local monsterCongig = {} if monsterData.bossTeaminfo.teamInfo and monsterData.bossTeaminfo.teamInfo > 0 then - local monsterGroup = ConfigManager.TryGetConfigDataByKey(ConfigName.ExpeditionRecruitConfig,"HeroId",monsterData.bossTeaminfo.teamInfo) - if monsterGroup and monsterGroup.getHero then - monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterGroup.getHero) - end + monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterData.bossTeaminfo.teamInfo) + -- local monsterGroup = ConfigManager.TryGetConfigDataByKey(ConfigName.ExpeditionRecruitConfig,"HeroId",monsterData.bossTeaminfo.teamInfo) + -- if monsterGroup and monsterGroup.getHero then + -- monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterGroup.getHero) + -- end if not monsterCongig then return end local heroConfig = monsterCongig this.LiveName = GetResourcePath(heroConfig.Live) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index ecd6ce6fba..18a7b64390 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -74,16 +74,38 @@ function FormationEditPopup:BindEvent() --选定按钮 Util.AddClick(this.BtnSure, function() local go=function() - local dids={} + local heros={} + --后端提交后删除 for i, v in ipairs(choosedList) do - table.insert(dids,v.did) + table.insert(heros,v.did) end + --后端提交后放开 + -- for i, v in ipairs(choosedList) do + -- local hero = {} + -- hero.heroId = v.did + -- hero.position = #choosedList + 1 + -- table.insert(heros,hero) + -- end + -- table.sort(heros,function (a,b) + -- return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower + -- end) + -- for i = 1, #heros do + -- heros[i].position = i + -- end if #choosedList <= maxNum and #choosedList > 0 then - NetManager.TrialHeroInfoSaveRequest(dids,function(msg) + NetManager.TrialHeroInfoSaveRequest(heros,function(msg) PopupTipPanel.ShowTip(Language[10670]) + --后端提交后放开 + -- local heros = msg.heroes + -- if heros and #heros > 1 then + -- table.sort(heros,function (a,b) + -- return a.position < b.position + -- end) + -- end + -- MapManager.trialHeroInfo = heros MapManager.trialHeroInfo = msg.heroes if func~=nil then --保存完毕后 将英雄did合集传递过去 此时我拥有这些英雄 不用担心英雄已被删除 - func(dids) + func(heros) end PlayerPrefs.SetInt(PlayerManager.uid.."Trial",1)--设置森罗红点关 CheckRedPointStatus(RedPointType.Trial) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua index ad1156c6b7..dd1a96bea5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua @@ -51,7 +51,8 @@ function this.ShowPanelData(isTop,isAni) allMyAidData = MyGuildManager.GetAllGuildHelpInfo() this.ScrollView:SetData(allMyAidData, function (index, go) this.SingleHelpAidDataShow(go, allMyAidData[index]) - end) + end,not isTop,not isAni) + this.emptyObj:SetActive(#allMyAidData <= 0) end) else this.ScrollView:SetData(allMyAidData, function (index, go) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 9e76d7ea60..e3a2d594d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -362,13 +362,6 @@ function this.InitTrialMission() end --- -- 刷新临时背包数据 --- function this.OnTempBagChanged() --- if CarbonManager.difficulty == 2 then --- this.RefreshBombNum() --- end --- end - -- 刷新砸炸弹、回春散数量 function this.RefreshBombNum() -- 试炼副本才执行 @@ -412,22 +405,7 @@ function this.InitTrial() MapTrialManager.canMove = true MapManager.isRemoving = false MapManager.deadTime = 0 - -- if not MapManager.isOpen then - -- this.TrialMissionStart() - -- end end --- -- 试炼副本进图流程 --- function this.TrialMissionStart() --- NetManager.CarbonMissionStartRequest(function(msg) --- Log("服务器返回消息") --- local showStr = "试炼副本" .. MapTrialManager.curTowerLevel .."层" --- UIManager.OpenPanel(UIName.CurlingTipPanel, showStr) --- MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos) --- PlayerManager.startTime = PlayerManager.serverTime --- MissionManager.missionTime = 0 --- MapManager.isOpen = true --- end) --- end -- 试炼副本显示时间 function this.TrialShowTime() @@ -498,14 +476,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) local itemId=trialSetting[1].HealingId[1] local itemNum=trialSetting[1].HealingId[2] this.selectHero:SetActive((true) and (MapManager.curCarbonType == CarBonTypeId.TRIAL)) - -- local d={} - -- if isFirstIn then--若是第一次进 此时我必有该英雄 不用担心是已删除英雄 通过HeroDid去获取数据 - -- for n, did in ipairs(isFirstData) do - -- local h=HeroManager.GetSingleHeroData(did) - -- table.insert(MapManager.trialHeroInfo,{heroId=h.dynamicId,tmpId=h.id,star=h.star,heroHp=10000,level=h.lv,skinId = h.skinId}) - -- end - -- end - -- d = MapManager.trialHeroInfo local d = MapManager.trialHeroInfo for k = 1, this.s_grid.transform.childCount do this.s_grid.transform:GetChild(k-1).gameObject:SetActive(false) @@ -518,9 +488,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) end end end - table.sort(d,function (a,b) - return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower - end) for i, v in ipairs(d) do if MapTrialManager.selectHeroDid ~= "" then if MapTrialManager.selectHeroDid==v.heroId and v.heroHp <= 0 then @@ -546,12 +513,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) local choosed=Util.GetGameObject(o,"choosed") local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider") frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality, v.star)) - -- if not v.skinId or v.skinId == 0 then - -- icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon)) - -- else - -- local heroSkinData = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",v.skinId) - -- icon.sprite= Util.LoadSprite(GetResourcePath(heroSkinData.Icon)) - -- end SetHeroIcon(v,icon,heroConfig[v.tmpId]) pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName)) lv.text=v.level diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 4dbde51371..b3f9473f04 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -366,10 +366,16 @@ function this.MapInfoRequest(mapModeId,func) local msg = MapInfoProto_pb.MapEnterResponse() msg:ParseFromString(data) MapManager.curMapId = msg.mapId - MapManager.trialHeroInfo=msg.infos - for i = 1, #msg.infos do - Log("Id:"..msg.infos[i].tmpId.." 动态Id:"..msg.infos[i].heroId) - end + + ----后端提交后放开 + -- local heros = msg.infos + -- if heros then + -- table.sort(heros,function (a,b) + -- return a.position < b.position + -- end) + -- end + -- MapManager.trialHeroInfo = heros + MapManager.trialHeroInfo = msg.infos MapTrialManager.curTowerLevel = msg.curTower MapTrialManager.bombUsed = msg.bombUsed MapTrialManager.killCount=msg.killCount @@ -4178,10 +4184,13 @@ function NetManager.GetTreasureOfHeavenRewardRequest(uid,func) end --森罗幻境请求保存上阵 -function NetManager.TrialHeroInfoSaveRequest(heroIds,func) +function NetManager.TrialHeroInfoSaveRequest(heros,func) local data = MapInfoProto_pb.TrialHeroInfoSaveRequest() - for i = 1, #heroIds do - data.heroIds:append(heroIds[i]) + for i = 1, #heros do + -- local c = data.heroes:add()--后端提交后放开 + -- c.heroId = heros[i].heroId--后端提交后放开 + -- c.position = heros[i].position--后端提交后放开 + data.heroIds:append(heros[i]) end local msg = data:SerializeToString() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index 45a5c24847..73578158d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -109,15 +109,15 @@ function GrowthGiftPage:OnShow(_sortingOrder) else self.titleTip.gameObject:SetActive(false) end - self:RefreshData() + self:RefreshData(true,true) end -function GrowthGiftPage:RefreshData() +function GrowthGiftPage:RefreshData(isTop,isAni) if self.actType == ActivityTypeDef.GrowthReward then self:SetBtnInvestState() self.clickFun = self.GrowthGiftPageOnClick end - self:RefreshGiftData(true) + self:RefreshGiftData(isTop,isAni) end --设置投资按钮初始状态 @@ -136,7 +136,7 @@ function GrowthGiftPage:SetBtnInvestState() end end -function GrowthGiftPage:RefreshGiftData(anim) +function GrowthGiftPage:RefreshGiftData(isTop,isAni) self.mission = DynamicActivityManager.GetMissionDataByActId(self.curActiId) if not self.missionPre then self.missionPre = {} @@ -148,7 +148,7 @@ function GrowthGiftPage:RefreshGiftData(anim) self.scrollView:SetData(self.mission, function(index, item) self:RefreshShowData(item, self.mission[index]) - end,not anim) + end,not isTop,not isAni) end --刷新每一条item @@ -217,7 +217,7 @@ function GrowthGiftPage:RefreshStatus() -- 检测红点状态 RedpotManager.CheckRedPointStatus(RedPointType.GrowthGift) -- 刷新当前界面显示 - self:RefreshData() + self:RefreshData(false,false) end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index cfc07a4f34..df6fde0d5c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -39,15 +39,15 @@ function this.SetBasicValues(giftGoodsList) for _, giftGoodsInfo in ipairs(giftGoodsList) do if giftGoodsInfo.goodsId and giftGoodsInfo.goodsId ~= 0 then local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId) - -- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" - -- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" - -- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) + -- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" + -- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" + -- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then else - if giftGoodsInfoList[rechargeConfigLocal.Type] then - table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo) - end - end + if giftGoodsInfoList[rechargeConfigLocal.Type] then + table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo) + end + end end end Game.GlobalEvent:DispatchEvent(GameEvent.FindFairy.RefreshBuyOpenState) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index acd2d8198e..b069bacf40 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -139,7 +139,7 @@ function this.InitRedPointAllRelate() --竞技场 RPData:SetParent(RedPointType.Arena_Type_Normal, RedPointType.Arena) RPData:SetParent(RedPointType.Arena_Record, RedPointType.Arena_Type_Normal) - RPData:SetParent(RedPointType.Arena_Shop, RedPointType.Arena_Type_Normal) + -- RPData:SetParent(RedPointType.Arena_Shop, RedPointType.Arena_Type_Normal) RPData:SetParent(RedPointType.Arena_Reward, RedPointType.Arena_Type_Normal) RPData:SetParent(RedPointType.Arena_Free, RedPointType.Arena_Type_Normal) @@ -327,7 +327,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Arena_Reward, ArenaManager.RewardBoxRedCheck) ---=== 商店相关红点 - RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck) + -- RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Secret_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Arena_Check, ShopManager.ShopRedCheck) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua index 3568f9db25..d77c7089de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua @@ -56,7 +56,7 @@ function this.SendBackResolveReCallBack(drop) for k, v in ipairs(selectEquipTreasureDataDid) do EquipTreasureManager.RemoveTreasureByIdDyn(v) end - ResolvePanel.SwitchView(4,true,true) + ResolvePanel.SwitchView(2,true,true) parent:ClosePanel() end function this:AddListener() diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 5e3d282a7e..1977fe8747 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -70,7 +70,7 @@ function EveryDayGift:BindEvent() FirstRechargeManager.RefreshAccumRechargeValue(1004) PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0) CheckRedPointStatus(RedPointType.GrowthPackage) - self:RefreshData() + self:RefreshData(nil,false,false) end) end) end @@ -127,10 +127,10 @@ function EveryDayGift:OnShow(_sortingOrder) VipManager.SetGrowthPackagePointStatus() CheckRedPointStatus(RedPointType.GrowthPackage) end - self:RefreshData(true) + self:RefreshData(true,true,true) end -function EveryDayGift:RefreshData(isUpdata) +function EveryDayGift:RefreshData(isUpdata,isTop,isAni) if self.actConfig.RpType > 0 then CheckRedPointStatus(self.actConfig.RpType) end @@ -143,11 +143,11 @@ function EveryDayGift:RefreshData(isUpdata) self:RefreshFreeData() end -- 刷新商品数据 - self:RefreshGiftData() + self:RefreshGiftData(isTop,isAni) end -- 刷新礼包的数据 -function EveryDayGift:RefreshGiftData() +function EveryDayGift:RefreshGiftData(isTop,isAni) rechargeNum = VipManager.GetChargedNum()--已经充值的金额 self:isBought() self.scrollView:ForeachItemGO(function(index, go) @@ -158,7 +158,7 @@ function EveryDayGift:RefreshGiftData() self:RefreshShowData(item, self.shopData[index],index) end local curindex = 0 - self.scrollView:SetData(self.shopData, callBack) + self.scrollView:SetData(self.shopData, callBack,not isTop,not isAni) for i = 1 ,#self.shopData do if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then for j = 1 , #DynamicActivityManager.selectIndex.goodsId do @@ -172,8 +172,8 @@ function EveryDayGift:RefreshGiftData() break end end - LogGreen("curindex:"..curindex) - self.scrollView:SetIndex(curindex) + -- LogGreen("curindex:"..curindex) + -- self.scrollView:SetIndex(curindex) end function EveryDayGift:isBought() @@ -249,7 +249,7 @@ function EveryDayGift:GetRemainTime() self.endTime.text = Language[11355]..formatTime--时分秒 end elseif showfreshTime < 0 then - self:RefreshData(true) + self:RefreshData(true,false,false) end end UpDate() diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index 6fc53a0800..fc29d8f306 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -111,7 +111,7 @@ function GiftPre:BindEvent() CheckRedPointStatus(RedPointType.WeekGiftPage) CheckRedPointStatus(RedPointType.MonthGiftPage) CheckRedPointStatus(RedPointType.GrowthPackage) - self.parent:RefreshData() + self.parent:RefreshData(nil,false,false) end) end end @@ -128,7 +128,7 @@ function GiftPre:BuyAction(costId, costNum, shopType, itemId) else local func = function(shopType, itemId) ShopManager.RequestBuyShopItem(shopType, itemId, 1, function() - self.parent:RefreshData() + self.parent:RefreshData(nil,false,false) CheckRedPointStatus(RedPointType.DailyGift) CheckRedPointStatus(RedPointType.GrowthPackage) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index 01d21b82be..9121bd8e0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -1054,7 +1054,7 @@ function this.CheckShopRedpot(shopType) CheckRedPointStatus(RedPointType.Guild_Shop) elseif shopType == SHOP_TYPE.ARENA_SHOP then CheckRedPointStatus(RedPointType.Shop_Arena_Check) - CheckRedPointStatus(RedPointType.Arena_Shop) + -- CheckRedPointStatus(RedPointType.Arena_Shop) elseif shopType == SHOP_TYPE.ROAM_SHOP then CheckRedPointStatus(RedPointType.Shop_Roam_Check) elseif shopType == SHOP_TYPE.SECRET_BOX_SHOP then