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

dev_chengFeng
ZhangBiao 2021-03-31 14:33:11 +08:00
commit 5142db7d00
26 changed files with 46150 additions and 46047 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 45 KiB

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 7a3bb0b0ef65fe443a2b651c44dc06f1
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 5063337e3f63d884eb7d0cf6071a66f3
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 7be2c4613ca42464aa2a245faf654a39
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 21394569feb046b47b5474869113d884
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 9e9556950784efe44b7037dfd29eba77
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 3a84d9cb8e8629b4e87c4e861bbde3a9
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: fdb79feae44097a449a5c1e345ee3e6e
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 26f30198c2a7adc4abd80b8d148599de
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -3434,16 +3434,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 186607428668674391}
m_Modifications:
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_Name
value: UI_Effect_MianBan_LiBao_button_01
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalPosition.x
@ -3507,7 +3497,7 @@ PrefabInstance:
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: 24.135
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
@ -3517,27 +3507,27 @@ PrefabInstance:
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 48.27
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
@ -3549,6 +3539,16 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_Name
value: UI_Effect_MianBan_LiBao_button_01
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ee9304e5f1d403d4ea55d2f19fafa324, type: 3}
--- !u!224 &4744428278025829081 stripped

View File

@ -284,9 +284,9 @@ RectTransform:
m_Father: {fileID: 224085950476348902}
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: 448, y: -605}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 398, y: -605}
m_SizeDelta: {x: 127, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222573513705970662
@ -1776,9 +1776,9 @@ RectTransform:
m_Father: {fileID: 224085950476348902}
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: 453.18, y: -868.8}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 403.18, y: -818.8}
m_SizeDelta: {x: 150.08, y: 146.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222057109577334350
@ -6366,7 +6366,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -813, y: -676}
m_AnchoredPosition: {x: -813.00006, y: -676}
m_SizeDelta: {x: 148.2, y: 149.82}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3499614469337657120
@ -11744,7 +11744,7 @@ ParticleSystem:
--- !u!199 &803831904554332959
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -17327,7 +17327,7 @@ ParticleSystem:
--- !u!199 &175963871488439658
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -4919,7 +4919,7 @@ ParticleSystem:
--- !u!199 &4324180858153338751
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9729,7 +9729,7 @@ ParticleSystem:
--- !u!199 &7221542063120976112
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14724,7 +14724,7 @@ ParticleSystem:
--- !u!199 &4602218995443542467
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19480,7 +19480,7 @@ ParticleSystem:
--- !u!199 &6667180100871307135
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19617,9 +19617,9 @@ RectTransform:
m_Father: {fileID: 3756806480519388516}
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: 124, y: 479}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -448, y: -577}
m_SizeDelta: {x: 828, y: 960}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5064043851768288431
@ -21091,7 +21091,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -3.5004883, y: 7.100006}
m_AnchoredPosition: {x: -3.5004883, y: 7.1000977}
m_SizeDelta: {x: 91.501, y: 188.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4507142556566682274
@ -25841,7 +25841,7 @@ ParticleSystem:
--- !u!199 &6150936966303437256
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -31721,7 +31721,7 @@ ParticleSystem:
--- !u!199 &2247791035768844462
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -36631,7 +36631,7 @@ ParticleSystem:
--- !u!199 &5306449312685909514
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -41461,7 +41461,7 @@ ParticleSystem:
--- !u!199 &7325208699826634860
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -46217,7 +46217,7 @@ ParticleSystem:
--- !u!199 &3735366785995198076
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -51564,7 +51564,7 @@ ParticleSystem:
--- !u!199 &1426549054624387413
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -57223,7 +57223,7 @@ ParticleSystem:
--- !u!199 &8968558274744067294
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -115,6 +115,9 @@ function UIManager.Adapter()
}
-- 实际分辨率 = 屏幕分辨率 / 比例因子
UIManager.UIHeight = 1920
UIManager.UIWidth = 1080
-- 屏幕大小
UIManager.width = Screen.width

View File

@ -384,7 +384,10 @@ function FightPointPassMainPanel:OnShow()
this.chapterName.text = GetLanguageStrById(fightLevelSetConfig[chapterId].Name)
-- 奖励预览
this.IntiReward()
this.IntiReward()
-- 刷新关卡按钮状态
this.SetFightBtnText()
isCounting = false
-- 加载地图数据

View File

@ -111,14 +111,27 @@ function this.RefreshPanel()
o.name="Pre"..i
preList[i]=o
end
local guildName=Util.GetGameObject(o,"Guild/GuildName"):GetComponent("Text")
local guildName=Util.GetGameObject(o,"Guild/mask/GuildName"):GetComponent("Text")
local posName=Util.GetGameObject(o,"Name/Text"):GetComponent("Image")
local serverName=Util.GetGameObject(o,"serverName/Text"):GetComponent("Text")
serverName.text=""
guildName.text=""
posName.sprite=Util.LoadSprite(guildWarConfig[i].Pic)--guildWarConfig[i].Name
preList[i].transform.localPosition=Vector2.New(d[i].pos[1],d[i].pos[2])
Util.GetGameObject(o,"Guild"):SetActive(false)
Util.GetGameObject(o,"serverName"):SetActive(false)
end
local colorValue = Color.New(1,1,1,0)
DoTween.To(
DG.Tweening.Core.DOGetter_float( function () return 0 end),
DG.Tweening.Core.DOSetter_float(function (progress)
Log(progress)
colorValue.a = progress
for i = 1, 10 do
Util.GetGameObject(preList[i],"Name/Text"):GetComponent("Image").color = colorValue
end
end),
1, 0.5):SetEase(Ease.Linear):OnComplete(function() end)
NetManager.GetDeathPathInfoResponse(function(msg)
if DeathPosManager.status==DeathPosStatus.Reward then
this.overTime.text=Language[11029]
@ -138,8 +151,9 @@ function this.RefreshPanel()
--各阵型点击事件
for i = 1, #preList do
Util.AddOnceClick(preList[i],function()
local guildName=Util.GetGameObject(preList[i],"Guild/GuildName"):GetComponent("Text")
UIManager.OpenPanel(UIName.DeathPosInfoPanel,i,guildName.text)
local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text")
--local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text")
UIManager.OpenPanel(UIName.DeathPosInfoPanel,i,guildName.text)--,serverName.text)
end)
end
end
@ -171,9 +185,17 @@ function this.RefreshGuildInfo()
for key, value in pairs(data) do
if i==value.pathId then
local guild=Util.GetGameObject(preList[i],"Guild")
local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text")
local guildImage=guild:GetComponent("Image")
local guildName=Util.GetGameObject(preList[i],"Guild/GuildName"):GetComponent("Text")
local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text")
Util.GetGameObject(preList[i],"serverName"):SetActive(false)
guild:SetActive(true)
-- if value.serverName and value.serverName ~= "" then
-- serverName.text = value.serverName
-- else
-- Util.GetGameObject(preList[i],"serverName"):SetActive(false)
-- serverName.text = ""
-- end
guildName.text=value.guildName
--如果是自己的公会
guildImage.sprite= value.gid==PlayerManager.familyId and Util.LoadSprite(_image[2]) or Util.LoadSprite(_image[1])