root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

dev_chengFeng
jiaoyangna 2020-08-26 20:04:13 +08:00
parent c2ec9c93f8 86361419cc
commit 03048116e4
6 changed files with 166 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
View File

@ -252,7 +252,8 @@ RectTransform:
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_Children:
- {fileID: 296289172106937082}
m_Father: {fileID: 53820364}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -339,7 +340,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -60, y: 0}
m_AnchoredPosition: {x: -67, y: 0}
m_SizeDelta: {x: 22, y: 43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &384446963
@ -357,7 +358,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 384446960}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -5661,7 +5662,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 6.8, y: 0}
m_AnchoredPosition: {x: 34.5, y: 0}
m_SizeDelta: {x: 250, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2337293845181566925
@ -5705,7 +5706,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
m_Text: 111
--- !u!114 &4148450475228044834
MonoBehaviour:
m_ObjectHideFlags: 0
@ -6527,7 +6528,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -0.000010519653, y: 0}
m_AnchoredPosition: {x: 0.000045690987, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &6954504526559241720
@ -9067,6 +9068,80 @@ MonoBehaviour:
m_EffectColor: {r: 1, g: 0.85490197, b: 0.70980394, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &5318928877762306607
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 296289172106937082}
- component: {fileID: 7686512266488052430}
- component: {fileID: 1496658283171827703}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &296289172106937082
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5318928877762306607}
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: 296395606}
m_RootOrder: 0
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: 100.2, y: -1}
m_SizeDelta: {x: 22, y: 43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7686512266488052430
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5318928877762306607}
m_CullTransparentMesh: 0
--- !u!114 &1496658283171827703
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5318928877762306607}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 1e2d84c75cd281242a2bf1f69edfec36, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5332957532347260993
GameObject:
m_ObjectHideFlags: 0
@ -12563,60 +12638,6 @@ PrefabInstance:
propertyPath: m_Name
value: freeBtn
objectReference: {fileID: 0}
- target: {fileID: 1094093250584210, guid: 584f6c7286705c645ab8323012566269, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1708856882303358, guid: 584f6c7286705c645ab8323012566269, type: 3}
propertyPath: m_Name
value: UI_effect_TanSuo_Box
objectReference: {fileID: 0}
- target: {fileID: 114761016256353280, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 66a42b5e6f23e0a4ab71bf77c6b3754b,
type: 3}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 14.6
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_SizeDelta.x
value: 779.2
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_SizeDelta.y
value: 1029.2
objectReference: {fileID: 0}
- target: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_LocalPosition.x
@ -12732,6 +12753,60 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 14.6
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_SizeDelta.x
value: 779.2
objectReference: {fileID: 0}
- target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_SizeDelta.y
value: 1029.2
objectReference: {fileID: 0}
- target: {fileID: 1708856882303358, guid: 584f6c7286705c645ab8323012566269, type: 3}
propertyPath: m_Name
value: UI_effect_TanSuo_Box
objectReference: {fileID: 0}
- target: {fileID: 1094093250584210, guid: 584f6c7286705c645ab8323012566269, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114761016256353280, guid: 584f6c7286705c645ab8323012566269,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 66a42b5e6f23e0a4ab71bf77c6b3754b,
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 584f6c7286705c645ab8323012566269, type: 3}
--- !u!1 &3812896437756706176 stripped

8
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
View File

@ -7620,6 +7620,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 43
resAbNameIndex: 21
- resName: r_zjm_huodongicon-shijuezhen
extension: .png
resPathIndex: 43
resAbNameIndex: 21
- resName: r_zjm_huodongicon-shouchong2
extension: .png
resPathIndex: 43
@ -7652,6 +7656,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 43
resAbNameIndex: 21
- resName: r_zjm_huodongicon-zhushengzhidian
extension: .png
resPathIndex: 43
resAbNameIndex: 21
- resName: r_zjm_icon-baibaozai
extension: .png
resPathIndex: 43

6
Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
View File

