diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index cfea0a838f..fcff2d3d9e 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -13805,8 +13805,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 30} - m_SizeDelta: {x: 100, y: 50} + m_AnchoredPosition: {x: 73.47, y: 30} + m_SizeDelta: {x: 246.96, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1129836208852214349 CanvasRenderer: @@ -13838,18 +13838,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5565\u5565\u5565\u5565\u5565\u5565" + m_Text: "\u5565\u5565\u5565\u5565\u5565\u5565\u5341\u5927\u5BCC\u8C6A\u5730\u65B9" LanguageIndex: 0 --- !u!1 &1375908083197453530 GameObject: @@ -16656,10 +16656,10 @@ RectTransform: m_Father: {fileID: 2984406637957294576} m_RootOrder: 0 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: 0, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 111, y: -39} + m_SizeDelta: {x: 182, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8901599938845851609 CanvasRenderer: @@ -18249,7 +18249,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6207233311855498205 RectTransform: m_ObjectHideFlags: 0 @@ -21412,7 +21412,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: -844, y: 333} + m_AnchoredPosition: {x: -1169, y: 333} m_SizeDelta: {x: 420, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2907061961995680823 @@ -22255,10 +22255,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} m_RootOrder: 2 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 524, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7938110807914979896 CanvasRenderer: @@ -27465,7 +27465,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2221885512223848565 RectTransform: m_ObjectHideFlags: 0 @@ -29403,10 +29403,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} m_RootOrder: 3 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 692, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9123156298422617933 CanvasRenderer: @@ -29521,10 +29521,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 356, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3360686523141670100 CanvasRenderer: @@ -30782,10 +30782,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} m_RootOrder: 0 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 188, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2874496421868159407 CanvasRenderer: @@ -31576,9 +31576,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.66667, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6665704931721194040 @@ -34114,9 +34114,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 583.3334, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &977875292258055025 @@ -41057,9 +41057,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 350, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &773993077155745798 @@ -42057,10 +42057,10 @@ RectTransform: m_Father: {fileID: 2984406637957294576} 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: 0, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 525, y: -39} + m_SizeDelta: {x: 646, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4164081279567279265 CanvasRenderer: @@ -43214,9 +43214,9 @@ RectTransform: m_Father: {fileID: 2428012996653233923} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 282, y: -35} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8675641990459156184 @@ -52329,10 +52329,10 @@ RectTransform: m_Father: {fileID: 2428012996653233923} m_RootOrder: 0 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: 0, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 151, y: -35} + m_SizeDelta: {x: 262, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6340918513921812379 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index 47567e6cce..e9686f18f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -175,8 +175,9 @@ function YiJingBaoKu:Refresh() self:TimeCountDown()--时间 self:AddBackToFrontClick()--增加背面的带点击事件 trigger = true - self.addBtn:GetComponent("Button").enabled = self.ActData.selectId == 0 - self.name.text = Language[10262]..NumToSimplenessFont[self.ActData.curLevel]..Language[10269] + --self.addBtn:GetComponent("Button").enabled = self.ActData.selectId == 0 + LogError("self.ActData.curLevel=="..self.ActData.curLevel) + self.name.text = Language[10262]..self.ActData.curLevel..Language[10269] self.tip2.text = Language[10525] local t1 = true