diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_01.png b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_01.png index 707fdbaddd..a10d61c8bb 100644 Binary files a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_01.png and b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_01.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_01.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_01.png.meta index 76b1b16ea2..ac6150a2e4 100644 --- a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_01.png.meta +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19a09eeaeacc26942896e0a23c57cc11 +guid: 485399926ebd92448bc450a1c9b3c586 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 180402035a1bec847abf5748a365d4aa + spriteID: 53cec7c9a6589164198cbe035ee38602 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_02.png b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_02.png index aa88b3f504..88e77420a0 100644 Binary files a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_02.png and b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_02.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_02.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_02.png.meta index de089bdf67..e39e600231 100644 --- a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_02.png.meta +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_02.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59d986b255f98dc43bcc782903dea72b +guid: 3a562e149da04054d80c885749ab5556 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: dcce35b3b3df7184091786825a8a2f01 + spriteID: 5b0959f19b98f5848988fc5b9d20ba78 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_03.png b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_03.png index aa23883249..04d1880e8b 100644 Binary files a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_03.png and b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_03.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_03.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_03.png.meta index 0d5a382abd..e5c4067d59 100644 --- a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_03.png.meta +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_03.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 77a8f94f91e5a664f98c6726c00c1f44 +guid: 3c825f76c4f93b040a0903ad2bf84e80 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 95c15e527f8461d47867ad4fe940abd0 + spriteID: a1ef47e1d67fa0e439fcc4b30b7c4c36 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_04.png b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_04.png index 6eb227ffcf..4852cca398 100644 Binary files a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_04.png and b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_04.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_04.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_04.png.meta index 11556df9f0..ede9780447 100644 --- a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_04.png.meta +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_04.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f3860e7ab32d6a04fa473923e7265285 +guid: ce5d3bc346f62b14680338f4419d9092 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 50a8e2a736d710b41a0a13adbeb27c5a + spriteID: dc4b0abea6f767f4ca425fb854f4ce42 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_05.png b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_05.png index d4321eaf9f..e2ce004626 100644 Binary files a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_05.png and b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_05.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_05.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_05.png.meta index ca053e25e4..1e0496c31b 100644 --- a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_05.png.meta +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_05.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7670649936ad4cd4a8b61b33bbfdeb64 +guid: a1c5286bcb88213478a211219195e0ba TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 32d6c2d386aa660429678e2650aaa661 + spriteID: f0ff430d97d9dbf48ba0a7703a658265 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_06.png b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_06.png index 72ce806685..a0334e5522 100644 Binary files a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_06.png and b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_06.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_06.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_06.png.meta index 16e78a51c2..70b0751949 100644 --- a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_06.png.meta +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_06.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38cec66d20614724d9c0226f9518b7f0 +guid: 3104845bb189ddb40ad335d65592475c TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 6ad83bd5aa7d3b845946c7d8d3d0e564 + spriteID: d4aef14f66083e640903692277a5c2cb vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_07.png b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_07.png index 6e7c0bc006..38bcba286e 100644 Binary files a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_07.png and b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_07.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_07.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_07.png.meta index 3786bfa920..9be3c4b6ae 100644 --- a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_07.png.meta +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_07.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96b329c0e30c515418fcc7ba79b94b17 +guid: 617c05e5460e73246874451120e2d414 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 3e615941ed6d0b34ebc30f7a4bb248c1 + spriteID: f775884bac705c148a2115bcb9dbec74 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_08.png b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_08.png index e31b18117e..f5ea3852ce 100644 Binary files a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_08.png and b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_08.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_08.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_08.png.meta index a1a37f6422..c9a0b704fe 100644 --- a/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_08.png.meta +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/tansuo_08.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55d85409246644547a35513a86ab7900 +guid: 88b5db0ac34b06843b325abfd18c3191 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: ab1459218317d9c4593c0ae081aa47fc + spriteID: d55ca7d972dfebd40b242c338ecd305c vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab index 8367c0e8e2..ff5373ece2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab @@ -33,6 +33,7 @@ RectTransform: m_Children: - {fileID: 1188055397622952346} - {fileID: 1880521797328049326} + - {fileID: 3109771922734125205} m_Father: {fileID: 2111641511848696073} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1010,7 +1011,7 @@ GameObject: - component: {fileID: 6325090088795074923} - component: {fileID: 6678081337593387917} - component: {fileID: 6529408808696831654} - - component: {fileID: 3299189935685276355} + - component: {fileID: 2637277166029824310} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1032,10 +1033,10 @@ RectTransform: m_Father: {fileID: 6105355657785293294} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 97.6, y: 0} - m_SizeDelta: {x: 438.78, y: 41.53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 80, y: 0} + m_SizeDelta: {x: 0, y: 41.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6678081337593387917 CanvasRenderer: @@ -1078,8 +1079,8 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: ---- !u!114 &3299189935685276355 + m_Text: 9 +--- !u!114 &2637277166029824310 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1088,10 +1089,11 @@ MonoBehaviour: m_GameObject: {fileID: 2823235256438696353} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _textSpacing: -32.14 + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &3063400038253272979 GameObject: m_ObjectHideFlags: 0 @@ -1951,6 +1953,7 @@ GameObject: - component: {fileID: 6105355657785293294} - component: {fileID: 2931832541723372711} - component: {fileID: 5063249533979455088} + - component: {fileID: 7118583340117305838} m_Layer: 5 m_Name: minForce m_TagString: Untagged @@ -1970,6 +1973,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6325090088795074923} + - {fileID: 5851011905466392082} m_Father: {fileID: 1880521797328049326} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2015,6 +2019,29 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &7118583340117305838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5173754814344801487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: -38.9 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &5274568013152704558 GameObject: m_ObjectHideFlags: 0 @@ -2358,6 +2385,41 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5736311845991659963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3109771922734125205} + m_Layer: 5 + m_Name: tipPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3109771922734125205 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5736311845991659963} + 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: 2551601507637919127} + 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: -148.1} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5983845854576432941 GameObject: m_ObjectHideFlags: 0 @@ -2432,6 +2494,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6628175028958009239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5851011905466392082} + - component: {fileID: 4769522762599013584} + - component: {fileID: 8857484772515794297} + - component: {fileID: 2589403333423229057} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5851011905466392082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628175028958009239} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.67, y: 0.67, z: 0.67} + m_Children: [] + m_Father: {fileID: 6105355657785293294} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 65.85, y: 65.849} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4769522762599013584 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628175028958009239} + m_CullTransparentMesh: 0 +--- !u!114 &8857484772515794297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628175028958009239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 278c8704b563ad64682d6efb06806647, 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 &2589403333423229057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628175028958009239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &6658979205109598518 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index cf31070de7..9e16a71809 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -10709,6 +10709,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &527098188287032821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6823656507059928199} + - component: {fileID: 2219156026975155871} + - component: {fileID: 7782717342707384307} + m_Layer: 5 + m_Name: Image3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6823656507059928199 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527098188287032821} + 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: 4761079688238677584} + 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: 0} + m_SizeDelta: {x: 140, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2219156026975155871 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527098188287032821} + m_CullTransparentMesh: 0 +--- !u!114 &7782717342707384307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527098188287032821} + 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: e33370dca61c0ec46ba9858cfd7a2cc8, 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 &552466007679824540 GameObject: m_ObjectHideFlags: 0 @@ -28839,6 +28913,55 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2712433447930740015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4761079688238677584} + - component: {fileID: 5338976294666969871} + m_Layer: 5 + m_Name: exploreTeamName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4761079688238677584 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2712433447930740015} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1621672424640142590} + - {fileID: 454028756506756002} + - {fileID: 6823656507059928199} + - {fileID: 8863559515178324334} + - {fileID: 7182411058494587866} + m_Father: {fileID: 491038039515440220} + m_RootOrder: 15 + 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.000025511, y: -24.1} + m_SizeDelta: {x: 145, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5338976294666969871 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2712433447930740015} + m_CullTransparentMesh: 0 --- !u!1 &2769298375651408182 GameObject: m_ObjectHideFlags: 0 @@ -40167,6 +40290,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3904818084478930630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7182411058494587866} + - component: {fileID: 1112834856310243121} + - component: {fileID: 7767526940189340841} + m_Layer: 5 + m_Name: Image5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7182411058494587866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3904818084478930630} + 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: 4761079688238677584} + 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, y: 0} + m_SizeDelta: {x: 140, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1112834856310243121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3904818084478930630} + m_CullTransparentMesh: 0 +--- !u!114 &7767526940189340841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3904818084478930630} + 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: e33370dca61c0ec46ba9858cfd7a2cc8, 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 &3925317484738836596 GameObject: m_ObjectHideFlags: 0 @@ -40633,6 +40830,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4270447681920412041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8863559515178324334} + - component: {fileID: 6752334477907553200} + - component: {fileID: 6789488919731994939} + m_Layer: 5 + m_Name: Image4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8863559515178324334 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4270447681920412041} + 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: 4761079688238677584} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 140, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6752334477907553200 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4270447681920412041} + m_CullTransparentMesh: 0 +--- !u!114 &6789488919731994939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4270447681920412041} + 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: efa15a6fa087ddd4087e8be91945380a, 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 &4339434452145773116 GameObject: m_ObjectHideFlags: 0 @@ -53483,7 +53754,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6397020953744984877 RectTransform: m_ObjectHideFlags: 0 @@ -60613,6 +60884,80 @@ RectTransform: m_AnchoredPosition: {x: -45, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8048053474426767723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 454028756506756002} + - component: {fileID: 8202904768687724589} + - component: {fileID: 8186316645641225951} + m_Layer: 5 + m_Name: Image2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &454028756506756002 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8048053474426767723} + 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: 4761079688238677584} + 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, y: 0} + m_SizeDelta: {x: 140, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8202904768687724589 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8048053474426767723} + m_CullTransparentMesh: 0 +--- !u!114 &8186316645641225951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8048053474426767723} + 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: 5419905ae75aebf458a6cb5e572a63fe, 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 &8048569810252131765 GameObject: m_ObjectHideFlags: 0 @@ -61556,6 +61901,7 @@ RectTransform: - {fileID: 476036203437658873} - {fileID: 4198500793958213807} - {fileID: 6397020953744984877} + - {fileID: 4761079688238677584} m_Father: {fileID: 9217646665226819579} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -61808,6 +62154,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8582721198221650553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1621672424640142590} + - component: {fileID: 4904422528726715415} + - component: {fileID: 109066391653849260} + m_Layer: 5 + m_Name: Image1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1621672424640142590 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8582721198221650553} + 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: 4761079688238677584} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 140, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4904422528726715415 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8582721198221650553} + m_CullTransparentMesh: 0 +--- !u!114 &109066391653849260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8582721198221650553} + 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: efa15a6fa087ddd4087e8be91945380a, 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 &8617463786155798651 GameObject: m_ObjectHideFlags: 0 @@ -68000,12 +68420,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 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 @@ -68015,22 +68430,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + 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 @@ -68170,12 +68590,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 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 @@ -68185,22 +68600,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + 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 @@ -68340,12 +68760,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 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 @@ -68355,22 +68770,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + 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 @@ -68510,12 +68930,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 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 @@ -68525,22 +68940,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + 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 @@ -68680,12 +69100,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 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 @@ -68695,22 +69110,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + 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 @@ -68850,12 +69270,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 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 @@ -68865,22 +69280,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + 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/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab index 0dd2eaac00..fe25987bf3 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab @@ -1030,10 +1030,10 @@ RectTransform: m_Father: {fileID: 7644492056687066972} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -25} - m_SizeDelta: {x: 0, y: 24} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4048250634787269212 CanvasRenderer: @@ -1169,7 +1169,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8695866201967774186 RectTransform: m_ObjectHideFlags: 0 @@ -2063,9 +2063,9 @@ RectTransform: m_Father: {fileID: 927046963727087859} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 299.62, y: -67.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1367496513616211645 @@ -2845,7 +2845,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4091587878891537453 RectTransform: m_ObjectHideFlags: 0 @@ -3249,10 +3249,10 @@ RectTransform: m_Father: {fileID: 7644492056687066972} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6887090391774359567 CanvasRenderer: @@ -3493,9 +3493,9 @@ RectTransform: m_Father: {fileID: 7159837365308353879} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -309.8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 900, y: 119.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2724078255467462616 @@ -5261,9 +5261,9 @@ RectTransform: m_Father: {fileID: 927046963727087859} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 415.68, y: -67.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3929062618979649009 @@ -5299,9 +5299,9 @@ RectTransform: m_Father: {fileID: 927046963727087859} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 183.56, y: -67.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3964885503958964950 @@ -6275,8 +6275,8 @@ RectTransform: m_Father: {fileID: 7159837365308353879} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 450, y: 0} m_SizeDelta: {x: 900, y: 0} m_Pivot: {x: 0.5, y: 1} @@ -6536,7 +6536,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7159837365308353879 RectTransform: m_ObjectHideFlags: 0 @@ -6556,10 +6556,10 @@ RectTransform: m_Father: {fileID: 5372385286984290946} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -104} - m_SizeDelta: {x: 900, y: 369.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 450, y: 0} + m_SizeDelta: {x: 900, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1103144245032003519 MonoBehaviour: @@ -6634,6 +6634,8 @@ RectTransform: - {fileID: 927046963727087859} - {fileID: 3702021560466969874} - {fileID: 635124106903081193} + - {fileID: 1292848447887929709} + - {fileID: 6806790489514081270} m_Father: {fileID: 4574733457779219138} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7132,9 +7134,9 @@ RectTransform: m_Father: {fileID: 927046963727087859} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 531.74, y: -67.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5334500861366320657 @@ -7748,9 +7750,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 539, y: 2626} + m_AnchoredPosition: {x: 539, y: 2652.5} m_SizeDelta: {x: 215.87, y: 53} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &5352346174086840087 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8324,9 +8326,9 @@ RectTransform: m_Father: {fileID: 927046963727087859} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 647.8, y: -67.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6530990796986148635 @@ -9186,6 +9188,41 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u8C03\u6574\u961F\u4F0D" +--- !u!1 &7606921388119242348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1292848447887929709} + m_Layer: 5 + m_Name: tagetpos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1292848447887929709 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7606921388119242348} + 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: 8386535761879462697} + m_RootOrder: 9 + 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, y: 7.61} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7614409868773122854 GameObject: m_ObjectHideFlags: 0 @@ -9494,7 +9531,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -345.2, y: -5.9} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6766546576535640258 CanvasRenderer: @@ -9574,9 +9611,9 @@ RectTransform: m_Father: {fileID: 927046963727087859} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 67.5, y: -67.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7773533095141593194 @@ -11115,9 +11152,9 @@ RectTransform: m_Father: {fileID: 7159837365308353879} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -125} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 900, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8742866297766158898 @@ -11818,9 +11855,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 539, y: 2626} + m_AnchoredPosition: {x: 539, y: 2652.5} m_SizeDelta: {x: 215.87, y: 53} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &5581341638205565371 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11989,6 +12026,41 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &9184510703888991632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6806790489514081270} + m_Layer: 5 + m_Name: tagetTimepos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6806790489514081270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9184510703888991632} + 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: 8386535761879462697} + m_RootOrder: 10 + 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: 389, y: 14} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9185262863044200621 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 2a81f3e7b9..defe63e747 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -230,14 +230,7 @@ function PrintWanNum3(num) return tostring(num) end end -function PrintWanNum4(num) - num = tonumber(num) - if num >= 1000000 then - return tostring(math.floor(num / 10000)) .. Language[10037] - else - return tostring(num) - end -end + --判断两个时间在同一天 function Util_Check_insameday(time1, time2) local date1 = os.date("*t", time1) @@ -2286,3 +2279,38 @@ function GetProfessionNameById(_professionId) end return "" end + +-- 设置图片数字显示 +function SetNumShow(numGrid,numPre,num) + local numStr = "" + if num >= 1000000 then + numStr = tostring(math.floor(num / 10000)) + else + numStr = tostring(num) + end + local numTb = StringConvertToTable(tostring(numStr)) + local numList = {} + for i = 1,numGrid.transform.childCount - 1 do + table.insert(numList,numGrid.transform:GetChild(i-1):GetComponent("Text")) + end + for i = 1, math.max(#numList,#numTb) do + if not numTb[i] then + numList[i].gameObject:SetActive(false) + else + if not numList[i] then + local go = newObjToParent(numPre.gameObject,numGrid.gameObject) + go.transform:SetSiblingIndex(numGrid.transform.childCount-2) + go.transform.localScale = numPre.transform.localScale + table.insert(numList,go:GetComponent("Text")) + end + numList[i].gameObject:SetActive(true) + numList[i].text = numTb[i] + end + end + if num >= 1000000 then + numGrid.transform:GetChild(numGrid.transform.childCount-1).gameObject:SetActive(true) + else + numGrid.transform:GetChild(numGrid.transform.childCount-1).gameObject:SetActive(false) + end + ForceRebuildLayout(numGrid.transform) +end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index f782a7fa21..88fb406c38 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -536,5 +536,9 @@ GameEvent = { LingMaiMiJing = { RefreshPanel = "LingMaiMiJing.RefreshPanel", ClosePanel = "LingMaiMiJing.ClosePanel", + }, + Explore = { + UpdateFormation = "Explore.UpdateFormation", + } } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua index e8717f9a1f..854e60e321 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua @@ -13,6 +13,8 @@ function ExploreMainPanel:InitComponent() self.oneKeyExploreBtn = Util.GetGameObject(self.gameObject, "btns/oneKeyExploreBtn") self.formationBtn = Util.GetGameObject(self.gameObject, "btns/formationBtn") self.tip = Util.GetGameObject(self.gameObject, "btns/tip") + self.tipPos = self.tip.transform.localPosition + self.tipRoot = Util.GetGameObject(self.gameObject, "btns") self.xiangqingBtn = Util.GetGameObject(self.tip, "xiangqingBtn") self.jinruBtn = Util.GetGameObject(self.tip, "jinruBtn") self.tansuoBtn = Util.GetGameObject(self.tip, "tansuoBtn") @@ -61,6 +63,7 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function ExploreMainPanel:OnShow() + self.mapId = 0 ForceRebuildLayout(self.Bg.transform) self.data = ExploreManager.ExploreMapData self.tip.gameObject:SetActive(false) @@ -80,7 +83,8 @@ function ExploreMainPanel:SetMapData() self.mapList[k].mapBg = Util.GetGameObject(self.mapList[k].go,"mapBg") self.mapList[k].mapBgIma = Util.GetGameObject(self.mapList[k].mapBg,"ImgBg"):GetComponent("Image") self.mapList[k].mapInfo = Util.GetGameObject(self.mapList[k].go,"mapInfo") - self.mapList[k].force = Util.GetGameObject(self.mapList[k].mapInfo,"minForce/Text"):GetComponent("Text") + self.mapList[k].minForce = Util.GetGameObject(self.mapList[k].mapInfo,"minForce") + self.mapList[k].force = Util.GetGameObject(self.mapList[k].mapInfo,"minForce/Text") self.mapList[k].bgName = Util.GetGameObject(self.mapList[k].mapInfo,"info/bgName") self.mapList[k].lock = Util.GetGameObject(self.mapList[k].mapInfo,"info/bgName/Lock") self.mapList[k].lock.gameObject:SetActive(false) @@ -91,13 +95,14 @@ function ExploreMainPanel:SetMapData() self.mapList[k].exploreIma = Util.GetGameObject(self.mapList[k].mapInfo,"info/exploreIma") self.mapList[k].condition = Util.GetGameObject(self.mapList[k].mapInfo,"condition") self.mapList[k].conditionTip = Util.GetGameObject(self.mapList[k].condition,"Text"):GetComponent("Text") + self.mapList[k].tipPos = Util.GetGameObject(self.mapList[k].go,"tipPos") end self.mapList[k].data = v self.mapList[k].go.gameObject:SetActive(true) self.mapList[k].go.transform.localPosition = v.pos self.mapList[k].mapBgIma.sprite = self.spLoader:LoadSprite(v.iconName) self.mapList[k].mapBgIma:SetNativeSize() - self.mapList[k].force.text = PrintWanNum4(v.force) + SetNumShow(self.mapList[k].minForce,self.mapList[k].force.gameObject,v.force) if PlayerManager.level < v.openLevel then self.mapList[k].condition.gameObject:SetActive(true) self.mapList[k].conditionTip.text = v.openLevel.."级解锁" @@ -111,8 +116,7 @@ function ExploreMainPanel:SetMapData() self.mapList[k].name.text = v.name Util.AddOnceClick(self.mapList[k].go,function() if PlayerManager.level >= v.openLevel then - self.mapId = k - self:SetTip(v.pos) + self:SetTip(self.mapList[k].tipPos,k) end end) end @@ -124,13 +128,22 @@ function ExploreMainPanel:SetMapState() end end -function ExploreMainPanel:SetTip(pos) - self.tip.gameObject:SetActive(true) - self.tip.transform.localPosition = pos +function ExploreMainPanel:SetTip(root,k) + if self.mapId == k then + self.tip.gameObject:SetActive(false) + self.mapId = 0 + else + self.mapId = k + self.tip.transform:SetParent(root.transform) + self.tip.gameObject:SetActive(true) + self.tip.transform.localPosition = Vector3.New(0,0,0) + self.tip.transform.localScale = Vector3.one + end end --界面关闭时调用(用于子类重写) function ExploreMainPanel:OnClose() + self:SetTip(self.tipRoot,self.mapId) end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua index 7e77d27887..c8d19021e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua @@ -100,6 +100,7 @@ function this.UpdateFormationData(team) else LogGreen(string.format("%s编队不属于探索玩法",team.teamId)) end + LogGreen("this.FormationData[team.teamId].state:"..this.FormationData[team.teamId].state.." team.exploreTime - GetTimeStamp():"..team.exploreTime - GetTimeStamp()) CheckRedPointStatus(RedPointType.ExploreFunc) end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 3012dcbb6f..6449ebf290 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -847,6 +847,24 @@ function this.SingleHeroDataShow(_go, _heroData) end end end + local exploreTeamList = {} + local exploreTeam = Util.GetGameObject(go, "exploreTeamName") + exploreTeam.gameObject:SetActive(false) + for i = 1,exploreTeam.transform.childCount do + table.insert(exploreTeamList,exploreTeam.transform:GetChild(i-1)) + end + for i = 1, #exploreTeamList do + exploreTeamList[i].gameObject:SetActive(false) + end + if panelType == FORMATION_TYPE.ExploreFunc then + exploreTeam.gameObject:SetActive(true) + if this.opView.GetHeroTeam then + local index = this.opView.GetHeroTeam(heroData.dynamicId) + if index and index ~= 0 and index ~= 100 then + exploreTeamList[index].gameObject:SetActive(true) + end + end + end -- 点击事件 Util.AddOnceClick(go, function() -- 判断是上阵还是下阵 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua index ff4698b2ce..d87852f0e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua @@ -2,6 +2,7 @@ local CarbonFormation = {} local this = CarbonFormation local mainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) +local SpecialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,141) --- 是否需要切换编队的功能 this.IsNeedChangeFormation = true local hadClick = false @@ -10,57 +11,136 @@ function this.Init(root, fightId) this.root = root this.fightId = fightId this.InitView() + this.FormationData = {} + local strs = string.split(SpecialConfig.Value,"|") + for i = 1,#strs do + local data = string.split(strs[i],"#") + local formationId = tonumber(data[1]) + this.FormationData[formationId] = {} + this.FormationData[formationId].formationId = formationId + this.FormationData[formationId].formationinfo = {} + local value = FormationManager.GetFormationByID(formationId) + for i = 1, #value.teamHeroInfos do + local singleData = {} + singleData.heroId = value.teamHeroInfos[i].heroId + singleData.position = value.teamHeroInfos[i].position + table.insert(this.FormationData[formationId].formationinfo,singleData) + end + end end --- 获取需要显示的编队id function this.GetFormationIndex() --FormationManager.curFormationIndex = FormationTypeDef.FORMATION_NORMAL return ExploreManager.curFormationIndex end ---- btn1点击回调事件 -function this.On_Btn2_Click() - LogRed("hadClick "..tostring(hadClick).." #this.root.choosedList "..#this.root.choosedList) - if not hadClick then - hadClick = true - -- -- 编队为空 - -- if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then - -- hadClick = false - -- PopupTipPanel.ShowTip("编队没人,请先上人!") - -- return - -- end - - if #this.root.choosedList>=1 then - --保存编队 - FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList, - FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) - else - PopupTipPanel.ShowTip(Language[10700]) - hadClick = false - return - end - end -end -- 初始化界面显示 function this.InitView() this.root.btn_1:SetActive(true) this.root.btn_2:SetActive(true) this.root.btn_1_lab.text=Language[10710] - this.root.btn_2_lab.text=Language[10706] + this.root.btn_2_lab.text = "保存阵容" this.root.passBattle0.gameObject:SetActive(false) this.root.passBattle1.gameObject:SetActive(false) - MapManager.isCarbonEnter = false - local costTip = this.root.costTip - costTip:SetActive(false) + this.root.costTip:SetActive(false) hadClick = false - this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) - - FormationManager.curFormationIndex = FormationTypeDef.FORMATION_NORMAL end function this.On_Btn1_Click() this.root.SetOneKeyGo() end +--- btn1点击回调事件 +function this.On_Btn2_Click() + if not hadClick then + hadClick = true + for k,v in pairs(this.FormationData) do + FormationManager.SaveFormation(k, v.formationinfo, + FormationManager.formationList[k].teamPokemonInfos) + end + Game.GlobalEvent:DispatchEvent(GameEvent.Explore.UpdateFormation) + end +end + +function this.SortHeroDatas(_roleDatas) + local datas1 = {} + for i = 1,#_roleDatas do + local index = this.GetHeroTeam(_roleDatas[i].dynamicId) + table.insert(datas1,{sort = index,herodata = _roleDatas[i]}) + end + table.sort(datas1,function(a,b) + if a.sort == b.sort then + return this.root.NaturalSort(true,a.herodata,b.herodata) + else + return a.sort < b.sort + end + end) +end + +function this.GetHeroTeam(did) + for k,v in pairs(this.FormationData) do + for i = 1,#v.formationinfo do + if did == v.formationinfo[i].heroId then + if k == this.GetFormationIndex() then + return 0 + end + return k%3100 + end + end + end + return 100 --相同编队 1,2,3,4,5, 100 --其他 按照这个索引从小到大排序 +end + +function this.HeroUpDownCheck(params, CheckFail, CheckSuccess) + if params.action == FORMATION_ACTION.UP then + local team = this.GetHeroTeam(params.heroData.dynamicId) + if team ~= 0 and team ~= 100 then + MsgPanel.ShowTwo("该神将正处于其他队伍,是否要编入当前队伍内",nil, function() + --改变英雄队伍id改变 + this.RemoveHero(params.heroData.dynamicId) + this.AddHeroToTeam(params.heroData.dynamicId,params.position,this.GetFormationIndex()) + if CheckSuccess then + CheckSuccess(params) + end + end) + else + if CheckSuccess then + if params.position and params.position ~= 0 then + --改变英雄队伍id改变 + this.AddHeroToTeam(params.heroData.dynamicId, params.position, this.GetFormationIndex()) + end + CheckSuccess(params) + end + end + elseif params.action == FORMATION_ACTION.DOWN then + this.RemoveHero(params.heroData.dynamicId) + if CheckSuccess then + CheckSuccess(params) + end + end +end + +-- 改变神将编队 神将ID 编队ID 位置 +function this.RemoveHero(id) + local hero=nil + --旧队伍里移除 + local team = this.GetHeroTeam(id) + local formationId = team == 0 and this.GetFormationIndex() or team + 3100 + for i = 1, #this.FormationData[formationId].formationinfo do + if this.FormationData[formationId].formationinfo[i].heroId==id then + table.remove(this.FormationData[formationId].formationinfo,i) + break + end + end +end + +--添加到队伍 神将ID 位置 编队ID +function this.AddHeroToTeam(id,pos,index) + table.insert(this.FormationData[index].formationinfo,{heroId=id,position=pos}) +end +function this.SetOneKeyGo() + +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup.lua index cf1c45480c..531d3e886d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup.lua @@ -3,7 +3,6 @@ require("Base/BasePanel") GeneralSizeFitterPopup = Inherit(BasePanel) local this = GeneralSizeFitterPopup local sorting = 0 - --子模块脚本 local contentScripts = { [GENERALSIZEFITTER_TYPE.ExploreSelectFormation] = {view = require("Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation"), panelName = "GeneralSizeFitterPopup_ExploreSelectFormation"}, @@ -17,6 +16,7 @@ local contentPrefabs={} function GeneralSizeFitterPopup:InitComponent() this.contents = Util.GetGameObject(this.gameObject,"Content") this.backBtn = Util.GetGameObject(this.gameObject,"backBtn") + this.quitBtn = Util.GetGameObject(this.gameObject,"Content/backBtn") this.title = Util.GetGameObject(this.gameObject,"title") --子模块脚本初始化 for key, value in pairs(contentScripts) do @@ -37,6 +37,10 @@ function GeneralSizeFitterPopup:BindEvent() Util.AddClick(this.backBtn,function() self:ClosePanel() end) + --返回按钮 + Util.AddClick(this.quitBtn,function() + self:ClosePanel() + end) end function GeneralSizeFitterPopup:AddListener() @@ -58,11 +62,13 @@ function GeneralSizeFitterPopup:OnOpen(popupKey,...) for key, value in pairs(contentPrefabs) do value.gameObject:SetActive(false) end + this.popupKey = popupKey contentPrefabs[popupKey].gameObject:SetActive(true) - contentScripts[popupKey].view:OnShow(this,...)--1、传入自己 2、传入不定参 + contentScripts[popupKey].view:OnOpen(this,...)--1、传入自己 2、传入不定参 end function GeneralSizeFitterPopup:OnShow() + contentScripts[this.popupKey].view:OnShow() end function GeneralSizeFitterPopup:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua index f0ab9bb07d..0205dafe75 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua @@ -25,27 +25,27 @@ end --添加事件监听(用于子类重写) function this:AddListener() - + end --移除事件监听(用于子类重写) function this:RemoveListener() + end --界面打开时调用(用于子类重写) -function this:OnOpen(...) - -end - ---界面打开时调用(用于子类重写) -function this:OnShow(_parent,...) +function this:OnOpen(_parent,...) parent=_parent sortingOrder = _parent.sortingOrder parent.title = "探索队伍" local args = {...} this.data = args[1] - this.typeIndex = args[2] + this.typeIndex = args[2] --0 调整编队 1探索 this.mapData = args[3] +end + +function this:OnShow() + LogGreen("刷新编队的请求") for i = 1,math.max(#this.itemList,#this.data) do if not this.data[i] then if this.itemList[i] then @@ -82,6 +82,7 @@ function this:OnShow(_parent,...) end this:TimeCountDown() end + function this:Refresh(_data,_item) _item.data = _data _item.go.gameObject:SetActive(true) @@ -112,13 +113,27 @@ function this:Refresh(_data,_item) _item.heroList[j].icon.sprite = this.spLoader:LoadSprite(heroData.icon) _item.heroList[j].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) Util.AddOnceClick(_item.heroList[j].frame.gameObject,function() - UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,demonId,hero.star) + if this.typeIndex == 0 then + UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,demonId,hero.star) + else + if _data.state < 1 then + ExploreManager.curFormationIndex = _data.formationId + UIManager.OpenPanel(UIName.FormationPanelV2,FORMATION_TYPE.ExploreFunc) + else + PopupTipPanel.ShowTip(string.format("队伍正在探索%s,无法进行调整!",ExploreManager.ExploreMapData[_data.mapId].name)) + end + end end) + Util.AddLongPressClick(_item.heroList[j].frame.gameObject, function() + if this.typeIndex ~= 0 then + UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,demonId,hero.star) + end + end, 0.5) end _item.exploring.gameObject:SetActive(false) _item.updateFormationBtn.gameObject:SetActive(false) _item.scexploreBtnroll.gameObject:SetActive(false) - if _data.state == 0 then + if _data.state < 1 then if this.typeIndex == 0 then _item.updateFormationBtn.gameObject:SetActive(true) else @@ -135,16 +150,25 @@ function this:Refresh(_data,_item) ExploreManager.curFormationIndex = _data.formationId UIManager.OpenPanel(UIName.FormationPanelV2,FORMATION_TYPE.ExploreFunc) end) + if #formation.teamHeroInfos < 1 then + Util.SetGray(_item.scexploreBtnroll,true) + else + Util.SetGray(_item.scexploreBtnroll,false) + end Util.AddOnceClick(_item.scexploreBtnroll,function() - if FormationManager.GetFormationPower(_data.formationId) > this.mapData.force then - --打开时间弹窗 - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data) + if #formation.teamHeroInfos < 1 then + else - MsgPanel.ShowTwo("所选队伍战力小于推荐战力,是否仍要进行探索?", function()end, function() + if FormationManager.GetFormationPower(_data.formationId) > this.mapData.force then --打开时间弹窗 UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data) - end, "取消", "确定", "提示",false,"") - end + else + MsgPanel.ShowTwo("所选队伍战力小于推荐战力,是否仍要进行探索?", function()end, function() + --打开时间弹窗 + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data) + end, "取消", "确定", "提示",false,"") + end + end end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua index be00d4a447..bf58a29408 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua @@ -4,6 +4,7 @@ local parent local sortingOrder local SpecialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,142) local Explore = ConfigManager.GetConfig(ConfigName.Explore) +local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) --初始化组件(用于子类重写) function this:InitComponent(gameObject) this.spLoader = SpriteLoader.New() @@ -13,6 +14,7 @@ function this:InitComponent(gameObject) this.itemRoot = Util.GetGameObject(gameObject, "scroll") this.icon = Util.GetGameObject(gameObject, "bottomLayout/cost/icon"):GetComponent("Image") this.num = Util.GetGameObject(gameObject, "bottomLayout/cost/num"):GetComponent("Text") + this.exploringBtn = Util.GetGameObject(gameObject, "bottomLayout/exploringBtn") this.mapTip = Util.GetGameObject(gameObject, "mapTip") this.mapTimeTip = Util.GetGameObject(gameObject, "mapTimeTip") this.singleMapTipPre = Util.GetGameObject(this.mapTip, "targgetBtnPre") @@ -27,13 +29,30 @@ function this:InitComponent(gameObject) local time = tonumber(strs[i]) table.insert(this.timeList,time) end - + this.gameObject = gameObject + this.transform = this.gameObject.transform this.formationList = {} end --绑定事件(用于子类重写) function this:BindEvent() - + Util.AddClick(this.exploringBtn,function() + local num = 0 + for k,v in pairs(this.formationList) do + if v.select == 1 then + num = num + v.costNum + end + end + this.haveNum = BagManager.GetItemCountById(Explore[1].Cost[1]) + if num == 0 then + elseif num > this.haveNum then + PopupTipPanel.ShowTip(string.format("%s不足,请重新选择队伍和探索时间!",ItemConfig[Explore[1].Cost[1]].Name)) + else + NetManager.ExplorerMapSendRequest(this.formationList,function() + PopupTipPanel.ShowTip("一键探索成功!") + end) + end + end) end function this:OnSortingOrderChange() @@ -50,12 +69,7 @@ function this:RemoveListener() end --界面打开时调用(用于子类重写) -function this:OnOpen(...) - -end - ---界面打开时调用(用于子类重写) -function this:OnShow(_parent,...) +function this:OnOpen(_parent,...) parent=_parent sortingOrder = _parent.sortingOrder parent.title = "一键探索" @@ -64,7 +78,11 @@ function this:OnShow(_parent,...) this.mapDatas = args[2] --地图数据 this.formationList = {} --formationId 为索引 ,预设index,mapId,exploreTime,formationId this.formationId,this.mapId,this.exploreTime = 0,0,0 +end +--界面打开时调用(用于子类重写) +function this:OnShow(_parent,...) + this.icon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(Explore[1].Cost[1])) for i = 1,math.max(#this.itemList,#this.data) do if not this.data[i] then if this.itemList[i] then @@ -80,24 +98,28 @@ function this:OnShow(_parent,...) this.itemList[i].select = Util.GetGameObject(this.itemList[i].formation, "select") this.itemList[i].selectIma = Util.GetGameObject(this.itemList[i].select, "Image") this.itemList[i].targgetBtn = Util.GetGameObject(this.itemList[i].formation, "targgetBtn") - this.itemList[i].targgetBtnText = Util.GetGameObject(this.itemList[i].targgetBtn, "Text") + this.itemList[i].targgetBtnText = Util.GetGameObject(this.itemList[i].targgetBtn, "Text"):GetComponent("Text") this.itemList[i].time = Util.GetGameObject(this.itemList[i].formation, "time"):GetComponent("Text") this.itemList[i].targgetTimeBtn = Util.GetGameObject(this.itemList[i].formation, "targgetTimeBtn") this.itemList[i].targgetTimeBtnText = Util.GetGameObject(this.itemList[i].targgetTimeBtn, "Text"):GetComponent("Text") this.itemList[i].scroll = Util.GetGameObject(this.itemList[i].formation, "scroll") + this.itemList[i].costIcon = Util.GetGameObject(this.itemList[i].formation, "cost/icon"):GetComponent("Image") + this.itemList[i].costNum = Util.GetGameObject(this.itemList[i].formation, "cost/num"):GetComponent("Text") + this.itemList[i].targgetRoot = Util.GetGameObject(this.itemList[i].formation, "tagetpos") + this.itemList[i].targgetTimeRoot = Util.GetGameObject(this.itemList[i].formation, "tagetTimepos") this.itemList[i].heroList = {} for j = 1,6 do this.itemList[i].heroList[j] = {} - this.itemList[i].heroList[j].go = Util.GetGameObject(this.itemList[i].scroll, "heroPro"..j) + this.itemList[i].heroList[j].go = Util.GetGameObject(this.itemList[i].scroll, "heroPro ("..j..")") this.itemList[i].heroList[j].frame = Util.GetGameObject( this.itemList[i].heroList[j].go, "frame"):GetComponent("Image") - this.itemList[i].heroList[j].hero = Util.GetGameObject( this.itemList[i].heroList[j].hero, "heroPro") + this.itemList[i].heroList[j].hero = Util.GetGameObject( this.itemList[i].heroList[j].go, "hero") this.itemList[i].heroList[j].icon = Util.GetGameObject( this.itemList[i].heroList[j].hero, "icon"):GetComponent("Image") this.itemList[i].heroList[j].starGrid = Util.GetGameObject( this.itemList[i].heroList[j].hero, "starGrid") this.itemList[i].heroList[j].proIcon = Util.GetGameObject( this.itemList[i].heroList[j].hero, "proIcon"):GetComponent("Image") this.itemList[i].heroList[j].levelText = Util.GetGameObject( this.itemList[i].heroList[j].hero, "lvbg/levelText"):GetComponent("Text") end - this.itemList[i].exploring = Util.GetGameObject(this.itemList[i].formation, "exploring") - this.itemList[i].exploringText = Util.GetGameObject(this.itemList[i].exploring, "time"):GetComponent("Text") + this.itemList[i].exploring = Util.GetGameObject(this.itemList[i].formation, "exploringBtn") + this.itemList[i].exploringText = Util.GetGameObject(this.itemList[i].exploring, "Text"):GetComponent("Text") end this:Refresh(this.data[i],this.itemList[i],i) @@ -118,6 +140,7 @@ function this:OnShow(_parent,...) this.mapTipPreList[k].data = v Util.AddOnceClick(this.mapTipPreList[k].go,function() this.mapTip.gameObject:SetActive(false) + LogGreen("this.formationId:"..this.formationId) this.formationList[this.formationId].mapId = v.mapId this.SetMapName() end) @@ -144,23 +167,50 @@ function this:OnShow(_parent,...) this:TimeCountDown() end -function this.SetMapName() - this.itemList[this.formationList[this.formationId].index].targgetBtnText.text = Explore[this.formationList[this.formationId].mapId].Name - this.SetExploreCost() +function this.SetMapName(id) + local forId = id or this.formationId + this.itemList[this.formationList[forId].index].targgetBtnText.text = Explore[this.formationList[forId].mapId].Name + this.SetExploreCost(forId) end -function this.SetExploreTime() - this.itemList[this.formationList[this.formationId].index].targgetTimeBtnText.text = this.formationList[this.formationId].exploreTime.."小时" - this.SetExploreCost() +function this.SetExploreTime(id) + local forId = id or this.formationId + this.itemList[this.formationList[forId].index].targgetTimeBtnText.text = this.formationList[forId].exploreTime.."小时" + this.SetExploreCost(forId) end -function this.SetExploreCost() - +function this.SetExploreCost(forId) + if forId then + this.itemList[this.formationList[forId].index].costIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(Explore[this.formationList[forId].mapId].Cost[1])) + this.formationList[forId].costNum = Explore[this.formationList[forId].mapId].Cost[2] * (this.formationList[forId].exploreTime * 60) + this.itemList[this.formationList[forId].index].costNum.text = this.formationList[forId].costNum + end + local num = 0 + for k,v in pairs(this.formationList) do + if v.select == 1 then + num = num + v.costNum + end + end + this.haveNum = BagManager.GetItemCountById(Explore[1].Cost[1]) + if num < this.haveNum then + this.num.text = string.format("%s/%s","00ff00",num,this.haveNum) + else + this.num.text = string.format("%s/%s","ff0000",num,this.haveNum) + end + this.formationId = 0 end -function this.SetPos(gobj,pos) - gobj.gameObject:SetActive(true) - gobj.transform.localPosition = pos +function this.SetPos(gobj,pos,formationId) + if this.formationId ~= formationId then + gobj.transform:SetParent(pos.transform) + gobj.gameObject:SetActive(true) + gobj.transform:GetComponent("RectTransform").anchoredPosition3D = Vector3.zero + gobj.transform.localScale = Vector3.one + this.formationId = formationId + else + gobj.gameObject:SetActive(false) + gobj.transform:SetParent(this.transform) + end end function this:Refresh(_data,_item,index) @@ -186,18 +236,33 @@ function this:Refresh(_data,_item,index) _item.heroList[j].icon.sprite = this.spLoader:LoadSprite(heroData.icon) _item.heroList[j].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) Util.AddOnceClick(_item.heroList[j].frame.gameObject,function() - UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,demonId,hero.star) + if _data.state < 1 then + ExploreManager.curFormationIndex = _data.formationId + UIManager.OpenPanel(UIName.FormationPanelV2,FORMATION_TYPE.ExploreFunc) + else + PopupTipPanel.ShowTip(string.format("队伍正在探索%s,无法进行调整!",ExploreManager.ExploreMapData[_data.mapId].name)) + end end) + Util.AddLongPressClick(_item.heroList[j].frame.gameObject, function() + if this.typeIndex ~= 0 then + UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,demonId,hero.star) + end + end, 0.5) end this.formationList[_data.formationId] = {} --formationId 为索引 ,预设index,mapId,exploreTime,formationId this.formationList[_data.formationId].index = index - this.formationList[_data.formationId].formationId = _data.formationId - if _data.state == 0 then + this.formationList[_data.formationId].formationId = _data.formationId + + if _data.state < 1 then _item.exploring.gameObject:SetActive(false) - this.formationList[_data.formationId].select = 1 + if #formation.teamHeroInfos < 1 then + this.formationList[_data.formationId].select = 0 + else + this.formationList[_data.formationId].select = 1 + end local mapId = PlayerPrefs.GetInt(PlayerManager.uid.."ExploreFormationMap".._data.formationId) - local time = PlayerPrefs.SetInt(PlayerManager.uid.."ExploreFormationTime".._data.formationId) + local time = PlayerPrefs.GetInt(PlayerManager.uid.."ExploreFormationTime".._data.formationId) this.formationList[_data.formationId].mapId = mapId == 0 and this.mapDatas[1].mapId or mapId this.formationList[_data.formationId].exploreTime = time == 0 and this.timeList[1] or time _item.time.text = "探索时间" @@ -207,23 +272,24 @@ function this:Refresh(_data,_item,index) this.formationList[_data.formationId].select = 0 _item.targgetTimeBtn.gameObject:SetActive(false) end - this.SetMapName() - this.SetExploreTime() + this.SetMapName(_data.formationId) + this.SetExploreTime(_data.formationId) _item.selectIma.gameObject:SetActive(this.formationList[_data.formationId].select == 1) Util.AddOnceClick(_item.select,function() - if _data.state == 0 then - this.formationList[_data.formationId].select = this.formationList[_data.formationId].select == 1 and 0 or 0 + if #formation.teamHeroInfos < 1 then + PopupTipPanel.ShowTip("所选队伍为空,无法进行探索!") + elseif _data.state < 1 then + this.formationList[_data.formationId].select = this.formationList[_data.formationId].select == 1 and 0 or 1 _item.selectIma.gameObject:SetActive(this.formationList[_data.formationId].select == 1) + this.SetExploreCost() end end) Util.AddOnceClick(_item.targgetBtn,function() - this.formationId = _data.formationId - this.SetPos(this.mapTip,_item.go.pos) + this.SetPos(this.mapTip,_item.targgetRoot,_data.formationId) end) Util.AddOnceClick(_item.targgetTimeBtn,function() - this.formationId = _data.formationId - this.SetPos(this.mapTimeTip,_item.go.pos) + this.SetPos(this.mapTimeTip,_item.targgetTimeRoot,_data.formationId) end) Util.AddOnceClick(_item.exploring,function() @@ -247,7 +313,7 @@ function this:TimeCountDown() this.itemList[i].data.exploreTime = 0 this:Refresh(this.itemList[i].data,this.itemList[i],i) else - this.itemList[i].time.text = string.format("%后结束探索",TimeStampToDateStr3new1(time)) + this.itemList[i].time.text = string.format("%s后结束探索",TimeStampToDateStr3new1(time)) end end end @@ -261,6 +327,8 @@ function this:OnClose() this.timer:Stop() this.timer = nil end + this.SetPos(this.mapTip,nil,this.formationId) + this.SetPos(this.mapTimeTip,nil,this.formationId) end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_ExploreMapTip.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_ExploreMapTip.lua index 454db12446..e5a29cea20 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_ExploreMapTip.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_ExploreMapTip.lua @@ -86,7 +86,7 @@ function this:Refresh() self.itemList[i].cost[j] = SubUIManager.Open(SubUIConfig.ItemView,self.itemList[i].scrollGrid.transform) end self.itemList[i].cost[j].gameObject:SetActive(true) - self.itemList[i].cost[j]:OnOpen(false, {singledata.reward[j]}, 0.65,false,false,false,self.sortingOrder) + self.itemList[i].cost[j]:OnOpen(false, {singledata.reward[j],0}, 0.65,false,false,false,self.sortingOrder) end end else diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SelectExploreTime.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SelectExploreTime.lua index 8974da1079..265a917b4d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SelectExploreTime.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SelectExploreTime.lua @@ -13,6 +13,7 @@ function this:InitComponent(gameObject) this.add = Util.GetGameObject(gameObject,"btnAdd") this.reduce = Util.GetGameObject(gameObject,"btnReduce") this.numTime = Util.GetGameObject(gameObject,"numTime"):GetComponent("Text") + this.cost = Util.GetGameObject(gameObject,"cost") this.icon = Util.GetGameObject(gameObject,"cost/icon"):GetComponent("Image") this.num = Util.GetGameObject(gameObject,"cost/num"):GetComponent("Text") @@ -45,17 +46,22 @@ function this:BindEvent() return end local costnum = this.mapData.cost[2] * (this.exploreTime * 60) - if costnum < this.haveNum then - PopupTipPanel.ShowTip(string.format("%s不足,无法进行探索!",itemConfig[this.mapData.cost[1]])) + if costnum > this.haveNum then + PopupTipPanel.ShowTip(string.format("%s不足,无法进行探索!",itemConfig[this.mapData.cost[1]].Name)) + return else NetManager.ExplorerMapSendRequest({[1] = {mapId = this.mapData.mapId,formationId = this.formation.formationId,exploreTime = this.exploreTime},},function() PopupTipPanel.ShowTip(string.format("已派遣队伍%s前往%s进行%s小时的探索!",this.formation.formationName,this.mapData.name,this.exploreTime)) + this.parent:ClosePanel() end) end end) Util.AddOnceClick(this.btnCancel,function() this.parent:ClosePanel() end) + Util.AddSlider(this.slider.gameObject, function(go, value) + this:Refresh() + end) end function this:AddListener() @@ -88,10 +94,11 @@ function this:Refresh() this.numTime.text = this.exploreTime.."小时" local costnum = this.mapData.cost[2] * (this.exploreTime * 60) if costnum < this.haveNum then - this.num.text = string.format("%s/%s","ff0000",costnum,this.haveNum) - else this.num.text = string.format("%s/%s","00ff00",costnum,this.haveNum) + else + this.num.text = string.format("%s/%s","ff0000",costnum,this.haveNum) end + ForceRebuildLayout(this.cost.transform) end function this:OnClose()