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

dev_chengFeng
gaoxin 2020-07-25 19:35:03 +08:00
commit 7002d45fdc
6 changed files with 22109 additions and 4701 deletions

View File

@ -139,7 +139,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: 586fed16bb357ac43bf84bd15190bb85, type: 3}
m_Sprite: {fileID: 21300000, guid: 4ecfa3d51ceda6d47849bea7d4a00118, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -183,7 +183,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 111, y: 8}
m_SizeDelta: {x: 155.32, y: 8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320031818094916784
CanvasRenderer:
@ -257,7 +257,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: 47.493, y: 1.2465}
m_AnchoredPosition: {x: 58.906994, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031818097329355
@ -629,7 +629,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: 67.986, y: 1.2465}
m_AnchoredPosition: {x: 79.399994, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031818590170636
@ -777,8 +777,8 @@ 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.049467, y: 0.000026226}
m_SizeDelta: {x: 111.98, y: 11}
m_AnchoredPosition: {x: -0.00017929, y: 0.000026226}
m_SizeDelta: {x: 155.24, y: 11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320031818707236650
CanvasRenderer:
@ -1298,7 +1298,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: 27, y: 1.2465}
m_AnchoredPosition: {x: 38.413994, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031818921221044
@ -1363,17 +1363,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2320031819088404992}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2320031819818155156}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 25, y: 25}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320031819088404997
CanvasRenderer:
@ -1403,7 +1403,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: 530bdd8705cf0c841b413c2c589ac956, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1670,7 +1670,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: 108.972, y: 1.2465}
m_AnchoredPosition: {x: 123.639496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031819291926011
@ -1900,8 +1900,8 @@ 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: 27.9, y: -170.8}
m_SizeDelta: {x: 116, y: 17}
m_AnchoredPosition: {x: -1.55, y: -170.8}
m_SizeDelta: {x: 155.27, y: 17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320031819405606821
CanvasRenderer:
@ -1974,8 +1974,8 @@ 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.05, y: 0}
m_SizeDelta: {x: 112, y: 11}
m_AnchoredPosition: {x: -0.00011635, y: 0}
m_SizeDelta: {x: 155.24, y: 11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320031819412640665
CanvasRenderer:
@ -2199,8 +2199,8 @@ 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: 27.899994, y: -190.80005}
m_SizeDelta: {x: 116.11, y: 12}
m_AnchoredPosition: {x: -1.5088, y: -190.80005}
m_SizeDelta: {x: 155.32, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320031819680067769
CanvasRenderer:
@ -2349,7 +2349,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: 82.653496, y: 1.2465}
m_AnchoredPosition: {x: 69.153496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031819795124044
@ -2414,7 +2414,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2320031819818155157}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -2424,8 +2424,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 123.639496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_AnchoredPosition: {x: 60.822495, y: 9.577499}
m_SizeDelta: {x: 49.155, y: 49.155}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031819818155162
CanvasRenderer:
@ -2455,7 +2455,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: 8908080ead3926f4e9e9951397b9e29b, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2696,7 +2696,7 @@ GameObject:
m_Component:
- component: {fileID: 2320031820122894204}
- component: {fileID: 2320031820122894178}
- component: {fileID: 2320031820122894179}
- component: {fileID: 7377032655362792110}
m_Layer: 5
m_Name: StarGrid
m_TagString: Untagged
@ -2735,7 +2735,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: -13.6, y: -102.7}
m_AnchoredPosition: {x: 0.02, y: -102.7}
m_SizeDelta: {x: 170.79999, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320031820122894178
@ -2746,7 +2746,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2320031820122894205}
m_CullTransparentMesh: 0
--- !u!114 &2320031820122894179
--- !u!114 &7377032655362792110
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -2755,21 +2755,20 @@ MonoBehaviour:
m_GameObject: {fileID: 2320031820122894205}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 27
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 32.493, y: 32.493}
m_Spacing: {x: -12, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
m_Spacing: -12
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &2320031820124984914
GameObject:
m_ObjectHideFlags: 0
@ -3029,7 +3028,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: 88.479004, y: 1.2465}
m_AnchoredPosition: {x: 99.89299, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031820211446152
@ -3501,7 +3500,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: -89, y: -178.2}
m_AnchoredPosition: {x: -91.4, y: -130.2}
m_SizeDelta: {x: 44, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7628389762105003491

View File

@ -438,20 +438,6 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
hp.fillAmount = curHeroHpVal or 1
hpPass.fillAmount = curHeroHpVal or 1
rage.fillAmount = 0.5
-- pos.sprite=Util.LoadSprite("bd_bianhao".._pos)
--立绘(这里o只当区别索引用)
-- if liveNodes[o] then
-- poolManager:UnLoadLive(liveNames[o],liveNodes[o])
-- liveNames[o]= nil
-- end
-- local artData = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig, heroData.heroConfig.Live)
-- liveNames[o] = artData.Name
-- local _scale = roleConfig[heroData.heroConfig.Id].play_liveScale
-- local _pos = roleConfig[heroData.heroConfig.Id].offset
-- liveNodes[o] = poolManager:LoadLive(liveNames[o], live.transform, Vector3.one * _scale, Vector3.New(_pos[1],_pos[2],0))
-- -- liveNodes[o] = poolManager:LoadLive(liveNames[o], live.transform, Vector3.one * 0.25, Vector3.zero)
-- liveNodes[o]:GetComponent("SkeletonGraphic").raycastTarget=false
end
--战力计算
function this.CalculateAllHeroPower(curHeroData,allHeroTeamAddProVal)

