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

dev_chengFeng
gaoxin 2021-03-31 19:06:34 +08:00
commit 5f16021a0e
10 changed files with 3215 additions and 68 deletions

View File

@ -5062,7 +5062,7 @@ ParticleSystem:
--- !u!199 &164252952
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10430,7 +10430,7 @@ ParticleSystem:
--- !u!199 &417340780
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15182,7 +15182,7 @@ ParticleSystem:
--- !u!199 &454057099
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20283,7 +20283,7 @@ ParticleSystem:
--- !u!199 &660142689
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -25675,7 +25675,7 @@ ParticleSystem:
--- !u!199 &1213725162
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30503,7 +30503,7 @@ ParticleSystem:
--- !u!199 &1263299586
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35267,7 +35267,7 @@ ParticleSystem:
--- !u!199 &1360543435
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -39956,7 +39956,7 @@ ParticleSystem:
--- !u!199 &1401364074
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -44855,7 +44855,7 @@ ParticleSystem:
--- !u!199 &1500759235
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -49988,7 +49988,7 @@ ParticleSystem:
--- !u!199 &1843157643
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -54758,7 +54758,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: 35, y: -66}
m_AnchoredPosition: {x: 100, y: -66}
m_SizeDelta: {x: 70, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2804420424379389885
@ -58163,7 +58163,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -35, y: -66}
m_AnchoredPosition: {x: -100, y: -66}
m_SizeDelta: {x: 70, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2349501164400224529
@ -67808,7 +67808,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1929561270675379399
RectTransform:
m_ObjectHideFlags: 0
@ -72587,7 +72587,7 @@ ParticleSystem:
--- !u!199 &8716341524120580428
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -73862,9 +73862,9 @@ RectTransform:
m_Father: {fileID: 7593631371174179783}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -245}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2380315871623341868
@ -79879,7 +79879,7 @@ ParticleSystem:
--- !u!199 &2639441541049483881
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -96361,7 +96361,7 @@ ParticleSystem:
--- !u!199 &2284583196761172030
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -102262,7 +102262,7 @@ ParticleSystem:
--- !u!199 &7385679162825966705
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -118489,7 +118489,7 @@ ParticleSystem:
--- !u!199 &5826954379611324170
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -123232,7 +123232,7 @@ ParticleSystem:
--- !u!199 &5498613614584986960
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -30,7 +30,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6217108928360588620}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -110,7 +110,7 @@ RectTransform:
m_Children:
- {fileID: 3132150514659972833}
m_Father: {fileID: 6217108928360588620}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -177,13 +177,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2294155410556675137}
- {fileID: 3453601070238695747}
- {fileID: 1649018574136500327}
- {fileID: 5375860999358363320}
- {fileID: 5211130397965869800}
- {fileID: 8489496452498174145}
m_Father: {fileID: 9076740770643775636}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -448,7 +447,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6217108928360588620}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -529,7 +528,7 @@ RectTransform:
m_Children:
- {fileID: 7809438392867091468}
m_Father: {fileID: 6217108928360588620}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -761,7 +760,7 @@ RectTransform:
m_Children:
- {fileID: 5789570343152581409}
m_Father: {fileID: 9076740770643775636}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -834,6 +833,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2546753596356924735}
- {fileID: 3453601070238695747}
- {fileID: 6217108928360588620}
- {fileID: 3152736529766456598}
m_Father: {fileID: 0}
@ -1073,12 +1073,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
m_Children: []
m_Father: {fileID: 6217108928360588620}
m_Father: {fileID: 9076740770643775636}
m_RootOrder: 1
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: 426, y: 19}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -100, y: 0}
m_SizeDelta: {x: 127, y: 126}
m_Pivot: {x: 0.49999955, y: 0.5}
--- !u!222 &3206577869030083617

View File

@ -81393,9 +81393,9 @@ RectTransform:
m_Father: {fileID: 5633248320576759341}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 164, y: 1738}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 164, y: 795}
m_SizeDelta: {x: 433, y: 197}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8726534544573223009

View File

@ -775,10 +775,10 @@ RectTransform:
m_Father: {fileID: 3396493132143195623}
m_RootOrder: 1
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: -478, y: -29}
m_SizeDelta: {x: 100, y: 100}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -49}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &978093536506197586
MonoBehaviour:
@ -797,8 +797,8 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 20
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0

File diff suppressed because it is too large Load Diff

View File

@ -266,10 +266,10 @@ RectTransform:
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 7
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: 478.34003, y: 672.91}
m_SizeDelta: {x: 88.53, y: 161.83}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -61.659973, y: 672.91}
m_SizeDelta: {x: 88.53003, y: 161.83}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7004274454127098571
CanvasRenderer:
@ -523,7 +523,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -0.000023068309, y: 50}
m_AnchoredPosition: {x: -0.000014496529, y: 50}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &455843809901100221
@ -1005,9 +1005,9 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 10
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: 416.2, y: 633.1}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -123.79999, y: 633.1}
m_SizeDelta: {x: 218, y: 482}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7259500788664693753

View File

@ -958,9 +958,9 @@ RectTransform:
m_Father: {fileID: 1553045991312230259}
m_RootOrder: 3
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: 452, y: 682.2}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -88, y: 682.2}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4545457492515630526
@ -1664,9 +1664,9 @@ RectTransform:
m_Father: {fileID: 1553045991312230259}
m_RootOrder: 11
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: 452, y: 815}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -88, y: 815}
m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5530729419931159675

View File

