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

dev_chengFeng
wangzhenxing 2021-05-29 15:37:09 +08:00
commit b49fcce742
11 changed files with 124 additions and 7 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d960c3d87a3322341af388f55799e4fc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 8dcdf995c1368a44d97fe1f5c7fab7ef
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: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: df0c42917ed220942818cbaf864f90c7
vertices: []
indices:
edges: []
weights: []
spritePackingTag: baibaoshanghuiAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6198,7 +6198,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: 77.18, y: 116.99999}
m_AnchoredPosition: {x: 83, y: 116.99999}
m_SizeDelta: {x: 33.55, y: 263.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3946196506950791481

View File

@ -340,7 +340,9 @@ end
function PlayerView:OnSkillPlay()
if not self.GameObject then
return
end
local battleSorting = BattleManager.GetBattleSorting()
self:ChangeCardSorting(battleSorting + 20)
-- 立绘缩小
@ -361,6 +363,9 @@ function PlayerView:OnSkillPlay()
end
function PlayerView:OnSkillEnd()
if not self.GameObject then
return
end
local battleSorting = BattleManager.GetBattleSorting()
self:ChangeCardSorting(battleSorting + self.role.position)
self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask").transform)

View File

@ -37,7 +37,7 @@ function this.Show()
end
_itemsList[index]:SetActive(true)
local data = ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig,"Id",tonumber(answerId))
Util.GetGameObject(_itemsList[index], "icon"):GetComponent("Image").sprite = self.context.spLoader:LoadSprite(GetResourcePath(data.Icon))
Util.GetGameObject(_itemsList[index], "icon"):GetComponent("Image").sprite = this.context.spLoader:LoadSprite(GetResourcePath(data.Icon))
Util.GetGameObject(_itemsList[index], "name/name"):GetComponent("Text").text = GetLanguageStrById(data.ReadingName)
Util.AddOnceClick(Util.GetGameObject(_itemsList[index], "btnAns"), function()
this.ChooseAnswer(index)

View File

@ -40,9 +40,9 @@ function this.Show()
this.ChooseAnswer(index)
end)
kuang:SetActive(false)
Num.sprite = self.context.spLoader:LoadSprite("r_gonghui_pipeiwenhao")
Num.sprite = this.context.spLoader:LoadSprite("r_gonghui_pipeiwenhao")
else
Num.sprite = self.context.spLoader:LoadSprite("r_fxgz_shuzi_"..tonumber(num))
Num.sprite = this.context.spLoader:LoadSprite("r_fxgz_shuzi_"..tonumber(num))
end
end
end

View File

@ -41,13 +41,13 @@ function this.Show()
local ItemId = this.TrialGameConfig[this.list[index]].RewardID
local reward = Util.GetGameObject(item,"reward"):GetComponent("Image")
local Name = this.ArtConfig[this.ItemConfig[ItemId].ResourceID].Name--Index->奖励id->itemID->资源名字)
reward.sprite = self.context.spLoader:LoadSprite(Name)
reward.sprite = this.context.spLoader:LoadSprite(Name)
local Num = Util.GetGameObject(item,"Num"):GetComponent("Text")
Num.text =this.TrialGameConfig[this.list[index]].Max
local piece = Util.GetGameObject(item,"piece"):GetComponent("Image")
if this.ItemConfig[ItemId].ItemType == 22 then
piece.gameObject:SetActive(true)
piece.sprite = self.context.spLoader:LoadSprite(GetHeroChipQuantityImageByquality(this.ItemConfig[ItemId].Quantity))
piece.sprite = this.context.spLoader:LoadSprite(GetHeroChipQuantityImageByquality(this.ItemConfig[ItemId].Quantity))
else
piece.gameObject:SetActive(false)
end

View File

@ -12,6 +12,7 @@ this.timer = Timer.New()
function this:InitComponent(gameObject)
this.spLoader = SpriteLoader.New()
this.backBtn=Util.GetGameObject(gameObject,"bg/backBtn")
this.backBtn:SetActive(true)
this.Root=Util.GetGameObject(gameObject,"Root")
this.proPre=Util.GetGameObject(gameObject,"proPre")
this.shengxingIma=Util.GetGameObject(gameObject,"bg/shengxing"):GetComponent("Image")
@ -21,6 +22,10 @@ end
function this:BindEvent()
Util.AddClick(this.backBtn,function()
parent:ClosePanel()
if this.timer then
this.timer:Stop()
this.timer = nil
end
end)
end