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

dev_chengFeng
jiaoyangna 2021-08-03 16:50:07 +08:00
commit 1f07968b5c
6 changed files with 57 additions and 47 deletions

View File

@ -107,10 +107,10 @@ RectTransform:
m_Father: {fileID: 2078386161070176561}
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}
m_AnchoredPosition: {x: 451.70007, y: 669.28}
m_SizeDelta: {x: 127, y: 264.57}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -88.29993, y: -290.71997}
m_SizeDelta: {x: 127, y: 264.57007}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6234182306990666182
MonoBehaviour:
@ -460,9 +460,9 @@ RectTransform:
m_Father: {fileID: 2078386161070176561}
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: 452.7, y: 856.7}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -87.29999, y: -103.29999}
m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.49999955, y: 0.5}
--- !u!222 &4588235694566972338

View File

@ -1083,7 +1083,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -66}
m_SizeDelta: {x: 150, y: 50}
m_SizeDelta: {x: 80, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8742661461840986579
CanvasRenderer:
@ -1117,16 +1117,16 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 1
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 300
m_Text: "\u6B21\u6570\u5956\u52B1"
LanguageIndex: 0
--- !u!1 &992364346240308313
GameObject:
@ -1161,10 +1161,10 @@ RectTransform:
m_Father: {fileID: 2132785343472515193}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -311}
m_SizeDelta: {x: 0, y: 300}
m_SizeDelta: {x: 1080, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1066095331768010771
GameObject:
@ -5994,9 +5994,9 @@ RectTransform:
m_Father: {fileID: 2132785343472515193}
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}
m_AnchoredPosition: {x: -294, y: 850}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 246, y: -196}
m_SizeDelta: {x: 483, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6562483489479470499
@ -7890,10 +7890,10 @@ RectTransform:
m_Father: {fileID: 2132785343472515193}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -655}
m_SizeDelta: {x: 0, y: 300}
m_SizeDelta: {x: 1080, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7779885449134601418
GameObject:
@ -8008,9 +8008,9 @@ RectTransform:
m_Father: {fileID: 2132785343472515193}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -100, y: 603}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -100, y: -417}
m_SizeDelta: {x: 150, y: 400}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3003137039866507802
@ -9641,11 +9641,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2132785343472515193}
m_Modifications:
- target: {fileID: 1934794854557949798, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce,
type: 3}
propertyPath: m_Name
value: Effect_xiaozhuanfeng_hit01
objectReference: {fileID: 0}
- target: {fileID: 1934794854557949801, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce,
type: 3}
propertyPath: m_LocalPosition.x
@ -9701,6 +9696,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1934794854557949798, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce,
type: 3}
propertyPath: m_Name
value: Effect_xiaozhuanfeng_hit01
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, type: 3}
--- !u!4 &2487093841126313949 stripped
@ -9716,11 +9716,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2132785343472515193}
m_Modifications:
- target: {fileID: 5538650172890135992, guid: c97934c2eec98be49b26b06232d68cf2,
type: 3}
propertyPath: m_Name
value: Effect_xiaozhuanfeng_hit02
objectReference: {fileID: 0}
- target: {fileID: 5538650172890135995, guid: c97934c2eec98be49b26b06232d68cf2,
type: 3}
propertyPath: m_LocalPosition.x
@ -9776,6 +9771,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5538650172890135992, guid: c97934c2eec98be49b26b06232d68cf2,
type: 3}
propertyPath: m_Name
value: Effect_xiaozhuanfeng_hit02
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c97934c2eec98be49b26b06232d68cf2, type: 3}
--- !u!4 &1934620330201386658 stripped

View File

@ -421,7 +421,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: -196, y: -26}
m_AnchoredPosition: {x: -150, y: -26}
m_SizeDelta: {x: 556, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4215908669338956817
@ -505,10 +505,10 @@ RectTransform:
m_Father: {fileID: 1745397238117893692}
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: -122, y: 0.59999466}
m_SizeDelta: {x: 242.11, y: 39.5}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 210, y: 0}
m_SizeDelta: {x: 250, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3498851698827627197
CanvasRenderer:
@ -1218,7 +1218,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -36}
m_SizeDelta: {x: 558, y: 44}
m_SizeDelta: {x: 700, y: 44}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1622256633758418865
CanvasRenderer:
@ -6233,10 +6233,10 @@ RectTransform:
m_Father: {fileID: 115914922508147437}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -207}
m_SizeDelta: {x: 0, y: -756.7}
m_SizeDelta: {x: 1080, y: 1163.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4694323316088322700
CanvasRenderer:

View File

@ -4790,7 +4790,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u8D2D\u4E70\u6210\u529F\u540E \u8BF7\u524D\u5F80\u90AE\u7BB1\u9886\u53D6"
m_Text:
LanguageIndex: 11742
--- !u!1 &4699461434874433981
GameObject:

View File

@ -32,6 +32,9 @@ function MissionDailyTipPanel:BindEvent()
PopupTipPanel.ShowTip(Language[11305])
return
end
if UIManager.IsOpen(UIName.RewardItemPopup) then--掉落界面打开时,关闭掉落界面
UIManager.ClosePanel(UIName.RewardItemPopup, false)
end
--LogGreen("showType:"..showType)
UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4)
self:ClosePanel()

View File

@ -120,11 +120,18 @@ namespace GameLogic
{
if (Input.GetKeyDown(KeyCode.Escape))
{
msgBox.Show(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CANEL), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM_CLOSE), (result) =>
if(AppConst.isSDK && App.SDKMgr.IsSupportExit())
{
if (result == 1)
Application.Quit();
});
App.SDKMgr.ExitGame();
}
else
{
msgBox.Show(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CANEL), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM_CLOSE), (result) =>
{
if (result == 1)
Application.Quit();
});
}
}
}