@ -525,7 +525,7 @@ function this.ResetShopData(shopData, buyType, DataTypeIndex)
local limitNum = 0
for i = 1, #shopData do
if DataTypeIndex == DataType.Shop then
boughtNum = ShopManager.GetShopItemHadBuyTimes(SHOP_TYPE.FINDTREASURE_GIFT, shopData[i].id)
boughtNum = ShopManager.GetShopItemHadBuyTimes(buyType, shopData[i].id)
limitNum = ShopManager.GetShopItemLimitBuyCount(shopData[i].id)
local curSortId = 0--临时一个数值 只用做排序用
if limitNum == -1 then
@ -537,7 +537,7 @@ function this.ResetShopData(shopData, buyType, DataTypeIndex)
elseif DataTypeIndex == DataType.Direct then
--所有直购 进行筛选 类型一致的取出
if rechargeCommodityConfig[shopData[i].goodsId].ShowType == buyType then
boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, shopData[i].goodsId)
boughtNum = OperatingManager.GetGoodsBuyTime(DataTypeIndex, shopData[i].goodsId)
limitNum = rechargeCommodityConfig[ shopData[i].goodsId].Limit
local curSortId = 0--临时一个数值 只用做排序用
if limitNum == -1 then

View File

@ -19,7 +19,7 @@ function ShengYiTianJiang:InitComponent(gameObject)
this.time = Util.GetGameObject(gameObject, "time/times"):GetComponent("Text")
this.buyBtn = Util.GetGameObject(gameObject, "layout/buyBtn")
this.buyBtnText = Util.GetGameObject(this.buyBtn, "Text"):GetComponent("Text")
this.reviewBtn = Util.GetGameObject(gameObject, "layout/reviewBtn")
this.reviewBtn = Util.GetGameObject(gameObject, "reviewBtn")
this.scrollItem = Util.GetGameObject(gameObject, "scroller/grid")
this.proPertyText = Util.GetGameObject(gameObject, "layout/proPertyText"):GetComponent("Text")
this.buytimes = Util.GetGameObject(gameObject, "layout/buytimes"):GetComponent("Text")

View File

@ -70,6 +70,28 @@ function GiftPre:InitComponent()
self.UI_Effect_MianBan_LiBao_button_01 = Util.GetGameObject(self.gameObject, "UI_Effect_MianBan_LiBao_button_01")
self.isCanBuy = 0
self.itemList = {}
self.tipRoot = Util.GetGameObject(self.upLayout,"type3")
self.tip1 = Util.GetGameObject(self.tipRoot,"tip1")
self.tip1_en = Util.GetGameObject(self.tipRoot,"tip1_en")
self.tip2 = Util.GetGameObject(self.tipRoot,"tip2")
self.tip2_en = Util.GetGameObject(self.tipRoot,"tip2_en")
self.tip3 = Util.GetGameObject(self.tipRoot,"tip3")
self.tip3_en = Util.GetGameObject(self.tipRoot,"tip3_en")
self.tip4 = Util.GetGameObject(self.tipRoot,"tip4")
self.tip4_en = Util.GetGameObject(self.tipRoot,"tip4_en")
self.tip5 = Util.GetGameObject(self.tipRoot,"tip5")
self.tip5Text = Util.GetGameObject(self.tip5,"Text"):GetComponent("Text")
self.tipRoot:SetActive(false)
self.tip1:SetActive(false)
self.tip1_en:SetActive(false)
self.tip2:SetActive(false)
self.tip2_en:SetActive(false)
self.tip3:SetActive(false)
self.tip3_en:SetActive(false)
self.tip4:SetActive(false)
self.tip4_en:SetActive(false)
self.tip5:SetActive(false)
end
--绑定事件(用于子类重写)
@ -242,10 +264,48 @@ function GiftPre:SetContent1()
CreatNumberPrefab(tostring(self.data.data.shopItemData.BuyRule[2]),self.numList)
self.type1Text1.text = "累计充值"
self.type1Text3.text = ""..rechargeNum.."/"..self.data.data.shopItemData.BuyRule[2]..Language[11698]--资格进度条
elseif (self.data.DataType == DataType.Direct and self.data.buyType == DirectBuyType.FINDTREASURE_GIFT) or
(self.data.DataType == DataType.Shop and self.data.buyType == SHOP_TYPE.FINDTREASURE_GIFT) then
self.tipRoot:SetActive(true)
self:SetTip()
end
LayoutRebuilder.ForceRebuildLayoutImmediate(self.upLayout.transform)
end
function GiftPre:SetTip()
if self.data.data.shopData.id and self.data.data.shopData.id == 20091 then
if GetCurLanguage() ~= 0 then
self.tip1_en:SetActive(true)
else
self.tip1:SetActive(true)
end
elseif self.data.data.shopData.id and self.data.data.shopData.id == 20092 then
if GetCurLanguage() ~= 0 then
self.tip2_en:SetActive(true)
else
self.tip2:SetActive(true)
end
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4002 then
if GetCurLanguage() ~= 0 then
self.tip3_en:SetActive(true)
else
self.tip3:SetActive(true)
end
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4001 then
if GetCurLanguage() ~= 0 then
self.tip4_en:SetActive(true)
else
self.tip4:SetActive(true)
end
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4003 then
self.tip5:SetActive(true)
self.tip5.text = "轩辕宝境必备特权每天增加2次免费次数6次额外购买次数"
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 7105 then
self.tip5:SetActive(true)
self.tip5.text = "每日可额外增加3次免费的灵兽山招募机会同时灵兽山妖晶招募价格变为8折!"
end
end
function GiftPre:SetIcon(_itemdata)
self.btnBuy.gameObject:SetActive(true)
self.isCanBuy = 0