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

dev_chengFeng
ZhangBiao 2021-12-06 11:02:29 +08:00
commit 1287c8f37c
9 changed files with 230 additions and 37 deletions

View File

@ -1643,7 +1643,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2983500461621442786}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -1869,6 +1869,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 9145873696664381633}
- {fileID: 5262682722140331766}
- {fileID: 6923799934219534671}
- {fileID: 3408234268182438959}
@ -1877,7 +1878,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: 19.9, y: -68.4}
m_AnchoredPosition: {x: 8, y: -63}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4443588587666130144
@ -2716,6 +2717,101 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2416883231275593459
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9145873696664381633}
- component: {fileID: 6975809161197881253}
- component: {fileID: 1853167194406397097}
- component: {fileID: 3800000787991677192}
m_Layer: 5
m_Name: bgdi
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9145873696664381633
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2416883231275593459}
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: 4452344794313098835}
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.5}
m_SizeDelta: {x: 331.49, y: 57}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6975809161197881253
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2416883231275593459}
m_CullTransparentMesh: 0
--- !u!114 &1853167194406397097
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2416883231275593459}
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: 0
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: 7412c205b0cefdd4ba02d1fde9477f23, 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!114 &3800000787991677192
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2416883231275593459}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &2460328104553581812
GameObject:
m_ObjectHideFlags: 0
@ -2746,7 +2842,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2983500461621442786}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -2867,8 +2963,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -128.8}
m_SizeDelta: {x: 512.98, y: 56.54}
m_AnchoredPosition: {x: 0, y: -130}
m_SizeDelta: {x: 558, y: 57}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2389548626043740313
CanvasRenderer:
@ -2892,13 +2988,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
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: 040b2d02b8b551748b95d94345cbcfe6, type: 3}
m_Sprite: {fileID: 21300000, guid: 7412c205b0cefdd4ba02d1fde9477f23, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3301,6 +3397,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4735168201440028755}
- {fileID: 6207375329712784412}
- {fileID: 7304740897528889587}
- {fileID: 886241600124087254}
@ -4660,7 +4757,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4452344794313098835}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -4896,7 +4993,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -1.9, y: -0.000019073}
m_AnchoredPosition: {x: -1.9000015, y: -0.000019073486}
m_SizeDelta: {x: -17.68, y: -7.12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5464326576039262657
@ -5585,7 +5682,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4452344794313098835}
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}
@ -6197,7 +6294,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4452344794313098835}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -6951,10 +7048,10 @@ RectTransform:
m_Father: {fileID: 1479801185272692819}
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: 266.9, y: -30.5}
m_SizeDelta: {x: 488.23, y: 57}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -2.5}
m_SizeDelta: {x: 488.22998, y: 57}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6631467767055298932
CanvasRenderer:
@ -6991,13 +7088,108 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u4ECA\u65E5\u53EC\u5524\u4E0A\u9650\uFF1A1/9999999"
--- !u!1 &7969355687096730333
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4735168201440028755}
- component: {fileID: 1011098397534399124}
- component: {fileID: 5066702561483763659}
- component: {fileID: 6354337889857433791}
m_Layer: 5
m_Name: bgdi
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4735168201440028755
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7969355687096730333}
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: 2983500461621442786}
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.5}
m_SizeDelta: {x: 331.49, y: 57}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1011098397534399124
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7969355687096730333}
m_CullTransparentMesh: 0
--- !u!114 &5066702561483763659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7969355687096730333}
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: 0
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: 7412c205b0cefdd4ba02d1fde9477f23, 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!114 &6354337889857433791
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7969355687096730333}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &8203617755025140673
GameObject:
m_ObjectHideFlags: 0
@ -8287,7 +8479,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2983500461621442786}
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}

View File

