Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
0ee5c9dabe
Binary file not shown.
Before Width: | Height: | Size: 59 KiB |
Binary file not shown.
After Width: | Height: | Size: 89 KiB |
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 58fd6902e11438041896e6f28dc26f6a
|
||||
guid: c79f30e4ba1f8b64d8127703a5d4f389
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
@ -91,24 +91,13 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 98701753f6c54b748ba3366bb4aa92a9
|
||||
spriteID: bc736999c65914a4ea2d6d53db92976e
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
Binary file not shown.
After Width: | Height: | Size: 36 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6615ada4bb9b9f040863a56be7431160
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: a4874ad5bd0c3eb42b60699dd5006295
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: MainAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3e1781c7d9f64704498d8c6391d146fb
|
||||
guid: f2bee7ee73646ff4bbd38330ba811a03
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,43 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f432d3702b4245d44aa9a31428dbfd13
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
1:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
4:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f57b9c787365e9e42b6af2092226fa05
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
1:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
4:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3df676ecfc3c64f459a4589c3497cbf0
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
1:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
4:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,43 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7bcd953555dcec54db94290585ef3a5c
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
1:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
4:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 840a4a479b0465e40ab8f1112e9b13cd
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
1:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
4:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 66f14daaffd7fe14d8201711d56efce5
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
1:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
4:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -78702,7 +78702,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 85739885f40c69345a0a81cffd6c38b3, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 6615ada4bb9b9f040863a56be7431160, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -736,7 +736,6 @@ function this.OnSkillCast(skill)
|
|||
liveGO:GetComponent("SkeletonGraphic"):DOFade(1, 0)
|
||||
liveGO:GetComponent("SkeletonGraphic"):DOColor(Color.New(1,1,1,1), 0)
|
||||
|
||||
SoundManager.PlaySound(SoundConfig.Sound_MonsterCasting)
|
||||
BattleManager.PauseBattle()
|
||||
|
||||
addDelayRecycleRes("casting_skill", go, 1.6, function ()
|
||||
|
|
|
@ -874,6 +874,8 @@ function RoleView:PlaySkillCastingEffect(combat, func)
|
|||
-- 播放casting
|
||||
self.RootPanel.mySkillCast:SetActive(false)
|
||||
self.RootPanel.mySkillCast:SetActive(true)
|
||||
-- 播放casting声音
|
||||
SoundManager.PlaySound(SoundConfig.Sound_RoleCasting)
|
||||
-- 技能名
|
||||
-- local nameBg = Util.GetGameObject(self.RootPanel.mySkillCast, "Canvas/skill")
|
||||
local name = Util.GetGameObject(self.RootPanel.mySkillCast, "TongYong_Casting_Xia/DongHua/MingZi")
|
||||
|
@ -890,6 +892,8 @@ function RoleView:PlaySkillCastingEffect(combat, func)
|
|||
-- 播放casting
|
||||
self.RootPanel.enemySkillCast:SetActive(false)
|
||||
self.RootPanel.enemySkillCast:SetActive(true)
|
||||
-- 播放casting声音
|
||||
SoundManager.PlaySound(SoundConfig.Sound_MonsterCasting)
|
||||
-- 技能名
|
||||
local name = Util.GetGameObject(self.RootPanel.enemySkillCast, "TongYong_Casting_Shang/DongHua/MingZi")
|
||||
if combat.skillname and combat.skillname ~= "" then
|
||||
|
|
|
@ -49,10 +49,10 @@ function FirstRechargePanel:InitComponent()
|
|||
end
|
||||
|
||||
--bottomPart
|
||||
self.reChargeBtn = Util.GetGameObject(self.transform, "rechargeBtn")
|
||||
self.reChargeTips = Util.GetGameObject(self.transform, "tips"):GetComponent("Text")
|
||||
self.reChargeBtn = Util.GetGameObject(self.transform, "frame/rechargeBtn")
|
||||
self.reChargeTips = Util.GetGameObject(self.transform, "frame/tips"):GetComponent("Text")
|
||||
|
||||
self.effect = Util.GetGameObject(self.transform, "effect")
|
||||
self.effect = Util.GetGameObject(self.transform, "frame/effect")
|
||||
effectAdapte(Util.GetGameObject(self.effect, "Partical/ziti mask (1)"))
|
||||
end
|
||||
|
||||
|
@ -172,6 +172,7 @@ function FirstRechargePanel:OnRechargeBtnClicked()
|
|||
PopupTipPanel.ShowTip(Language[10438])
|
||||
return
|
||||
end
|
||||
self:ClosePanel()
|
||||
UIManager.OpenPanel(UIName.MainRechargePanel, 1)
|
||||
end
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
require("Base/BasePanel")
|
||||
local MainShopPanel = Inherit(BasePanel)
|
||||
local this = MainShopPanel
|
||||
local oldAccumRecharge = 0
|
||||
-- Tab管理器
|
||||
local TabBox = require("Modules/Common/TabBox")
|
||||
local _PageInfo = {
|
||||
|
@ -67,6 +68,7 @@ function MainShopPanel:BindEvent()
|
|||
Util.AddClick(this.btnBack, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
this:ClosePanel()
|
||||
this.isOpenFirstRechargePanel()
|
||||
end)
|
||||
|
||||
end
|
||||
|
@ -94,6 +96,7 @@ function MainShopPanel:OnShow()
|
|||
if this._CurPageIndex then
|
||||
this.PageTabCtrl:ChangeTab(this._CurPageIndex)
|
||||
end
|
||||
oldAccumRecharge = this.CalculateIsFirstRecharge()
|
||||
end
|
||||
|
||||
-- 层级变化时,子界面层级刷新
|
||||
|
@ -186,5 +189,21 @@ function MainShopPanel:OnDestroy()
|
|||
-- 清除红点
|
||||
this.ClearPageRedpot()
|
||||
end
|
||||
|
||||
function this.isOpenFirstRechargePanel()
|
||||
if oldAccumRecharge == 0 then
|
||||
if this.CalculateIsFirstRecharge() > 0 then
|
||||
UIManager.OpenPanel(UIName.FirstRechargePanel)
|
||||
end
|
||||
end
|
||||
end
|
||||
function this.CalculateIsFirstRecharge()
|
||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
|
||||
local AccumRecharge = 0
|
||||
for _, missInfo in pairs(activityInfo.mission) do
|
||||
if missInfo and missInfo.progress then
|
||||
AccumRecharge = missInfo.progress
|
||||
end
|
||||
end
|
||||
return AccumRecharge
|
||||
end
|
||||
return MainShopPanel
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue