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

gaoxin 2020-11-02 18:08:30 +08:00
commit 8b4aa8ec10
7 changed files with 59 additions and 51 deletions

View File

@ -34786,10 +34786,10 @@ RectTransform:
m_Father: {fileID: 3569102849833951929}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 100}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 154.8, y: -120}
m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1680150351488365573
CanvasRenderer:
@ -34812,7 +34812,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 0.8588236, g: 0.80392164, b: 0.60784316, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -34820,19 +34820,19 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 200
m_Text: x100
LanguageIndex: 0
--- !u!1 &1562574766218989162
GameObject:
@ -34867,9 +34867,9 @@ RectTransform:
m_Father: {fileID: 3569102849833951929}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 67, y: -123.7}
m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2369707987322037555
@ -35037,9 +35037,9 @@ RectTransform:
m_Father: {fileID: 3569102849833951929}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 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_SizeDelta: {x: 69, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3178489416745694411
@ -35083,7 +35083,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "1\u6B21"
m_Text: "\u518D\u6765\u4E00\u6B21"
LanguageIndex: 0
--- !u!1 &5640363064919714132
GameObject:
@ -35206,7 +35206,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6974725393944192383}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:

View File

@ -134732,10 +134732,10 @@ RectTransform:
m_Father: {fileID: 4985255296929210884}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 100}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 131.1, y: -120}
m_SizeDelta: {x: 75, y: 72.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &651768874262747656
CanvasRenderer:
@ -134758,7 +134758,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 0.8588236, g: 0.80392164, b: 0.60784316, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -134772,13 +134772,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 2000
m_Text: "\xD7100"
LanguageIndex: 0
--- !u!1 &1149583209502976028
GameObject:
@ -135252,9 +135252,9 @@ RectTransform:
m_Father: {fileID: 4985255296929210884}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 3.3, y: -0.15000153}
m_SizeDelta: {x: 69, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1617197464721193097
@ -135421,7 +135421,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8700738430591175735}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -135470,9 +135470,9 @@ RectTransform:
m_Father: {fileID: 4985255296929210884}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 58.9, y: -123.41}
m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3793665745798764377

View File

@ -4501,7 +4501,7 @@ function this.UpPokemonLevelRequest(pokemonDId, upLv,oldLv, func)
local data = buffer:DataByte()
local msg = HeroInfoProto_pb.PokenmonUpLevelResponse()
msg:ParseFromString(data)
Log(Language[11429]..msg.level)
-- Log(Language[11429]..msg.level)
if func then
func(msg)
end

View File

@ -116,7 +116,7 @@ function PokemonSummonOneResultPanel:OnOpen(...)
else
this.itemNum3.gameObject:SetActive(true)
this.itemIcon3.gameObject:SetActive(true)
this.itemInfo3.text=Language[12418]
this.itemInfo3.text="再来1次"
itemId=0
local d = RecruitManager.GetExpendData(this.recruitType)
itemId = d[1]
@ -134,7 +134,7 @@ function PokemonSummonOneResultPanel:OnOpen(...)
this.tipText.gameObject:SetActive(false)
end
this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
this.itemNum3.text= "x"..itemNum
this.itemNum3.text= "×"..itemNum
end
this.itemDataList = {}
this.itemDataList = BagManager.GetTableByBackDropData(this.drop)

View File

@ -35,12 +35,13 @@ function PokemonSummonTenResultPanel:InitComponent()
this.detailImage1=Util.GetGameObject(this.content1,"Tip")
this.detailText1 = Util.GetGameObject(this.detailImage1, "contentDetailText"):GetComponent("Text")
this.content3=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content3")
this.infoTxt=Util.GetGameObject(this.content3,"info"):GetComponent("Text")
this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
this.content2=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content2")
this.itemIcon2=Util.GetGameObject(this.content2,"Icon"):GetComponent("Image")
this.tipText=Util.GetGameObject(this.openTenAgainButton, "Text"):GetComponent("Text")
this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text")
this.tipText=Util.GetGameObject(this.openTenAgainButton, "Text"):GetComponent("Text")
for i = 1, 10 do
this.contentList[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i.."/image/Kuang/itemName/itemContent")
this.contentListParent[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i)
@ -75,6 +76,7 @@ function PokemonSummonTenResultPanel:BindEvent()
return
end
end
if BagManager.GetItemCountById(itemId) < itemNum then
PopupTipPanel.ShowTip(ItemConfig[itemId].Name..Language[10492])
return
@ -136,7 +138,14 @@ function PokemonSummonTenResultPanel:OnOpen(...)
local currPrivilege = privilegeConfig[3004]
itemNum = itemNum*(1+currPrivilege.Condition[1][2]/10000)
end
this.itemNum3.text= "x"..itemNum
if itemId ==16 then
this.tipText.gameObject:SetActive(true)
this.tipText.text=string.format("妖晶召唤次数:%s/%s",PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId), PrivilegeManager.GetPrivilegeNumber(YaojingCallPrivilegeId))
else
this.tipText.gameObject:SetActive(false)
end
this.infoTxt.text="再来10次"
this.itemNum3.text= "×"..itemNum
local itemDataList={}
itemDataList=BagManager.GetTableByBackDropData(this.drop)
@ -148,12 +157,7 @@ function PokemonSummonTenResultPanel:OnOpen(...)
id=tenConfig.TenTimesMustGetItem[1][1]
num=tenConfig.TenTimesMustGetItem[1][2]
end
if itemId ==16 then
this.tipText.gameObject:SetActive(true)
this.tipText.text=string.format("妖晶召唤次数:%s/%s",PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId), PrivilegeManager.GetPrivilegeNumber(YaojingCallPrivilegeId))
else
this.tipText.gameObject:SetActive(false)
end
for key, value in pairs(itemDataList) do
if ishave==false and value.sId==id and value.num==num then
table.removebyvalue(itemDataList,value)

View File

@ -68,6 +68,7 @@ this._onPointerDown = function(Pointgo, data)
_isClicked = true
this.timePressStarted = Time.realtimeSinceStartup
oldLv = curPokemonData.lv
allAddProVal = PokemonManager.GetSinglePokemonAddProData(curPokemonData.dynamicId)
end
--长按升级抬起状态
this._onPointerUp = function(Pointgo, data)
@ -198,11 +199,12 @@ function this.ShowPokemonInfo()
end
--长按升级结束后请求协议
function this.LongLvUpClick(oldLv)
LogPink("ssssssssssssssss")
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv,oldLv,function (msg)
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,msg.level,curPokemonData.star)
curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId)
local allAddProValNet = PokemonManager.GetSinglePokemonAddProData(curPokemonData.dynamicId)
this.ShowProAddVal(allAddProValNet)
this.ShowPokemonInfo()
_isReqLvUp = false
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
@ -227,10 +229,13 @@ function this.LvUpClick(isSingleLvUp)
return
end
if isSingleLvUp then
allAddProVal = PokemonManager.GetSinglePokemonAddProData(curPokemonData.dynamicId)
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv + 1,curPokemonData.lv, function()
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,curPokemonData.lv + 1,curPokemonData.star)
NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv + 1,curPokemonData.lv, function(msg)
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,msg.level,curPokemonData.star)
curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId)
local allAddProValNet = PokemonManager.GetSinglePokemonAddProData(curPokemonData.dynamicId)
this.ShowProAddVal(allAddProValNet)
this.ShowPokemonInfo()
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
@ -248,13 +253,12 @@ function this.LvUpClick(isSingleLvUp)
end
end
--播放升级 属性提升动画
function this.ShowProAddVal(allAddProValOld)
function this.ShowProAddVal(allAddProValNet)
this.lvUpGo:SetActive(true)
Util.GetGameObject(lvUpShowProList[1], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.Attack]-allAddProValOld[HeroProType.Attack]
Util.GetGameObject(lvUpShowProList[2], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.Hp]-allAddProValOld[HeroProType.Hp]
Util.GetGameObject(lvUpShowProList[3], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.PhysicalDefence]-allAddProValOld[HeroProType.PhysicalDefence]
Util.GetGameObject(lvUpShowProList[4], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.MagicDefence]-allAddProValOld[HeroProType.MagicDefence]
--Util.GetGameObject(lvUpShowProList[5], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.Speed]-allAddProValOld[HeroProType.Speed]
Util.GetGameObject(lvUpShowProList[1], "proPre/vale"):GetComponent("Text").text="+"..allAddProValNet[HeroProType.Attack]-allAddProVal[HeroProType.Attack]
Util.GetGameObject(lvUpShowProList[2], "proPre/vale"):GetComponent("Text").text="+"..allAddProValNet[HeroProType.Hp]-allAddProVal[HeroProType.Hp]
Util.GetGameObject(lvUpShowProList[3], "proPre/vale"):GetComponent("Text").text="+"..allAddProValNet[HeroProType.PhysicalDefence]-allAddProVal[HeroProType.PhysicalDefence]
Util.GetGameObject(lvUpShowProList[4], "proPre/vale"):GetComponent("Text").text="+"..allAddProValNet[HeroProType.MagicDefence]-allAddProVal[HeroProType.MagicDefence]
this.ThreadShowProAddVal()
end
function this.ThreadShowProAddVal()

View File

@ -142,7 +142,7 @@ function this:BindEvent()
allCoin=allCoin+lingshouConfig.CoinReturn[2]*(haveNum+1)
end
--加上所有的分解币
table.insert(allMaterials,{1203,allCoin})
table.insert(allMaterials,{1205,allCoin})
else--灵兽碎片
local itemConfig=ConfigManager.GetConfigData(ConfigName.ItemConfig,selectChipId)
if itemConfig then