Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-06-30 17:19:59 +08:00
commit 3c9b593dfa
5 changed files with 24 additions and 38 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 359 KiB

After

Width:  |  Height:  |  Size: 334 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -4363,8 +4363,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -8.9, y: -130.29999}
m_SizeDelta: {x: 257, y: 87}
m_AnchoredPosition: {x: -1, y: -128}
m_SizeDelta: {x: 265, y: 87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1978896024203804663
CanvasRenderer:
@ -5199,6 +5199,7 @@ GameObject:
- component: {fileID: 3260027999130258769}
- component: {fileID: 3260027999130258775}
- component: {fileID: 6870029257176831716}
- component: {fileID: 7223917086581848817}
m_Layer: 5
m_Name: num
m_TagString: Untagged
@ -5246,7 +5247,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9921569, g: 0.6745098, b: 0, a: 1}
m_Color: {r: 1, g: 0.9764706, b: 0.8784314, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -5268,6 +5269,21 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u7B2C55\u5C42"
LanguageIndex: 10238
--- !u!114 &7223917086581848817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3260027999130258770}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.3529412, g: 0.18039216, b: 0.043137256, a: 0.5}
m_EffectDistance: {x: 1, y: -2}
m_UseGraphicAlpha: 1
--- !u!1 &3263340749084306874
GameObject:
m_ObjectHideFlags: 0
@ -11798,7 +11814,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.7176471, b: 0.4039216, a: 1}
m_Color: {r: 1, g: 0.9764706, b: 0.80784315, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -11807,11 +11823,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 28
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 28
m_MinSize: 3
m_MaxSize: 32
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1

View File

@ -56120,7 +56120,6 @@ GameObject:
- component: {fileID: 7639140612752414857}
- component: {fileID: 1082879779725279886}
- component: {fileID: 7773503353796939704}
- component: {fileID: 8729598367270948910}
m_Layer: 5
m_Name: wishBtn
m_TagString: Untagged
@ -56245,32 +56244,3 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &8729598367270948910
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9193910416414577949}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 70, y: -500, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: -120, y: -500, z: 0}
changeFloat: 1
duration: 0.5
delay: 0
curveType: 1
changeType: 0
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1

View File

@ -186,7 +186,7 @@ function this.SingleMialDataShow(_go,_mailData)
Util.GetGameObject(_go.transform, "sendText"):GetComponent("Text").text = GetTimeStrBySeconds(_mailData.sendTime)--Language[11168].._mailData.sendName
local mialBtn = Util.GetGameObject(_go.transform, "Imagebg")
local isTopImg = Util.GetGameObject(_go.transform, "isTopImg")
if _mailData.isTop == 0 then--不置顶
if not _mailData.isTop or _mailData.isTop == 0 then--不置顶
mialBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_renwu_tiao_004")
isTopImg:SetActive(false)
elseif _mailData.isTop == 1 then--置顶