@ -481,7 +481,8 @@ PanelType = {
Compound_equip = { 14, 16,1258 }, --装备合成
YuJianXing = {14,16,1010},--御剑行
LingMai = {14,16,1273},--御剑行
tiandihonglu = {16,1287,1289}
tiandihonglu = {16,1287,1289},
fagncunxunbao = {16,1288,1290},
}
@ -604,6 +605,7 @@ SHOP_TYPE = {
XUANJIMIAOSUAN_SHOP = 76,--旋即妙算商店
QIJIE_SHOP = 81,--七界商店
honglushangdian = 87,
fangcunxunbao = 89,
}
PropertyTypeIconDef = {

View File

@ -10106,10 +10106,10 @@ local passivityList = {
local v2=args[4]
local t1=args[5]
local t2=args[6]
local OnBuffStart = function(buff1)
local OnBuffStart = function(buff)
-- BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function ()
local buff={}
buff=buff1
-- buff=buff1
if buff.skill==nil or buff.skill.type~=BattleSkillType.Special then
return
end
@ -10127,16 +10127,11 @@ local passivityList = {
local buffTarget={}
buffTarget=buff.target
if add>0 then
-- local buff = Buff.Create(caster, BuffName.DOT, i1, 1, dot, floor(damage))
-- buff.skill=skill
-- buff.isRealDamage = true
local newBuff={}
newBuff=buff
newBuff.skill=nil
newBuff.caster=role
for i = 1, add do
buffTarget:AddBuff(newBuff)
local newBuff = Buff.Create(buff.caster, BuffName.DOT, buff.duration, 1,1,buff.damagePro)
newBuff.skill=nil
newBuff.isRealDamage=true
buff.target:AddBuff(newBuff)
end
end
--end)

View File

@ -16,7 +16,6 @@ function DOT:SetData(...)
-- self.cover = false
-- self.layer = nil
--end
-- 刷新排序等级
self.sort = 2
-- if self.damageType == 3 then -- 流血buff在行动之后刷新

View File

@ -216,7 +216,7 @@ function BuffCtrl:AddBuffIcon(buff, icon)
end
--持续伤害类型,伤害系数
elseif buffType==BuffName.DOT then
if self.BuffIconList[key].buffDamageType==currBuff.damageType and self.BuffIconList[key].buffDamageFactor==currBuff.damageFactor then
if self.BuffIconList[key].buffDamageType==currBuff.damageType and self.BuffIconList[key].buffDamageFactor==currBuff.damagePro then
self.BuffIconList[key]:SetCount(self.BuffIconList[key].count+1)
return
end
@ -291,7 +291,7 @@ function BuffCtrl:RemoveBuffIcon(buff)
end
--持续伤害类型,伤害系数
elseif buffType == BuffName.DOT then
if self.BuffIconList[key].buffDamageType==buff.damageType and self.BuffIconList[key].buffDamageFactor==buff.damageFactor then
if self.BuffIconList[key].buffDamageType==buff.damageType and self.BuffIconList[key].buffDamageFactor==buff.damagePro then
if floor==1 then
self.BuffIconList[key]:Dispose()
self.BuffIconList[key] = nil

View File

@ -11,7 +11,7 @@ function BuffView.New(go, buff, icon)
instance.buffValue = buff.Value
instance.buffCt = buff.changeType
instance.buffDamageType = buff.damageType
instance.buffDamageFactor = buff.damageFactor
instance.buffDamageFactor = buff.damagePro
instance.buffCtrlType = buff.ctrlType
instance.healValue = buff.healValue
instance.immuneType = buff.immuneType

View File

@ -162,6 +162,8 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
isLimitUpHero = false
if lotterySetting[this.recruitType] and lotterySetting[this.recruitType].LotteryType == 13 then
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.tiandihonglu })
elseif lotterySetting[this.recruitType] and lotterySetting[this.recruitType].LotteryType == 14 then
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.fagncunxunbao })
else
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })
end

View File

@ -148,6 +148,9 @@ function IncarnationLottery:contentShow()
self.icons[i].num.text = data[i].Reward[2]
self.reward[str1] = i
self.rewardWeight[str1] = data[i].WeightShow
Util.AddOnceClick(self.icons[i].kuang,function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,data[i].Reward[1])
end)
end
end
@ -204,10 +207,10 @@ function IncarnationLottery:refreshBtnShow()
local type = 0
if n == 1 then
type = self.singleRecruit.Id
m.info.text = "1次"
--m.info.text = "1次"
else
type = self.tenRecruit.Id
m.info.text = "10次"
--m.info.text = "10次"
end
local d = {}
if (isFree) then

View File

@ -162,7 +162,7 @@ function ShopViewNew:OnShow(_sortingOrder)
end
self.ShopType = self.actConfig.ShopData[1][1]
LogYellow("self.ShopType:"..tostring(self.ShopType))
if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP or self.ShopType == SHOP_TYPE.honglushangdian then
if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP or self.ShopType == SHOP_TYPE.honglushangdian or self.ShopType == SHOP_TYPE.fangcunxunbao then
self.parent.tabbox.gameObject:SetActive(false)
else
self.parent.tabbox.gameObject:SetActive(true)