Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-09-01 14:53:42 +08:00
commit 4dbbdbd54b
13 changed files with 50231 additions and 50086 deletions

View File

@ -229,7 +229,7 @@ AudioMixerSnapshotController:
cbf53b279f195614d9b265d4e5842edf: -0.3976258
c9970e37bbf9e8d46a9afdc772aed464: 10.5
5d7f114794b28b642a8684d352483a3a: 0.13552582
2502d957993f9ce46abe4c5fbea6006b: 0.07
2502d957993f9ce46abe4c5fbea6006b: 0.058
b85bfb5713fd0564ea82324f4afa73ed: 10
813b2c57cb1c0b242a5e3475a5e78ac1: 4889
5a2cbe67c424dae489be0ba1badf5e35: 0.142
@ -250,7 +250,7 @@ AudioMixerSnapshotController:
8241ee78bdb8e484ca433db06fbb7716: 10
9a27e388e9875a64b8add0d2b36b37d7: -159
6c9988888fd272d4d931b61db779eceb: 15000
338e0a88659e1a341a9339a11c4ffc76: 596
338e0a88659e1a341a9339a11c4ffc76: -654
adc817a8aab7d1442afcf14905eb193f: 10
38479ea820aa45a4da2928b175eca672: -60
5888eab8363fe914d8f85413f27db2b4: 10
@ -360,7 +360,7 @@ AudioMixerSnapshotController:
075b04deeb57c5240881f915afda4dad: 7.7
73ffc90f389903b4baa63469b529465e: 0.942
3ab1be1f86666554ba507f6d6bb81409: 11.5
6846a02ff7862cd4d88bf0a222b0298f: 0
6846a02ff7862cd4d88bf0a222b0298f: -2500
85a7f35fa38ca2b459a9dd053396ce75: 1.7
5492f77f044cdad48b9ffc32c7041212: 3.43
308c2d7fffca55948a61c7445c76e65a: 13088

View File

@ -31,7 +31,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -139,7 +139,7 @@ RectTransform:
- {fileID: 3220495603619167833}
- {fileID: 6698311309350352534}
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -265,7 +265,7 @@ RectTransform:
m_Children:
- {fileID: 3617233529308977401}
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -372,11 +372,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 73.1001, y: -26.800293}
m_AnchoredPosition: {x: 73.1001, y: -26.799805}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6647361278583566925
@ -534,7 +534,7 @@ RectTransform:
- {fileID: 664046529494124250}
- {fileID: 2346972727555489896}
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1066,7 +1066,7 @@ RectTransform:
m_Children:
- {fileID: 7526472049034455670}
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -1142,7 +1142,7 @@ RectTransform:
m_Children:
- {fileID: 4629641777789591742}
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1261,7 +1261,7 @@ RectTransform:
m_Children:
- {fileID: 5865725808081203410}
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -1479,7 +1479,7 @@ RectTransform:
m_Children:
- {fileID: 5865592566638353244}
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -11109,8 +11109,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 1
m_Father: {fileID: 8490762428927022713}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -11417,7 +11417,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8490762428927022713}
- {fileID: 8490762427331175395}
- {fileID: 8490762427589792645}
- {fileID: 8490762427662662575}
- {fileID: 8490762427899490210}
@ -11535,7 +11534,7 @@ RectTransform:
m_Children:
- {fileID: 8490762428532624649}
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 2
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}
@ -11609,7 +11608,7 @@ RectTransform:
m_LocalScale: {x: 0.6559416, y: 0.6559416, z: 0.6559416}
m_Children: []
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 3
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}
@ -16761,7 +16760,7 @@ RectTransform:
m_LocalScale: {x: 0.50172, y: 0.50172, z: 0.50172}
m_Children: []
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -41084,15 +41083,16 @@ RectTransform:
m_GameObject: {fileID: 8490762428927022726}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_LocalScale: {x: 0.55, y: 0.55, z: 1}
m_Children:
- {fileID: 8490762427331175395}
m_Father: {fileID: 8490762427581985335}
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: 0, y: 0}
m_SizeDelta: {x: 1080, y: 1920}
m_SizeDelta: {x: 2160, y: 3839.9998}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8490762428927022715
CanvasRenderer:
@ -41239,7 +41239,7 @@ RectTransform:
m_LocalScale: {x: 1.1951014, y: 1.1951014, z: 1.1951014}
m_Children: []
m_Father: {fileID: 8490762427581985335}
m_RootOrder: 5
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}