@ -185,6 +185,12 @@ function BattleLogic.TurnRound(debugTurn)
CurCamp = (CurCamp + 1) % 2
end
-- 这里再检测一次战斗结束
if CurRound > MaxRound then
return
end
LogGreen(Language[10229]..CurCamp)
--
BattleLogManager.Log(

4
Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
View File

@ -84,6 +84,7 @@ end
function this.HeroCompoundBtnClick(_btn,_curIndex)
curIndex = _curIndex
this.SetBtnSelect(_btn)
curSelectHeroConfig = nil
this.ShowCurrPosHeroCompound()
end
--显示当前阵营的英雄
@ -270,6 +271,7 @@ function this.SetShowHeroListData(upStarConsumeMaterial,curHeroList,isFirstPos)-
end
return curList
end
--升星选择祭品后刷新界面
function this.AutoSelectUpStarHeroList(_curUpStarData)
local curUpStarData= _curUpStarData.upStarMaterialsData
@ -570,7 +572,7 @@ function this.GetAllHeroCompoundData(index)
if curSelectHeroConfig and curSelectHeroConfig.config and curSelectHeroConfig.config.Id == curHeroCompoundData.config.Id then
curSelectHeroConfig = curHeroCompoundData
end
LogGreen("curHeroCompoundData.needNum "..curHeroCompoundData.needNum.." "..LengthOfTable(curHeroCompoundData.haveHeroList2))
-- LogGreen("curHeroCompoundData.needNum "..curHeroCompoundData.needNum.." "..LengthOfTable(curHeroCompoundData.haveHeroList2))
table.insert(allCompoundHeroConFigData,curHeroCompoundData)
end
end

20
Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
View File

@ -1523,27 +1523,27 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
heroSkillSingleHeroProVal, heroSkillLvProVal, heroSkillAllHeroProVal, heroSkillSpecialProVal =
CalculateHeroPassiveSkillProAddVal(_type, curHeroData.dynamicId, _breakId, _upStarId)
end
--if heroSkillSingleHeroProVal and LengthOfTable(heroSkillSingleHeroProVal) > 0 then
-- if heroSkillSingleHeroProVal and LengthOfTable(heroSkillSingleHeroProVal) > 0 then
-- for i, v in pairs(heroSkillSingleHeroProVal) do
-- if v > 0 then
-- LogError("英雄被动技的单体属性加成 "..i.." "..v)
-- end
-- end
--end
--if heroSkillLvProVal and LengthOfTable(heroSkillLvProVal) > 0 then
-- end
-- if heroSkillLvProVal and LengthOfTable(heroSkillLvProVal) > 0 then
-- for i, v in pairs(heroSkillLvProVal) do
-- if v > 0 then
-- LogError("英雄被动技的等极限值属性加成 "..i.." "..v)
-- end
-- end
--end
--if heroSkillAllHeroProVal and LengthOfTable(heroSkillAllHeroProVal) > 0 then
-- end
-- if heroSkillAllHeroProVal and LengthOfTable(heroSkillAllHeroProVal) > 0 then
-- for i, v in pairs(heroSkillAllHeroProVal) do
-- if v > 0 then
-- LogError("英雄被动技的团体属性加成 "..i.." "..v)
-- end
-- end
--end
-- end
--法宝的属性加成 falismanProAdd
local falismanSingleHeroProVal, falismanLvProVal, falismanAllHeroProVal, falismanSpecialProVal = {}, {}, {}, {}
if _type == 1 then
@ -2904,7 +2904,13 @@ function this.ByCompoundHeroGetAllHeros()
local downSoryHeroList = {}
for i, v in pairs(heroDatas) do
if v.star == 4 or v.star == 5 or v.star == 3 then--四星 五星 才能加 3星 是狗粮
v.isFormation = ""
if #v.formationList ~= 0 then
local text = ""
for index, value in ipairs(v.formationList) do
text = HeroManager.GetHeroFormationStr(index)
end
v.isFormation = text
end
table.insert(upSortHeroList,v)
table.insert(downSoryHeroList,v)
end

2
Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
View File

@ -323,7 +323,7 @@ end
--根据数字位数计算艺术字体后面的文字位置
function GiftView:SetTextPos(num1)
local x = (string.len(tostring(num1))-1)*18 - 50
local x = (string.len(tostring(num1))-1)*18 - 60
return x
end