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

dev_chengFeng
jiaoyangna 2021-05-27 22:34:15 +08:00
commit 765d58f459
10 changed files with 20 additions and 195 deletions

View File

@ -192,6 +192,7 @@ public class AutoPack : EditorWindow
StartGradleBuild(i);
break;
case 2: // 只重新打包
ReplaceConfigAndVersion(i);
StartGradleBuild(i);
break;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

View File

@ -1,88 +0,0 @@
fileFormatVersion: 2
guid: e069c40afaaf6e14daeb198e7cf4776c
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: -1
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: 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: 2fc26485eabb85d45b5ea5866869bc7c
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 KiB

View File

@ -1,88 +0,0 @@
fileFormatVersion: 2
guid: 098eaacf4ad18f14d9497b3943635350
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: -1
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: 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: 65ab25219a162b34d8fcbb01418a9dc3
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4653,7 +4653,7 @@ ParticleSystem:
--- !u!199 &7161790114800665152
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10043,7 +10043,7 @@ ParticleSystem:
--- !u!199 &5590763315395979240
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10686,7 +10686,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: e3ab4d47413afe049b0e0cc8dab4fddf, type: 2}
m_Color: {r: 0.8161765, g: 0.6074141, b: 0.23405059, a: 0}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -10953,7 +10953,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: e3ab4d47413afe049b0e0cc8dab4fddf, type: 2}
m_Color: {r: 0.8161765, g: 0.6074141, b: 0.23405059, a: 0}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -15612,7 +15612,7 @@ ParticleSystem:
--- !u!199 &5835294107039667155
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20709,7 +20709,7 @@ ParticleSystem:
--- !u!199 &5835345885398115607
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -500,7 +500,9 @@ function PlayerView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotTy
end)
self.GameObject.transform.parent:DOShakeAnchorPos(0.3, Vector2.New(200, 100), 100, 50, false, true):OnComplete(function ()
if self.GameObject then
self.GameObject.transform.parent.anchoredPosition = Vector2.New(self.role.position == 1 and -145 or 0, -221)
end
end)
-- 受击放大1.2倍
@ -618,6 +620,7 @@ function PlayerView:onDispose()
poolManager:UnLoadLive(self.livePath, self.RoleLiveGO2)
-- 回收本节点
BattlePool.RecycleItem(self.GameObject, BATTLE_POOL_TYPE.MY_ROLE)
self.GameObject = nil
end

View File

@ -49,6 +49,10 @@ function this:BindEvent()
end)
Util.AddClick(this.backBtn, function()
parent:ClosePanel()
if fun then
fun()
fun = nil
end
end)
Util.AddClick(this.BackBattleBtn, function()
FightLevelManager.HardStageReportRequset(fightLevelData, function()
@ -226,10 +230,7 @@ function this.LeftOrRightBtnClickEvent()
end
end
function this:OnClose()
if fun then
fun()
fun = nil
end
for i, v in pairs(liveNodes) do
if v then
poolManager:UnLoadLive(liveNames[i],v)

View File

@ -45,6 +45,10 @@ function this:BindEvent()
end)
Util.AddClick(this.backBtn, function()
parent:ClosePanel()
if fun then
fun()
fun = nil
end
end)
Util.AddClick(this.BackBattleBtn, function()
FightLevelManager.HardStageReportRequset(fightLevelData, function()
@ -208,10 +212,6 @@ function this.SetCardSingleData(o,monsterId, _pos)
SetTextVerTial(name.gameObject,Vector3.New(35,-7.45,0),nil,nil,8)
end
function this:OnClose()
if fun then
fun()
fun = nil
end
for i, v in pairs(liveNodes) do
if v then
poolManager:UnLoadLive(liveNames[i],v)

View File

@ -116,10 +116,6 @@ end
function this:OnClose()
rewardData = {}
if fun then
fun()
fun = nil
end
end
function this:OnDestroy()