diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab index 660034d963..9765064c9d 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab @@ -1142,6 +1142,7 @@ RectTransform: m_Children: - {fileID: 845541569599433657} - {fileID: 6141158140942588348} + - {fileID: 1469755645464906340} m_Father: {fileID: 5024074326047684402} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2971,6 +2972,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6539863478341557669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1469755645464906340} + - component: {fileID: 4187349440277832370} + - component: {fileID: 6492539549804679135} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1469755645464906340 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6539863478341557669} + 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: 402076064177301732} + 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: 97, y: 12} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4187349440277832370 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6539863478341557669} + m_CullTransparentMesh: 0 +--- !u!114 &6492539549804679135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6539863478341557669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6869460597188224977 GameObject: m_ObjectHideFlags: 0 @@ -4530,73 +4605,238 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.x - value: 20.492996 - objectReference: {fileID: 0} - - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 5281282623979792560} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 7429575961572565297} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 186826078127468430} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 649977235966293816} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 4973402660684051298} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 7033047217563051855} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 116396027959865250} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 22917307789877738} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 8291737999178145131} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 313910608617404809} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_RootBone + value: + objectReference: {fileID: 5281282623979792560} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 3289790066112278941} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 5114861618318833207} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 6656672308102520261} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 6521091515858831810} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 3436607979250984129} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 8561694787768035624} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 7173161058199327705} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 6087597738671136390} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 805203461045515516} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 1601103905695646996} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 3289790066112278941} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} +--- !u!4 &5114861618318833207 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1601103905695646996 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6087597738671136390 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6656672308102520261 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7429575961572565297 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5281282623979792560 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &313910608617404809 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &22917307789877738 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6521091515858831810 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3436607979250984129 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &186826078127468430 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &649977235966293816 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4973402660684051298 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7033047217563051855 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &116396027959865250 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8561694787768035624 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7173161058199327705 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &805203461045515516 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8291737999178145131 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3289790066112278941 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 6944794551443520945} + m_PrefabAsset: {fileID: 0} --- !u!224 &4849960437125264606 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab index 7d58718c84..32a2406d06 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab @@ -2791,6 +2791,7 @@ RectTransform: m_Children: - {fileID: 6702630577845545561} - {fileID: 1464501352932509924} + - {fileID: 7905359175486281213} m_Father: {fileID: 1370899235566794450} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3138,6 +3139,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7591626379773588441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7905359175486281213} + - component: {fileID: 1956439711948451403} + - component: {fileID: 2415890741735788004} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7905359175486281213 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7591626379773588441} + 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: 4971768374826056124} + 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: 92.7, y: 7} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1956439711948451403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7591626379773588441} + m_CullTransparentMesh: 0 +--- !u!114 &2415890741735788004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7591626379773588441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7740322834635730224 GameObject: m_ObjectHideFlags: 0 @@ -3700,31 +3775,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2656711172591673257, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 + propertyPath: m_RootOrder + value: 16 objectReference: {fileID: 0} - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -3735,56 +3795,241 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.x - value: 20.492996 - objectReference: {fileID: 0} - - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 7432402436113426622} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 5293127911268393279} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 3240460224080572288} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 2840362793928472374} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 7740213782836015980} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 5761712634343647041} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3454918016999600044} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3332306486969623012} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 6736817646950735205} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 3041315385410730375} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 7432402436113426622} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 272606939306848659} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 7535775316978415161} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 8218664706754911691} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 8363257201524967884} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 134712767994979535} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 6394707123396274470} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 5612610801638118359} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 8796847083114798728} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 2685122275388404978} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 4059876004828611866} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 272606939306848659} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} +--- !u!4 &272606939306848659 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7535775316978415161 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6736817646950735205 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3454918016999600044 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5612610801638118359 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5761712634343647041 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7740213782836015980 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2840362793928472374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3240460224080572288 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3332306486969623012 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5293127911268393279 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4059876004828611866 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7432402436113426622 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} --- !u!224 &7863660303576691920 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} +--- !u!4 &8796847083114798728 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8218664706754911691 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6394707123396274470 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &134712767994979535 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8363257201524967884 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2685122275388404978 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3041315385410730375 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua index cf2d8efdf3..34c314369a 100644 --- a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua @@ -23,6 +23,7 @@ function FourElementSingleWave:InitComponent(go,_data,_curType) self.fightBtnIcon = Util.GetGameObject(self.fight,"layout/icon"):GetComponent("Image") self.fightBtnNum = Util.GetGameObject(self.fight,"layout/num"):GetComponent("Text") self.fightBtnText = Util.GetGameObject(self.fight,"layout/Text"):GetComponent("Text") + self.fightBtnRed = Util.GetGameObject(self.fight,"red") self.fightBtnMask = Util.GetGameObject(self.fight,"mask"):GetComponent("Image") self.bg = Util.GetGameObject(go,"bg"):GetComponent("Image") self.rewardGrid = Util.GetGameObject(self.reward,"grid") @@ -179,6 +180,7 @@ end function FourElementSingleWave:SetIcon() Util.SetGray(self.fight,false) + self.fightBtnRed:SetActive(false) if self.data.wave == self.trailData.monsterWave then self.rewardData = self.data.commonReward --设置扫荡按钮 @@ -186,6 +188,7 @@ function FourElementSingleWave:SetIcon() if self.freeTimes > 0 then self.fightBtnIcon.gameObject:SetActive(false) self.fightBtnNum.gameObject:SetActive(false) + self.fightBtnRed:SetActive(true) self.fightBtnText.text = string.format("%s","17232A","免费扫荡") self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02") Util.SetGray(self.fight,false) diff --git a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua index f036c5eb96..b479e9db7b 100644 --- a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua @@ -36,6 +36,7 @@ function MonsterCampSingleWave:InitComponent(go,_data) self.fightBtnIcon = Util.GetGameObject(self.fight,"layout/icon"):GetComponent("Image") self.fightBtnNum = Util.GetGameObject(self.fight,"layout/num"):GetComponent("Text") self.fightBtnText = Util.GetGameObject(self.fight,"layout/Text"):GetComponent("Text") + self.fightBtnRed = Util.GetGameObject(self.fight,"red") self.fightBtnMask = Util.GetGameObject(self.fight,"mask"):GetComponent("Image") self.bg = Util.GetGameObject(go,"bg"):GetComponent("Image") self.rewardGrid = Util.GetGameObject(self.reward,"grid") @@ -199,12 +200,14 @@ function MonsterCampSingleWave:SetIcon() self.fight.gameObject:SetActive(true) self.hero.transform.localPosition = Vector3.New(0,3,0) if self.freeTimes > 0 then + self.fightBtnRed:SetActive(true) self.fightBtnText.text = string.format("%s","17232A","免费扫荡") self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02") else self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02") self.fightBtnIcon.gameObject:SetActive(true) self.fightBtnNum.gameObject:SetActive(true) + self.fightBtnRed:SetActive(false) local color = BagManager.GetItemCountById(self.itemId) < self.costNum and "E71515" or "17232A" self.fightBtnNum.text =string.format("%s",color,self.costNum) self.fightBtnText.text = string.format("%s",color,"扫荡") @@ -218,6 +221,7 @@ function MonsterCampSingleWave:SetIcon() self.hero.transform.localPosition = Vector3.New(0,3,0) self.fightBtnIcon.gameObject:SetActive(false) self.fightBtnNum.gameObject:SetActive(false) + self.fightBtnRed:SetActive(false) self.fightBtnMask:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_shouchong_anniu") self.fightBtnText.text = string.format("%s","17232A","挑战") elseif self.data.Id > MonsterCampManager.monsterWave then