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

xiyou_yueNanZhengshi
zhangjiannan 2024-12-04 16:02:51 +08:00
commit c6132f8129
3 changed files with 62 additions and 62 deletions

View File

@ -10149,8 +10149,8 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 144, y: -25} m_AnchoredPosition: {x: 140.5, y: -25}
m_SizeDelta: {x: 218, y: 41} m_SizeDelta: {x: 211, y: 39}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8247621990448236055 --- !u!222 &8247621990448236055
CanvasRenderer: CanvasRenderer:
@ -10182,7 +10182,7 @@ 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: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 32 m_FontSize: 31
m_FontStyle: 1 m_FontStyle: 1
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 0
@ -10192,7 +10192,7 @@ MonoBehaviour:
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 0.8
m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641" m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641"
LanguageIndex: 0 LanguageIndex: 0
--- !u!114 &3611101789726035947 --- !u!114 &3611101789726035947
@ -36725,8 +36725,8 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 144, y: -25} m_AnchoredPosition: {x: 140.5, y: -25}
m_SizeDelta: {x: 218, y: 41} m_SizeDelta: {x: 211, y: 39}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1013326769909418697 --- !u!222 &1013326769909418697
CanvasRenderer: CanvasRenderer:
@ -36758,7 +36758,7 @@ 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: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 32 m_FontSize: 31
m_FontStyle: 1 m_FontStyle: 1
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 0
@ -36768,7 +36768,7 @@ MonoBehaviour:
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 0.8
m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641" m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641"
LanguageIndex: 0 LanguageIndex: 0
--- !u!114 &9198052574504924121 --- !u!114 &9198052574504924121
@ -37130,8 +37130,8 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 539, y: -37.9} m_AnchoredPosition: {x: 539, y: -61.1}
m_SizeDelta: {x: 253, y: 50} m_SizeDelta: {x: 246, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8895143784367814997 --- !u!222 &8895143784367814997
CanvasRenderer: CanvasRenderer:
@ -44744,8 +44744,8 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 144, y: -25} m_AnchoredPosition: {x: 140.5, y: -25}
m_SizeDelta: {x: 218, y: 41} m_SizeDelta: {x: 211, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2000683844131510340 --- !u!222 &2000683844131510340
CanvasRenderer: CanvasRenderer:
@ -44777,7 +44777,7 @@ 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: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 32 m_FontSize: 31
m_FontStyle: 1 m_FontStyle: 1
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 0
@ -44787,8 +44787,8 @@ MonoBehaviour:
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 0.8
m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641" m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641\n\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641\n\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641"
LanguageIndex: 0 LanguageIndex: 0
--- !u!114 &8676253627679503734 --- !u!114 &8676253627679503734
MonoBehaviour: MonoBehaviour:
@ -45632,8 +45632,8 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 842, y: -37.9} m_AnchoredPosition: {x: 835, y: -61.1}
m_SizeDelta: {x: 253, y: 50} m_SizeDelta: {x: 246, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7482447687966766876 --- !u!222 &7482447687966766876
CanvasRenderer: CanvasRenderer:
@ -56567,8 +56567,8 @@ RectTransform:
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.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -99} m_AnchoredPosition: {x: 0, y: -100.1}
m_SizeDelta: {x: 1078, y: 75.8} m_SizeDelta: {x: 1078, y: 122.2}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6765032113628322309 --- !u!222 &6765032113628322309
CanvasRenderer: CanvasRenderer:
@ -56975,8 +56975,8 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 236, y: -37.9} m_AnchoredPosition: {x: 243, y: -61.1}
m_SizeDelta: {x: 253, y: 50} m_SizeDelta: {x: 246, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9203699598478829233 --- !u!222 &9203699598478829233
CanvasRenderer: CanvasRenderer:
@ -71381,20 +71381,20 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 35 value: 35
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_IsActive
value: 43 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 38 value: 38
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_LocalPosition.y
value: 0 value: 43
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
@ -71646,20 +71646,20 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 35 value: 35
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_IsActive
value: 43 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 38 value: 38
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_LocalPosition.y
value: 0 value: 43
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
@ -71911,20 +71911,20 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 35 value: 35
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_IsActive
value: 43 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 38 value: 38
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_LocalPosition.y
value: 0 value: 43
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
@ -72176,20 +72176,20 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 35 value: 35
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_IsActive
value: 43 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 38 value: 38
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_LocalPosition.y
value: 0 value: 43
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
@ -72441,20 +72441,20 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 35 value: 35
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_IsActive
value: 43 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 38 value: 38
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_LocalPosition.y
value: 0 value: 43
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
@ -72706,20 +72706,20 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 35 value: 35
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_IsActive
value: 43 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 38 value: 38
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_LocalPosition.y
value: 0 value: 43
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}

View File

@ -75,8 +75,8 @@ end
function this:OnOpen(_data, _openPanel) function this:OnOpen(_data, _openPanel)
openPanel = _openPanel openPanel = _openPanel
buildData = _data buildData = _data
self.title.text = buildData.dataMain.Name self.title.text = GetLanguageStrById(buildData.dataMain.Name)
self.infoTxt.text = buildData.dataMain.Name .. Language[11599] .. buildData.dataSingle.Gain .. Language[11600] self.infoTxt.text = GetLanguageStrById(buildData.dataMain.Name) .. Language[11599] .. buildData.dataSingle.Gain .. Language[11600]
--leftTime=_leftTime --leftTime=_leftTime
curHeroId = buildData.heroId curHeroId = buildData.heroId
--LogError("buildData.dataMain.Id==="..buildData.dataMain.Id) --LogError("buildData.dataMain.Id==="..buildData.dataMain.Id)
@ -202,8 +202,8 @@ function this:ShowSingleHero(go, data, index)
itemData.Quantity)) itemData.Quantity))
Util.GetGameObject(go, "bg/icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(itemData Util.GetGameObject(go, "bg/icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(itemData
.ResourceID)) .ResourceID))
Util.GetGameObject(go, "bg/name"):GetComponent("Text").text = itemData.Name Util.GetGameObject(go, "bg/name"):GetComponent("Text").text = GetLanguageStrById(itemData.Name)
Util.GetGameObject(go, "bg/condition"):GetComponent("Text").text = itemData.ItemDescribe Util.GetGameObject(go, "bg/condition"):GetComponent("Text").text = GetLanguageStrById(itemData.ItemDescribe)
local numTxt = Util.GetGameObject(go, "bg/numTxt"):GetComponent("Text") local numTxt = Util.GetGameObject(go, "bg/numTxt"):GetComponent("Text")
local btn_up = Util.GetGameObject(go, "bg/btnGet") local btn_up = Util.GetGameObject(go, "bg/btnGet")
Util.GetGameObject(go, "bg/btnGet/get"):GetComponent("Text").text = Language[11602] Util.GetGameObject(go, "bg/btnGet/get"):GetComponent("Text").text = Language[11602]

View File

@ -233,7 +233,7 @@ function RewardBoxPanel:SetSingleGiftData(index, item, dataList)
-- end -- end
if heroConfig.ItemType == ItemType.Talisman then if heroConfig.ItemType == ItemType.Talisman then
if heroConfig.ItemDescribe then if heroConfig.ItemDescribe then
local aaa = string.split(heroConfig.ItemDescribe, '') local aaa = string.split(GetLanguageStrById(heroConfig.ItemDescribe), '')
if aaa and #aaa > 0 then if aaa and #aaa > 0 then
des.gameObject:SetActive(true) des.gameObject:SetActive(true)
des.text = aaa[1] des.text = aaa[1]