diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab index 6f8af9804f..544fb4a77f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab @@ -112,10 +112,10 @@ RectTransform: m_Father: {fileID: 1644627164} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 174, y: 0} - m_SizeDelta: {x: 37.53, y: 48.77} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 48.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &83303293 CanvasRenderer: @@ -384,7 +384,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1644627164} - m_RootOrder: 3 + 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} @@ -729,12 +729,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1644627164} - m_RootOrder: 4 + 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: -150, y: 0} - m_SizeDelta: {x: 37.53, y: 48.77} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 48.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &809119151 CanvasRenderer: @@ -808,12 +808,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1644627164} - m_RootOrder: 0 + 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: -24.695007, y: -2.7} - m_SizeDelta: {x: 213.08, y: 48.77} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 48.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &834940287 CanvasRenderer: @@ -1546,12 +1546,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1644627164} - m_RootOrder: 2 + 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: 122.68, y: -4.1} - m_SizeDelta: {x: 81.49, y: 48.77} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 48.77} m_Pivot: {x: 0.6004501, y: 0.5} --- !u!222 &1542909634 CanvasRenderer: @@ -1745,7 +1745,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1644627164} - m_RootOrder: 1 + 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} @@ -1804,6 +1804,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1644627164} + - component: {fileID: 794197693459959892} + - component: {fileID: 2557137249651621182} m_Layer: 5 m_Name: bottomInfo m_TagString: Untagged @@ -1822,11 +1824,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 809119149} - {fileID: 834940285} - {fileID: 1615766573} - {fileID: 1542909632} - {fileID: 305564107} - - {fileID: 809119149} - {fileID: 83303291} m_Father: {fileID: 749036027} m_RootOrder: 7 @@ -1834,8 +1836,45 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 4, y: -581.52} - m_SizeDelta: {x: 100, y: 65.37} + m_SizeDelta: {x: 0, y: 65.37} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &794197693459959892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644627163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &2557137249651621182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644627163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1749343157 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index 36da659acc..5c6eebbe77 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -960,7 +960,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 50, y: 250} + m_AnchoredPosition: {x: 70, y: 250} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1268062932 @@ -7056,7 +7056,7 @@ ParticleSystem: --- !u!199 &199863757602398463 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -12009,7 +12009,7 @@ ParticleSystem: --- !u!199 &199277944597508649 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -17250,7 +17250,7 @@ ParticleSystem: --- !u!199 &199620212612641227 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -22700,7 +22700,7 @@ ParticleSystem: --- !u!199 &199678057150230830 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28013,7 +28013,7 @@ ParticleSystem: --- !u!199 &199242386039770093 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -32819,7 +32819,7 @@ ParticleSystem: --- !u!199 &199183534652431558 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37713,7 +37713,7 @@ ParticleSystem: --- !u!199 &199382468355368573 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42531,7 +42531,7 @@ ParticleSystem: --- !u!199 &199520913369295131 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48542,7 +48542,7 @@ ParticleSystem: --- !u!199 &199289281613241803 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54846,7 +54846,7 @@ ParticleSystem: --- !u!199 &5322675852388844486 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59799,7 +59799,7 @@ ParticleSystem: --- !u!199 &4894120905098160247 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -65202,7 +65202,7 @@ ParticleSystem: --- !u!199 &8823971680245043867 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70172,7 +70172,7 @@ ParticleSystem: --- !u!199 &8430471708784069297 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -75273,7 +75273,7 @@ ParticleSystem: --- !u!199 &2382551773405935352 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -80290,7 +80290,7 @@ ParticleSystem: --- !u!199 &7962120996366852011 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -85615,7 +85615,7 @@ ParticleSystem: --- !u!199 &2541572793355743759 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90911,7 +90911,7 @@ ParticleSystem: --- !u!199 &3827168092298310546 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -95646,7 +95646,7 @@ ParticleSystem: --- !u!199 &3827342338386557868 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -101875,7 +101875,7 @@ ParticleSystem: --- !u!199 &1560116421555167131 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -108555,7 +108555,7 @@ ParticleSystem: --- !u!199 &4720626719302079074 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -113921,7 +113921,7 @@ ParticleSystem: --- !u!199 &5535316913343579795 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -127123,7 +127123,7 @@ ParticleSystem: --- !u!199 &629998129000523010 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 506afaccd0..427c8129ff 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -9761,7 +9761,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 11.6, y: -189.5} + m_AnchoredPosition: {x: 0, y: -189.5} m_SizeDelta: {x: 274.8, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5295975462223937749 @@ -9799,10 +9799,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A15" @@ -10642,7 +10642,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 143.69997, y: 59.15} + m_AnchoredPosition: {x: 103, y: 59.15} m_SizeDelta: {x: 649.4, y: 47.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1082563763767482862 @@ -11717,13 +11717,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5132700949924631715} - m_RootOrder: 3 + m_Father: {fileID: 1998346178254525643} + 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: 143.69998, y: -58} - m_SizeDelta: {x: 649.4, y: 47.4} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 89.75, y: -30} + m_SizeDelta: {x: 179.5, y: 47.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3212642386950615541 CanvasRenderer: @@ -12935,7 +12935,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u9760\u8FD1\u654C\u4EBA\u540E\u81EA\u52A8\u8FDB\u5165\u6218\u6597" @@ -16303,7 +16303,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 22.3, y: -135.8} + m_AnchoredPosition: {x: 0, y: -135.8} m_SizeDelta: {x: 321.54, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2733125391278969484 @@ -16341,10 +16341,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u672C\u8F6E\u53EF\u4F7F\u7528\u6B21\u6570\uFF1A5" @@ -17704,8 +17704,7 @@ RectTransform: - {fileID: 179865008135587827} - {fileID: 5742900118657121554} - {fileID: 143724441311515352} - - {fileID: 2783922544086371148} - - {fileID: 4734496649979082373} + - {fileID: 1998346178254525643} m_Father: {fileID: 7048938129304848538} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18547,7 +18546,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 143.69998, y: 0.0000076293945} + m_AnchoredPosition: {x: 103.00003, y: 0.0000076293945} m_SizeDelta: {x: 649.4, y: 47.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8410508920504417253 @@ -19145,7 +19144,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u8FDB\u5165\u4E0B\u4E00\u5C42\u540E\u81EA\u52A8\u62FE\u53D6\u9053\u5177" @@ -23655,7 +23654,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u795E\u5C06\u8840\u91CF\u964D\u81F340%\u4EE5\u4E0B\u65F6\u81EA\u52A8\u4F7F\u7528\u56DE\u6625\u6563" @@ -27402,17 +27401,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7703650954544779112} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 7955883067963928827} - m_Father: {fileID: 5132700949924631715} - m_RootOrder: 4 + m_Father: {fileID: 1998346178254525643} + 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: 73, y: -58} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 204.5, y: -30} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5219305532786946576 @@ -34436,6 +34435,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8860201067443762686} m_CullTransparentMesh: 0 +--- !u!1 &8873491693967289325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1998346178254525643} + - component: {fileID: 6465969098069954744} + - component: {fileID: 4838425941480490979} + m_Layer: 5 + m_Name: obj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1998346178254525643 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8873491693967289325} + 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: 2783922544086371148} + - {fileID: 4734496649979082373} + m_Father: {fileID: 5132700949924631715} + 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: -50, y: -56} + m_SizeDelta: {x: 229.5, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6465969098069954744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8873491693967289325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &4838425941480490979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8873491693967289325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 --- !u!1 &8959714223024519462 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua index a3144e60e2..80f6ee49d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua @@ -25,8 +25,8 @@ function this:InitComponent(gameObject) this.item=Util.GetGameObject(this.body,"Item") this.desc=Util.GetGameObject(this.body,"Desc"):GetComponent("Text") this.time=Util.GetGameObject(this.body,"Time"):GetComponent("Text") - this.num=Util.GetGameObject(this.body,"Num"):GetComponent("Text") - this.addBtn=Util.GetGameObject(this.body,"Add") + this.num=Util.GetGameObject(this.body,"obj/Num"):GetComponent("Text") + this.addBtn=Util.GetGameObject(this.body,"obj/Add") this.grid = Util.GetGameObject(gameObject, "Root/Grid") this.pre=Util.GetGameObject(gameObject,"Root/Grid/Pre") this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")