View File

@ -227,7 +227,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -300, z: 0}
initFloat: 0
@ -451,7 +450,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.018683, y: -35.07}
m_SizeDelta: {x: 936.26, y: 1351.06}
m_SizeDelta: {x: 900, y: 1351.06}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6338862112552816046
CanvasRenderer:

File diff suppressed because it is too large Load Diff

View File

@ -3524,7 +3524,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.92549026, g: 0.8588236, b: 0.74509805, a: 1}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -5501,7 +5501,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 2.82}
m_AnchoredPosition: {x: 0, y: 2.8199997}
m_SizeDelta: {x: 136.3, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &669081978522593080
@ -8570,7 +8570,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 96.890015, y: 292.40002}
m_AnchoredPosition: {x: 96.89014, y: 292.4004}
m_SizeDelta: {x: 31, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7033078376770540937
@ -8941,7 +8941,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -97.23004, y: 292.40002}
m_AnchoredPosition: {x: -97.22998, y: 292.4004}
m_SizeDelta: {x: 31, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3299381173825919033

View File

@ -74,6 +74,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &893606821
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 893606822}
- component: {fileID: 893606824}
- component: {fileID: 893606823}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &893606822
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 893606821}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 315336464691071886}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -161.9}
m_SizeDelta: {x: 0, y: 208}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &893606824
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 893606821}
m_CullTransparentMesh: 0
--- !u!114 &893606823
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 893606821}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 6ede0c72ebf172744be6bc4751beaae7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1003261227
GameObject:
m_ObjectHideFlags: 0
@ -1154,14 +1228,15 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 893606822}
m_Father: {fileID: 224179834280654824}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 35}
m_SizeDelta: {x: 0, y: 200}
m_AnchoredPosition: {x: 0, y: 58}
m_SizeDelta: {x: 0, y: 136}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1177653302799713004
CanvasRenderer:

View File

@ -96,15 +96,19 @@ function UIManager.Adapter()
end
end
UIManager.Offset = {
Top = notchHeight,
Top = 48,
Bottom = 0,
Left = 0,
Right = 0,
}
-- 屏幕大小
UIManager.width = Screen.width
UIManager.height = Screen.height
-- 计算屏幕比例的比值,用于部分界面进行屏幕适配的缩放
UIManager.adapterScale = (1920/1080)/(Screen.height / Screen.width)
-- ui实际大小
UIManager.realHeigt = Screen.height - UIManager.Offset.Top - UIManager.Offset.Bottom
UIManager.realWidth = Screen.width - UIManager.Offset.Left - UIManager.Offset.Right
@ -115,21 +119,21 @@ function UIManager.Adapter()
rectTransform.offsetMin = Vector2.New(rectTransform.offsetMin.x, rectTransform.offsetMin.y + UIManager.Offset.Bottom)
rectTransform.offsetMax = Vector2.New(rectTransform.offsetMax.x, rectTransform.offsetMax.y - UIManager.Offset.Top)
rectTransform = this.screenMask1:GetComponent("RectTransform")
rectTransform.anchorMin = Vector2.New(0, 1)
rectTransform.anchorMax = Vector2.New(1, 1)
rectTransform.offsetMin = Vector2.New(0, 0)
rectTransform.offsetMax = Vector2.New(0, 0)
rectTransform.pivot = Vector2.New(0.5, 1)
rectTransform.sizeDelta = Vector2.New(0, UIManager.Offset.Top)
-- rectTransform = this.screenMask1:GetComponent("RectTransform")
-- rectTransform.anchorMin = Vector2.New(0, 1)
-- rectTransform.anchorMax = Vector2.New(1, 1)
-- rectTransform.offsetMin = Vector2.New(0, 0)
-- rectTransform.offsetMax = Vector2.New(0, 0)
-- rectTransform.pivot = Vector2.New(0.5, 1)
-- rectTransform.sizeDelta = Vector2.New(0, UIManager.Offset.Top)
rectTransform = this.screenMask2:GetComponent("RectTransform")
rectTransform.anchorMin = Vector2.New(0, 0)
rectTransform.anchorMax = Vector2.New(1, 0)
rectTransform.offsetMin = Vector2.New(0, 0)
rectTransform.offsetMax = Vector2.New(0, 0)
rectTransform.pivot = Vector2.New(0.5, 0)
rectTransform.sizeDelta = Vector2.New(0, UIManager.Offset.Bottom)
-- rectTransform = this.screenMask2:GetComponent("RectTransform")
-- rectTransform.anchorMin = Vector2.New(0, 0)
-- rectTransform.anchorMax = Vector2.New(1, 0)
-- rectTransform.offsetMin = Vector2.New(0, 0)
-- rectTransform.offsetMax = Vector2.New(0, 0)
-- rectTransform.pivot = Vector2.New(0.5, 0)
-- rectTransform.sizeDelta = Vector2.New(0, UIManager.Offset.Bottom)
elseif n < standard then

