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

dev_chengFeng
ZhangBiao 2020-11-03 17:05:15 +08:00
commit c3537b3486
11 changed files with 116 additions and 43 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

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

View File

@ -3768,7 +3768,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4009861031449356928}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:

View File

@ -24470,11 +24470,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 44
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 45
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -35039,7 +35039,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: 0.000012398, y: -0.00002034}
m_AnchoredPosition: {x: -1.2, y: 0.3}
m_SizeDelta: {x: 69, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3178489416745694411
@ -35169,7 +35169,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3569102849833951929}
- component: {fileID: 8233650449125365023}
m_Layer: 5
m_Name: Content3
m_TagString: Untagged
@ -35199,26 +35198,3 @@ RectTransform:
m_AnchoredPosition: {x: -1.9, y: 7}
m_SizeDelta: {x: 255.2, y: 76.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8233650449125365023
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6974725393944192383}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0

View File

@ -147,7 +147,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -395,7 +395,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6630273786794472594
RectTransform:
m_ObjectHideFlags: 0
@ -1752,7 +1752,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7950070701309201066
RectTransform:
m_ObjectHideFlags: 0
@ -6858,7 +6858,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: -469.6, y: 808.1}
m_AnchoredPosition: {x: -395, y: 808.1}
m_SizeDelta: {x: 110, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3424048373273667453
@ -12180,7 +12180,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: 299, y: 462.5}
m_AnchoredPosition: {x: 299, y: 495}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5687762551274503171
@ -13907,7 +13907,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -14134,7 +14134,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}

View File

@ -42,7 +42,7 @@ function EnemyView:onCreate(go, role, position, root)
self.spAtkTime = RoleConfig[role.roleData.roleId].CastingSkills/1000
self.atkSoundTime = RoleConfig[role.roleData.roleId].CastingAudio/1000
self.attackSound = RoleConfig[role.roleData.roleId].sond
self.readingName = HeroConfig[role.roleData.roleId].readingName
self.readingName = HeroConfig[role.roleData.roleId].ReadingName
--
self.nameText.text = self.readingName

View File

@ -45,11 +45,11 @@ function PlayerView:onCreate(go, role, position, root)
self.spAtkTime = RoleConfig[role.roleData.roleId].CastingSkills/1000
self.atkSoundTime = RoleConfig[role.roleData.roleId].CastingAudio/1000
self.attackSound = RoleConfig[role.roleData.roleId].sond
self.readingName = HeroConfig[role.roleData.roleId].readingName
self.readingName = HeroConfig[role.roleData.roleId].ReadingName
self.nameText.text = self.readingName
self.level.text = role:GetRoleData(RoleDataName.Level)
self.sprite = Util.LoadSprite(GetProStrImageByProNum(role.roleData.element))
self.elementImg.sprite = Util.LoadSprite(GetProStrImageByProNum(role.roleData.element))
self.bg1.sprite = Util.LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
self.bg2.sprite = Util.LoadSprite(GetHeroCardStarFg[role.roleData.star])
local starGrid = Util.GetGameObject(go, "StarGrid")

View File

@ -167,6 +167,10 @@ function PrivilegeManager.GetPrivilegeRemainValue(privilegeType)
local usedTimes = this.GetPrivilegeUsedTimes(privilegeType)
-- LogBlue(string.format("originalValue:%s, usedTimes:%s",tostring(originalValue),tostring(usedTimes)))
local remainNum = originalValue - usedTimes
-- 剩余次数不会小于0修正
if remainNum < 0 then
remainNum = 0
end
return remainNum
end

View File

@ -111,7 +111,7 @@ function PokemonSummonOneResultPanel:OnOpen(...)
if isFree then
this.itemNum3.gameObject:SetActive(false)
this.itemIcon3.gameObject:SetActive(false)
this.itemInfo3.text=Language[12399]
this.itemInfo3.text="免费召唤"
this.tipText.gameObject:SetActive(false)
else
this.itemNum3.gameObject:SetActive(true)

View File

@ -129,7 +129,7 @@ function PokemonSummonPanel:refreshBtnShow()
end
local d = RecruitManager.GetExpendData(type)
if isFree then
info.text=Language[11759]
info.text=" "..Language[11759]
else
itemId = d[1]
itemNum = d[2]

View File

@ -141,10 +141,15 @@ function this.InitPreData()
--判断品质
if itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity then
--判断类型
if itemConfig[a.Reward[1]].ItemType<itemConfig[b.Reward[1]].Quantity then
return a.Reward[1] > b.Reward[1]
if itemConfig[a.Reward[1]].ItemType==itemConfig[b.Reward[1]].ItemType then
--判断id
if a.Reward[1] == b.Reward[1] then
return a.Reward[2] < b.Reward[2]
else
return a.Reward[1] < b.Reward[1]
end
else
return a.Reward[1] < b.Reward[1]
return itemConfig[a.Reward[1]].ItemType<itemConfig[b.Reward[1]].ItemType
end
else
return itemConfig[a.Reward[1]].Quantity > itemConfig[b.Reward[1]].Quantity