Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-03-18 12:03:57 +08:00
commit 6246da5bb6
13 changed files with 58 additions and 46 deletions

View File

@ -416,7 +416,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "$99.99\u62A2\u8D2D"
m_Text: "648\u5143"
LanguageIndex: 0
--- !u!1 &2967035711827971772
GameObject:

View File

@ -798,7 +798,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &607204243134119192
RectTransform:
m_ObjectHideFlags: 0
@ -1058,7 +1058,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -458.15002, y: -0.000030517578}
m_SizeDelta: {x: 78, y: 178.2}
m_SizeDelta: {x: 0, y: 178.2}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1926120344521085328
MonoBehaviour:
@ -1620,7 +1620,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "$49.99\u62A2\u8D2D"
m_Text: "328\u5143"
LanguageIndex: 0
--- !u!1 &7530648803375548314
GameObject:

View File

@ -35,7 +35,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3941559009706528494
CanvasRenderer:
@ -423,7 +423,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4755428599246343356
CanvasRenderer:
@ -503,7 +503,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6275955706316199721
CanvasRenderer:
@ -1136,7 +1136,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5818617628848707151
CanvasRenderer:
@ -1518,7 +1518,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6372460139430684745
CanvasRenderer:
@ -1603,12 +1603,12 @@ RectTransform:
- {fileID: 9154637298164680968}
- {fileID: 8247683834651013525}
m_Father: {fileID: 3129617478986272255}
m_RootOrder: 2
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: 182, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 140, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &4351184615061623245
MonoBehaviour:
@ -1623,11 +1623,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: -25
m_Left: -10
m_Right: -10
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_ChildAlignment: 4
m_Spacing: -25
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
@ -1646,7 +1646,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
m_VerticalFit: 0
--- !u!1 &5210777604067897243
GameObject:
m_ObjectHideFlags: 0
@ -1757,8 +1757,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7274797596699487935}
- {fileID: 2703654448420865930}
- {fileID: 3426774782456427134}
- {fileID: 2703654448420865930}
- {fileID: 3642677507929918682}
m_Father: {fileID: 6419984895331961076}
m_RootOrder: 1
@ -1766,7 +1766,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -455, y: 82}
m_SizeDelta: {x: 0, y: 50}
m_SizeDelta: {x: 0, y: 46}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &3427064874032188496
MonoBehaviour:
@ -1786,7 +1786,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 10
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
@ -1952,7 +1952,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6326068208291493611
CanvasRenderer:
@ -2032,7 +2032,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6782556990393610046
CanvasRenderer:
@ -2112,8 +2112,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -2, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_AnchoredPosition: {x: 13, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1815451018577670510
CanvasRenderer:
@ -2277,12 +2277,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3129617478986272255}
m_RootOrder: 1
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: 150, y: 0}
m_SizeDelta: {x: 0, y: 43}
m_AnchoredPosition: {x: 355, y: 0}
m_SizeDelta: {x: 0, y: 46}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1556712413964630940
CanvasRenderer:
@ -2312,7 +2312,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: 1e2d84c75cd281242a2bf1f69edfec36, type: 3}
m_Sprite: {fileID: 21300000, guid: 8433faecc652d374ab2a8398d559dfcb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2370,7 +2370,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6134787424522773605
CanvasRenderer:
@ -2530,7 +2530,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2726567246643373228
CanvasRenderer:

View File

@ -89251,7 +89251,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: -64, y: -66}
m_AnchoredPosition: {x: -102, y: -66}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1599836007671335418
@ -89295,7 +89295,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 300
m_Text: 2000
--- !u!114 &1599836007671335416
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -336,7 +336,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\uFFE5328"
m_Text: "328\u5143"
--- !u!1 &2776762708753556006
GameObject:
m_ObjectHideFlags: 0

View File

@ -67,5 +67,10 @@ function this.GetMoneyUnitName(mt)
return _t2n[1]
end
function this.GetMoneyUnitNameWithMoney(money)
local formater = this.GetMoneyUnitName()
return string.format(formater, money)
end
return MoneyUtil

View File

@ -93,7 +93,7 @@ function WeekCard:WeekCardShow()
else
this.weekCardBuyBtn:GetComponent("Button").enabled=true
this.weekCardBuyNum.text = Language[10593]..weekCardData.buyTimes.."/"..weekConFig.Limit
Util.GetGameObject(self.weekCardBuyBtn.gameObject, "Text"):GetComponent("Text").text = MoneyUtil.GetMoneyMark()..MoneyUtil.GetMoney(weekConFig.Price)
Util.GetGameObject(self.weekCardBuyBtn.gameObject, "Text"):GetComponent("Text").text = MoneyUtil.GetMoneyUnitNameWithMoney(weekConFig.Price)--..MoneyUtil.GetMoney(weekConFig.Price)
end
else
this.weekCardBuyBtn:GetComponent("Button").enabled=false

View File

@ -8,6 +8,7 @@ local isGet
local heroSId
local heroStar
local allSkillDatas = {}
local breakId,upStarId
--初始化组件(用于子类重写)
function RoleGetInfoPopup:InitComponent()
@ -148,13 +149,6 @@ end
function RoleGetInfoPopup:OnShow()
allSkillDatas = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas(heroSId,heroStar)
local heroSData=ConfigManager.GetConfigData(ConfigName.HeroConfig, heroSId)
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage)
local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroSData.Awaken or heroSData.OpenPassiveSkillRules
if OpenPassiveSkillRules then
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,0,0)
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
end
if isGet then
this.GetShowPanelData()
--天赋
@ -166,6 +160,14 @@ function RoleGetInfoPopup:OnShow()
this.NoGetShowPanelData()
end
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage)
local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroSData.Awaken or heroSData.OpenPassiveSkillRules
if OpenPassiveSkillRules then
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,breakId,upStarId)
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
end
--技能 布局变动
self.skillLine.gameObject:SetActive(not (heroSData.OpenPassiveSkillRules == nil and heroSData.EquipTalismana==nil))
if heroSData.OpenPassiveSkillRules == nil and heroSData.EquipTalismana==nil then
@ -352,8 +354,8 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar
-- end
local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum)
local curLvNum=1
local breakId = 0
local upStarId = 0
breakId = 0
upStarId = 0
if isCalculateStarVal then
--等级
curLvNum = heroRankupConfig.OpenLevel

View File

@ -8,6 +8,7 @@ local passiveSkillConfig=ConfigManager.GetConfig(ConfigName.PassiveSkillConfig)
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local propertyconfig=ConfigManager.GetConfig(ConfigName.PropertyConfig)
--面板类型
local Type={
Up=1, --穿戴
@ -240,7 +241,7 @@ function this.RefreshShow(type)
this.scroll_1:SetActive(#equipConfig[soulId].Range<=3)
this.scroll_2:SetActive(#equipConfig[soulId].Range>3)
--适用英雄<=3时 固定长度生成(预设) 反之使用优化滚动条
if #equipConfig[soulId].Range<=0 then
if #equipConfig[soulId].Range<=3 then
for j = 0, this.scroll_1.transform.childCount-1 do
this.scroll_1.transform:GetChild(j).gameObject:SetActive(false)
end

View File

@ -141,8 +141,10 @@ function GiftView:RefreshOneKeyShow()
local now = 0
now = now + MoneyUtil.GetMoney(rechargeCommodityConfig[1004].Price)
self.oriPrice.text = Language[10582]..MoneyUtil.GetMoneyMark()..ori
self.nowPrice.text = Language[10644]..MoneyUtil.GetMoneyMark()..now
-- self.oriPrice.text = Language[10582]..MoneyUtil.GetMoneyMark()..ori
-- self.nowPrice.text = Language[10644]..MoneyUtil.GetMoneyMark()..now
self.oriPrice.text = string.format("现价:%s元",ori)
self.nowPrice.text = string.format("原价:%s元",now)
end
-- 刷新礼包的数据

View File

@ -91,7 +91,7 @@ function this:ShopItemAdapter(shopItem, itemData)
local itemInfo = ShopManager.GetRechargeItemInfo(itemData.goodsId)
icon.sprite = Util.LoadSprite(GetResourcePath(itemInfo.Resources))
num.text = itemInfo.BaseReward[1][2]
price.text = MoneyUtil.GetMoneyMark() .. MoneyUtil.GetMoney(itemInfo.Price)
price.text = MoneyUtil.GetMoneyUnitNameWithMoney(itemInfo.Price)-- .. MoneyUtil.GetMoney(itemInfo.Price)
-- 判断首充赠送
local curBuyCount = itemData.buyTimes
first:SetActive(curBuyCount < 1)

View File

@ -195,6 +195,8 @@ function XiaoYaoLuckyBossPopup:SetSelectHero(monsterData)
Util.GetGameObject(this.e_fightBtn,"layout/num"):GetComponent("Text").text = "<color=#1B262E>" .. costNum .. "</color>"
end
else
costId = 16
costNum = 0
Util.GetGameObject(this.e_fightBtn,"Text").gameObject:SetActive(true)
Util.GetGameObject(this.e_fightBtn,"layout").gameObject:SetActive(false)
end

View File

@ -536,7 +536,7 @@ function this:RechargeShopItemAdapter(shopItem, itemData)
local itemInfo = ShopManager.GetRechargeItemInfo(itemData.goodsId)
icon.sprite = Util.LoadSprite(GetResourcePath(itemInfo.Resources))
num.text = itemInfo.BaseReward[1][2]
price.text = MoneyUtil.GetMoneyMark() .. MoneyUtil.GetMoney(itemInfo.Price)
price.text = MoneyUtil.GetMoneyUnitNameWithMoney(itemInfo.Price) --.. MoneyUtil.GetMoney(itemInfo.Price)
-- 判断首充赠送
local curBuyCount = itemData.buyTimes