View File

@ -95,6 +95,8 @@ function this:InitComponent()
effectAdapte(Util.GetGameObject(this.sgEffect[2], "ziti mask (1)"))
-- 一堆的小活动
this.rightUpRoot = Util.GetGameObject(self.gameObject, "RightUp")
this.rightUpRoot.transform.localScale = Vector3.one * UIManager.adapterScale
-- 充值
this.rechargeBtn = Util.GetGameObject(self.gameObject, "RightUp/recharge")
this.rechargeRedPoint = Util.GetGameObject(this.rechargeBtn, "redPoint")

View File

@ -384,10 +384,15 @@ function this.GetHeroDataByStar(star,staticid)
return false
end
--主城停留弹气泡
local level_bubble_config = string.split(ConfigManager.GetConfigData(ConfigName.SpecialConfig,88).Value,"|")
local battleUpLvTipTime = Timer.New()
local curMianPanleLoginShowTipNum = 0
local curLevelPanleLoginShowTipNum = 0
local noShowBattleUpLvTipMaxLv = 100
local noShowBattleUpLvTipMaxLv = tonumber(level_bubble_config[3])
local noShowBattleUpLvTipMaxNum = tonumber(level_bubble_config[2])
local showBattleUpLvTipMaxTime = tonumber(level_bubble_config[1])
function this.StarBattleUpLvTipTime(type)
local curSecound = 0
if PlayerManager.level >= noShowBattleUpLvTipMaxLv then
@ -403,11 +408,11 @@ function this.StarBattleUpLvTipTime(type)
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
if type == 1 and curMianPanleLoginShowTipNum < 3 then--主界面
if type == 1 and curMianPanleLoginShowTipNum < noShowBattleUpLvTipMaxNum then--主界面
battleUpLvTipTime = Timer.New(function()
curSecound = curSecound + 1
-- LogGreen("主界面停留 "..curSecound)
if curSecound >= 10 then
if curSecound >= showBattleUpLvTipMaxTime then
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
@ -417,11 +422,11 @@ function this.StarBattleUpLvTipTime(type)
end
end, 1, -1, true)
battleUpLvTipTime:Start()
elseif type == 2 and curLevelPanleLoginShowTipNum < 3 then--关卡界面
elseif type == 2 and curLevelPanleLoginShowTipNum < noShowBattleUpLvTipMaxNum then--关卡界面
battleUpLvTipTime = Timer.New(function()
curSecound = curSecound + 1
-- LogGreen("关卡界面停留 "..curSecound)
if curSecound >= 10 then
if curSecound >= showBattleUpLvTipMaxTime then
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil