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

dev_chengFeng
jiaoyangna 2020-11-06 17:19:34 +08:00
commit 41f62176f2
10 changed files with 79 additions and 46 deletions

View File

@ -4773,7 +4773,7 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7599086031421744739}
- component: {fileID: 2700394792873991787}
m_Layer: 0
m_Name: Effect_c_dhdj_00042_s1_attack_01
m_TagString: Untagged
@ -4781,14 +4781,14 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7599086031421744739
Transform:
--- !u!224 &2700394792873991787
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1762227900176343698}
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:
@ -4796,6 +4796,11 @@ Transform:
m_Father: {fileID: 0}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2395908319297874085
GameObject:
m_ObjectHideFlags: 0
@ -23912,7 +23917,7 @@ Transform:
m_LocalScale: {x: 270, y: 270, z: 270}
m_Children:
- {fileID: 3036545675835963328}
m_Father: {fileID: 7599086031421744739}
m_Father: {fileID: 2700394792873991787}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7713441863657285848

View File

@ -67301,7 +67301,7 @@ Transform:
- {fileID: 815421275675311144}
- {fileID: 1162331467017374328}
- {fileID: 2724444954265427672}
m_Father: {fileID: 471121379223646905}
m_Father: {fileID: 8043928393687371552}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3186308581313113342
@ -76876,7 +76876,7 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 471121379223646905}
- component: {fileID: 8043928393687371552}
m_Layer: 0
m_Name: Effect_c_dhdj_00042_s1_attack_02
m_TagString: Untagged
@ -76884,14 +76884,14 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &471121379223646905
Transform:
--- !u!224 &8043928393687371552
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3730782402742549598}
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:
@ -76899,6 +76899,11 @@ Transform:
m_Father: {fileID: 0}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3814272112604722327
GameObject:
m_ObjectHideFlags: 0

View File

@ -8,7 +8,7 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3144126611476454714}
- component: {fileID: 7931367167541166226}
m_Layer: 0
m_Name: Effect_c_swk_00015_s1_attack_01
m_TagString: Untagged
@ -16,21 +16,26 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3144126611476454714
Transform:
--- !u!224 &7931367167541166226
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 322654047297350180}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -97, y: 430.00015, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 9167990640021408193}
m_Father: {fileID: 0}
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: -97, y: 430.00015}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2141241798634746101
GameObject:
m_ObjectHideFlags: 0
@ -19134,7 +19139,7 @@ Transform:
- {fileID: 8019351523515441064}
- {fileID: 2515042437410018934}
- {fileID: 2378025501828548357}
m_Father: {fileID: 3144126611476454714}
m_Father: {fileID: 7931367167541166226}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4938455122180281220

View File

@ -4830,7 +4830,7 @@ Transform:
- {fileID: 8564819009102187572}
- {fileID: 7401892489688752142}
- {fileID: 6498531311445803834}
m_Father: {fileID: 4383107960518431859}
m_Father: {fileID: 5746035116402569674}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &935981664152685683
@ -19379,7 +19379,7 @@ Transform:
- {fileID: 6189848272804869810}
- {fileID: 1749892478884323005}
- {fileID: 3339020951091064430}
m_Father: {fileID: 4383107960518431859}
m_Father: {fileID: 5746035116402569674}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 69.583, y: 42.367, z: 1752.157}
--- !u!95 &2570618559598263272
@ -19435,7 +19435,7 @@ Transform:
- {fileID: 4515656011682862330}
- {fileID: 8590135381278131375}
- {fileID: 8606156288132861143}
m_Father: {fileID: 4383107960518431859}
m_Father: {fileID: 5746035116402569674}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 53.850002, y: 0, z: 0}
--- !u!95 &982882623047948307
@ -29007,7 +29007,7 @@ Transform:
m_LocalPosition: {x: 127, y: -3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4383107960518431859}
m_Father: {fileID: 5746035116402569674}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 47.358, y: -90.00001, z: 0}
--- !u!198 &5216167259718321273
@ -33868,7 +33868,7 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4383107960518431859}
- component: {fileID: 5746035116402569674}
m_Layer: 0
m_Name: Effect_c_swk_00015_s1_attack_02
m_TagString: Untagged
@ -33876,14 +33876,14 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4383107960518431859
Transform:
--- !u!224 &5746035116402569674
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4130492159784211275}
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:
@ -33897,6 +33897,11 @@ Transform:
m_Father: {fileID: 0}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4223436536780499831
GameObject:
m_ObjectHideFlags: 0
@ -48451,7 +48456,7 @@ RectTransform:
m_Children:
- {fileID: 1202683312960769221}
- {fileID: 3172405851288259421}
m_Father: {fileID: 4383107960518431859}
m_Father: {fileID: 5746035116402569674}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -48488,7 +48493,7 @@ Transform:
m_LocalPosition: {x: 161, y: 10, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4383107960518431859}
m_Father: {fileID: 5746035116402569674}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &8056092349826946235
@ -86767,7 +86772,7 @@ Transform:
m_LocalPosition: {x: 113, y: 55, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4383107960518431859}
m_Father: {fileID: 5746035116402569674}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 323.491, y: -90.00001, z: 0}
--- !u!198 &8762499819476626274

View File

@ -33282,7 +33282,7 @@ Transform:
m_Children:
- {fileID: 4825748654401831251}
- {fileID: 8879671120948909023}
m_Father: {fileID: 3769838849438119521}
m_Father: {fileID: 8221842612046425066}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &3023497960085652362
@ -33360,7 +33360,7 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3769838849438119521}
- component: {fileID: 8221842612046425066}
m_Layer: 0
m_Name: Effect_c_swk_00015_s1_attack_03
m_TagString: Untagged
@ -33368,14 +33368,14 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3769838849438119521
Transform:
--- !u!224 &8221842612046425066
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4636416861317394539}
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:
@ -33383,6 +33383,11 @@ Transform:
m_Father: {fileID: 0}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4648380999809165185
GameObject:
m_ObjectHideFlags: 0

View File

@ -516,6 +516,7 @@ EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTEAMINFO = protobuf.Descriptor();
EXPEDITIONTEAMINFO_HERO_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
@ -5450,11 +5451,21 @@ EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD.default_value = 0.0
EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD.type = 1
EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD.cpp_type = 5
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.name = "position"
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.full_name = ".com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo.position"
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.number = 5
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.index = 4
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.label = 1
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.has_default_value = false
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.default_value = 0
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.type = 5
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.cpp_type = 1
EXPEDITIONSIMPLEBOSSINFO.name = "ExpeditionSimpleBossInfo"
EXPEDITIONSIMPLEBOSSINFO.full_name = ".com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo"
EXPEDITIONSIMPLEBOSSINFO.nested_types = {}
EXPEDITIONSIMPLEBOSSINFO.enum_types = {}
EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD}
EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD, EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD}
EXPEDITIONSIMPLEBOSSINFO.is_extendable = false
EXPEDITIONSIMPLEBOSSINFO.extensions = {}
EXPEDITIONTEAMINFO_HERO_FIELD.name = "hero"

View File

@ -87,7 +87,7 @@ end
function YiJingBaoKu:OnShow(_sortingOrder,_parent)
Util.AddParticleSortLayer(this.effect, _sortingOrder - sortingOrder)
local image = Util.GetGameObject(this.effect, "UI_Effect_YJBK_Zao/GameObject/Image (2)"):GetComponent("Canvas")
image.sortingOrder = _sortingOrder - sortingOrder
image.sortingOrder = _sortingOrder + 1
sortingOrder = _sortingOrder
parent = _parent
@ -98,7 +98,7 @@ end
function YiJingBaoKu:OnSortingOrderChange(_sortingOrder)
Util.AddParticleSortLayer(this.effect, _sortingOrder - sortingOrder)
local image = Util.GetGameObject(this.effect, "UI_Effect_YJBK_Zao/GameObject/Image (2)"):GetComponent("Canvas")
image.sortingOrder = _sortingOrder - sortingOrder
image.sortingOrder = _sortingOrder + 1
sortingOrder = _sortingOrder
end

View File

@ -34,9 +34,8 @@ function this.InitExpeditionData(msg)
singleNodeInfo.state = nodeInfo.state--节点状态 0未开启 1未通过 2未领取圣物 3已完成
singleNodeInfo.bossTeaminfo = {}--节点队伍信息
singleNodeInfo.bossTeaminfo.hero = {}--节点队伍信息 英雄
--LogGreen("-----||||服务端初始化节点信息 "..singleNodeInfo.sortId.." "..singleNodeInfo.state.." "..singleNodeInfo.lay )
-- LogGreen("-----||||服务端初始化节点信息 "..singleNodeInfo.sortId.." "..singleNodeInfo.state.." "..singleNodeInfo.lay )
if nodeInfo.bossTeaminfo then
--Log("nodeInfo.bossTeaminfo.hero "..#nodeInfo.bossTeaminfo.hero)
if nodeInfo.bossTeaminfo.hero and #nodeInfo.bossTeaminfo.hero > 0 then
for k = 1, #nodeInfo.bossTeaminfo.hero do
local singleHero = {}
@ -44,6 +43,7 @@ function this.InitExpeditionData(msg)
singleHero.star = nodeInfo.bossTeaminfo.hero[k].star
singleHero.level = nodeInfo.bossTeaminfo.hero[k].level
singleHero.remainHp = nodeInfo.bossTeaminfo.hero[k].remainHp
singleHero.position = nodeInfo.bossTeaminfo.hero[k].position
table.insert(singleNodeInfo.bossTeaminfo.hero,singleHero)
end
end

View File

@ -95,9 +95,7 @@ function this:FormationAdapter()
elseif type == 2 then
this.sureBtnText.text = Language[10512]
end
LogBlue("curNodeConFig.type "..curNodeConFig.type)
if curNodeConFig then
LogBlue("curNodeConFig.type 1 "..curNodeConFig.type)
if curNodeConFig.type == ExpeditionNodeType.Common then
this.titleText.text=Language[10513]
elseif curNodeConFig.type == ExpeditionNodeType.Jy then
@ -108,17 +106,16 @@ function this:FormationAdapter()
end
if monsterData == nil then LogError(Language[10511]) return end
this.power.text = monsterData.bossTeaminfo.totalForce
for i = 1, #heroListGo do
if(monsterData.bossTeaminfo.hero[i]) then
if monsterData.bossTeaminfo.hero[i].remainHp > 0 then
this.SetCardSingleData(heroListGo[i],monsterData.bossTeaminfo.hero[i],i)
heroListGo[i]:SetActive(true)
else
heroListGo[i]:SetActive(false)
end
else
heroListGo[i]:SetActive(false)
for i = 1, #heroListGo do
if(monsterData.bossTeaminfo.hero[i]) then
local pos = monsterData.bossTeaminfo.hero[i].position
if monsterData.bossTeaminfo.hero[i].remainHp > 0 then
this.SetCardSingleData(heroListGo[pos],monsterData.bossTeaminfo.hero[i],pos)
heroListGo[pos]:SetActive(true)
end
end
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)

View File

@ -193,7 +193,7 @@ function this.SetGoldExperSortInfo()
rewardData = {}
for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityRankingReward)) do
if v.ActivityId == activeId then
if myData.rank >= v.MinRank and myData.rank >= v.MaxRank then
if myData.rank >= v.MinRank and myData.rank <= v.MaxRank then
rewardData = v
end
end