Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

xiyou_yueNanZhengshi
zhangjiannan 2024-09-24 11:42:14 +08:00
commit 3b102b2da9
3 changed files with 70 additions and 70 deletions

View File

@ -37802,10 +37802,10 @@ RectTransform:
m_Father: {fileID: 6035928346442226049} m_Father: {fileID: 6035928346442226049}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 26, y: -37} m_AnchoredPosition: {x: 0, y: 29.71}
m_SizeDelta: {x: 47.5, y: 30} m_SizeDelta: {x: 120, y: 59.42}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7170575689222955656 --- !u!222 &7170575689222955656
CanvasRenderer: CanvasRenderer:
@ -37837,15 +37837,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 7
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10 m_Text: 10
@ -69419,10 +69419,10 @@ RectTransform:
m_Father: {fileID: 6273053659416594963} m_Father: {fileID: 6273053659416594963}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 26, y: -37} m_AnchoredPosition: {x: 0, y: 30}
m_SizeDelta: {x: 47.5, y: 30} m_SizeDelta: {x: 120, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1711886698924446773 --- !u!222 &1711886698924446773
CanvasRenderer: CanvasRenderer:
@ -69454,15 +69454,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 7
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10 m_Text: 10
@ -75094,10 +75094,10 @@ RectTransform:
m_Father: {fileID: 3282806257799198579} m_Father: {fileID: 3282806257799198579}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 26, y: -37} m_AnchoredPosition: {x: 0, y: 30.17}
m_SizeDelta: {x: 47.5, y: 30} m_SizeDelta: {x: 120, y: 60.34}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2165980520961424500 --- !u!222 &2165980520961424500
CanvasRenderer: CanvasRenderer:
@ -75129,15 +75129,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 7
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10 m_Text: 10
@ -90003,10 +90003,10 @@ RectTransform:
m_Father: {fileID: 4819200128724592751} m_Father: {fileID: 4819200128724592751}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 26, y: -37} m_AnchoredPosition: {x: 0, y: 29.76}
m_SizeDelta: {x: 47.5, y: 30} m_SizeDelta: {x: 120, y: 59.52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4434787947225850350 --- !u!222 &4434787947225850350
CanvasRenderer: CanvasRenderer:
@ -90038,15 +90038,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 7
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10 m_Text: 10
@ -115265,10 +115265,10 @@ RectTransform:
m_Father: {fileID: 471215880121819251} m_Father: {fileID: 471215880121819251}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 26, y: -37} m_AnchoredPosition: {x: 0, y: 30}
m_SizeDelta: {x: 47.5, y: 30} m_SizeDelta: {x: 120, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8015444118565294912 --- !u!222 &8015444118565294912
CanvasRenderer: CanvasRenderer:
@ -115300,15 +115300,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 7
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10 m_Text: 10
@ -157817,10 +157817,10 @@ RectTransform:
m_Father: {fileID: 8804829127216541687} m_Father: {fileID: 8804829127216541687}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 26, y: -37} m_AnchoredPosition: {x: 0, y: 29.163}
m_SizeDelta: {x: 47.5, y: 30} m_SizeDelta: {x: 120, y: 58.325}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6001549113703724145 --- !u!222 &6001549113703724145
CanvasRenderer: CanvasRenderer:
@ -157852,15 +157852,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 7
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10 m_Text: 10
@ -179328,10 +179328,10 @@ RectTransform:
m_Father: {fileID: 1177600030108842559} m_Father: {fileID: 1177600030108842559}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 26, y: -37} m_AnchoredPosition: {x: 0, y: 30.078}
m_SizeDelta: {x: 47.5, y: 30} m_SizeDelta: {x: 120, y: 60.155}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2113030921483348717 --- !u!222 &2113030921483348717
CanvasRenderer: CanvasRenderer:
@ -179363,15 +179363,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 7
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10 m_Text: 10
@ -184969,9 +184969,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417} m_Father: {fileID: 3952385394978222417}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: -50} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &109213283015355470 --- !u!114 &109213283015355470
@ -208207,10 +208207,10 @@ RectTransform:
m_Father: {fileID: 1154005965462122886} m_Father: {fileID: 1154005965462122886}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 26, y: -37} m_AnchoredPosition: {x: 0, y: 30}
m_SizeDelta: {x: 47.5, y: 30} m_SizeDelta: {x: 120, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1754709626428150164 --- !u!222 &1754709626428150164
CanvasRenderer: CanvasRenderer:
@ -208242,15 +208242,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 7
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10 m_Text: 10

View File

@ -2049,7 +2049,7 @@ function this.RefreshEightGiftPreview()
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.qiandaohaoli) then if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.qiandaohaoli) then
this.FestevaBtn:SetActive(true) this.FestevaBtn:SetActive(true)
Util.GetGameObject(this.FestevaBtn, "Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite( Util.GetGameObject(this.FestevaBtn, "Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(
"q_baichoupaisong_rukou") "r_shouchao_xiaozidi")
else else
this.FestevaBtn:SetActive(false) this.FestevaBtn:SetActive(false)
end end

View File

@ -10,8 +10,8 @@ local ImgType = {
mask = "y_yjj_128dikuang001", mask = "y_yjj_128dikuang001",
rewardBg = "y_yjj_128kuang", rewardBg = "y_yjj_128kuang",
downBg = "y_yjj_128kuang001", downBg = "y_yjj_128kuang001",
rewardPreview = "y_yjj_128kuang004", rewardPreview = "s_sanshibei_xiaobiaodi",
rewardPreviewText = "y_yjj_128kuang005", rewardPreviewText = "s_sanshibei_biaotizi_zh",
reward = "y_yjj_1280", reward = "y_yjj_1280",
iconId = 15, iconId = 15,
}, },