View File

@ -53,29 +53,45 @@ end
function this.SetCardSingleData(go,monsterId,_pos)
local monsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig,monsterId)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,monsterConfig.MonsterId)
local live=Util.GetGameObject(go,"Mask/Live")
local lv=Util.GetGameObject(go,"Lv/Text"):GetComponent("Text")
local bg=Util.GetGameObject(go,"Bg1"):GetComponent("Image")
local lv=Util.GetGameObject(go,"lv/Text"):GetComponent("Text")
go.transform.parent:GetComponent("Image").sprite = Util.LoadSprite(GetHeroCardStarBg[1])
bg.sprite = Util.LoadSprite(GetHeroCardStarBg[heroConfig.Star])
Util.GetGameObject(go,"hpProgress").gameObject:SetActive(false)
Util.GetGameObject(go,"rageProgress").gameObject:SetActive(false)
local fg=Util.GetGameObject(go,"Bg2"):GetComponent("Image")
local pro=Util.GetGameObject(go,"Pro/Image"):GetComponent("Image")
local starGrid=Util.GetGameObject(go,"StarGrid")
local name=Util.GetGameObject(go,"Name/Text"):GetComponent("Text")
local pos=Util.GetGameObject(go,"Pos"):GetComponent("Image")
local yuanImage=Util.GetGameObject(go,"yuanImage")
local live = Util.GetGameObject(go, "Mask/icon"):GetComponent("RawImage")
local liveName = GetResourcePath(heroConfig.Live)
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
local scale = roleConfig.play_liveScale
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
live.transform.localScale = Vector3.one
live.transform.localPosition = Vector3.zero
lv.text=monsterConfig.Level
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(monsterConfig.PropertyName))
SetHeroStars(starGrid,heroConfig.Star)
name.text=monsterConfig.ReadingName
pos.sprite=Util.LoadSprite("bd_bianhao".._pos)
--立绘(这里o只当区别索引用)
if liveNodes[_pos] then
poolManager:UnLoadLive(liveNames[_pos],liveNodes[_pos])
liveNames[_pos]= nil
local zs = Util.GetGameObject(go, "zs")
local zsName = GetHeroCardStarZs[heroConfig.Star]
if zsName == "" then
zs:SetActive(false)
else
zs:SetActive(true)
zs:GetComponent("Image").sprite = Util.LoadSprite(zsName)
end
liveNames[_pos] =GetResourcePath( heroConfig.Live)
local _scale=roleConfig[heroConfig.Id].play_liveScale
local curPos=roleConfig[heroConfig.Id].offset
liveNodes[_pos] = poolManager:LoadLive(liveNames[_pos], live.transform, Vector3.one * _scale, Vector3.New(curPos[1],curPos[2],0))
liveNodes[_pos]:GetComponent("SkeletonGraphic").raycastTarget=false
liveNodes[_pos]:GetComponent("RectTransform").sizeDelta = Vector2.New(500, 500)
yuanImage:SetActive(heroData.createtype == 1)
lv.text=heroData.lv
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroConfig.Star])
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
SetCardStars(starGrid,heroConfig.Star)
name.text=heroConfig.ReadingName
end
--界面关闭时调用(用于子类重写)
function GuildCarDelayFindBossPopup:OnClose()

View File

@ -1717,7 +1717,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
end
end
--目前没有 王振兴加 最后计算个属性的乘减算
if LengthOfTable(curHeroData.MLSproList)>0 then
if curHeroData.MLSproList and LengthOfTable(curHeroData.MLSproList)>0 then
for k, v in pairs(curHeroData.MLSproList) do
local mlsPro=curHeroData.MLSproList[k]
if allAddProVal[mlsPro.proId] then

View File

@ -1238,11 +1238,12 @@ function this.TimeFormat()
-- 显示活动倒计时
local isOpen = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero)
if isOpen and isOpen > 0 and ActivityGiftManager.GetRewardState()~=3 then --活动开启并且未领取完毕
if endTime - PlayerManager.serverTime >= 0 then
if isOpen and isOpen > 0 and ActivityGiftManager.GetRewardState(42)~=3 then --活动开启并且未领取完毕
if endTime - PlayerManager.serverTime > 0 then
-- 第一次解锁
if supremHadSet then
this.btnSupreme:SetActive(true)
--this.btnSupreme:SetActive(true)
this.btnSupreme:SetActive(false)
end
this.supremeTime.text = TimeToHMS((endTime - PlayerManager.serverTime))
supremHadSet = false
@ -1417,7 +1418,7 @@ function this.RefreshActivityBtn(context)
-- end
elseif context.type == ActivityTypeDef.SupremeHero then
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) then
this.btnSupreme:SetActive(ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0 and ActivityGiftManager.GetRewardState()~=3)
this.btnSupreme:SetActive(false)--ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0 and ActivityGiftManager.GetRewardState(42)~=3)
end
elseif context.type==ActivityTypeDef.FindFairy then
this.findFairyBtn:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy))