【命石】一键合成修改

dev_chengFeng
ZhangBiao 2021-12-23 16:17:35 +08:00
parent c895652ef1
commit 926e0a4fbd
8 changed files with 265 additions and 8 deletions

View File

@ -4849,6 +4849,7 @@ GameObject:
- component: {fileID: 4108176206694323356}
- component: {fileID: 7856299532692921519}
- component: {fileID: 4135426335638540336}
- component: {fileID: 7779656916480398504}
m_Layer: 5
m_Name: Stones
m_TagString: Untagged
@ -4910,6 +4911,35 @@ MonoBehaviour:
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 1
--- !u!114 &7779656916480398504
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3410947377148270787}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
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: 0}
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!1 &3416270479864502772
GameObject:
m_ObjectHideFlags: 0

View File

@ -32971,6 +32971,7 @@ GameObject:
m_Component:
- component: {fileID: 5664425003762969402}
- component: {fileID: 2611804464083557781}
- component: {fileID: 530424036636603182}
m_Layer: 5
m_Name: GeneralBigPopup_SelectGem
m_TagString: Untagged
@ -33009,6 +33010,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7276085945121101807}
m_CullTransparentMesh: 0
--- !u!114 &530424036636603182
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7276085945121101807}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
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: 0}
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!1 &7286381959021743739
GameObject:
m_ObjectHideFlags: 0
@ -36651,6 +36681,7 @@ GameObject:
m_Component:
- component: {fileID: 78969896755961002}
- component: {fileID: 5290742308480372247}
- component: {fileID: 106850451998954397}
m_Layer: 5
m_Name: GeneralBigPopup_GemCompound
m_TagString: Untagged
@ -36692,6 +36723,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510512026465178018}
m_CullTransparentMesh: 0
--- !u!114 &106850451998954397
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510512026465178018}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
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: 0}
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!1 &8520562720478604777
GameObject:
m_ObjectHideFlags: 0

View File

@ -2730,6 +2730,7 @@ RectTransform:
m_Children:
- {fileID: 5097359631411551219}
- {fileID: 1926333495800632184}
- {fileID: 7772586108384234085}
m_Father: {fileID: 4320698806848380767}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3318,3 +3319,78 @@ MonoBehaviour:
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1001 &5473152916591848272
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 9127752138271226266}
m_Modifications:
- target: {fileID: 800187307388672636, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_Name
value: fx_zhuangbeijiemian
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6e21988006c4b0942b32c75e6b6987ba, type: 3}
--- !u!4 &7772586108384234085 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
type: 3}
m_PrefabInstance: {fileID: 5473152916591848272}
m_PrefabAsset: {fileID: 0}

View File

@ -15347,6 +15347,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 12
resAbNameIndex: 6
- resName: r_zhandou_zhenwang_zh
extension: .png
resPathIndex: 12
resAbNameIndex: 6
- resName: r_jingjichang_jingcaitiao_03
extension: .png
resPathIndex: 13
@ -16299,6 +16303,30 @@ MonoBehaviour:
extension: .png
resPathIndex: 27
resAbNameIndex: 13
- resName: c_czfl_30yuan
extension: .png
resPathIndex: 27
resAbNameIndex: 13
- resName: c_czfl_30yuan2
extension: .png
resPathIndex: 27
resAbNameIndex: 13
- resName: c_czfl_6yuan
extension: .png
resPathIndex: 27
resAbNameIndex: 13
- resName: c_czfl_6yuan2
extension: .png
resPathIndex: 27
resAbNameIndex: 13
- resName: c_czfl_diban
extension: .png
resPathIndex: 27
resAbNameIndex: 13
- resName: c_czfl_tubiao
extension: .png
resPathIndex: 27
resAbNameIndex: 13
- resName: c_cjjs_baitou_01
extension: .png
resPathIndex: 28
@ -17075,6 +17103,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 60
resAbNameIndex: 30
- resName: g_guanka_tishikuang
extension: .png
resPathIndex: 60
resAbNameIndex: 30
- resName: r_guanka_daojishi_01
extension: .png
resPathIndex: 60
@ -17135,6 +17167,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 60
resAbNameIndex: 30
- resName: g_guanka_lijiqianwang_zh
extension: .png
resPathIndex: 61
resAbNameIndex: 30
- resName: r_guanka_guajijiachenganniu_zh
extension: .png
resPathIndex: 61
@ -17151,6 +17187,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 61
resAbNameIndex: 30
- resName: r_guanka_zinrenshangcheng_zh
extension: .png
resPathIndex: 61
resAbNameIndex: 30
- resName: x_xb_quan_01_zh
extension: .png
resPathIndex: 61
@ -19795,6 +19835,18 @@ MonoBehaviour:
extension: .png
resPathIndex: 89
resAbNameIndex: 46
- resName: d_txws_biaoti
extension: .png
resPathIndex: 90
resAbNameIndex: 46
- resName: d_txws_bj
extension: .png
resPathIndex: 90
resAbNameIndex: 46
- resName: d_txws_xsjj
extension: .png
resPathIndex: 90
resAbNameIndex: 46
- resName: jinjishilian
extension: .png
resPathIndex: 90
@ -25779,6 +25831,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 153
resAbNameIndex: 78
- resName: y_haohuayueka
extension: .png
resPathIndex: 153
resAbNameIndex: 78
- resName: y_yjj_128yjj001_zh
extension: .png
resPathIndex: 153
@ -26299,6 +26355,18 @@ MonoBehaviour:
extension: .png
resPathIndex: 170
resAbNameIndex: 85
- resName: t_tehuishangcheng_diban
extension: .png
resPathIndex: 170
resAbNameIndex: 85
- resName: t_tehuishangcheng_juanzhou
extension: .png
resPathIndex: 170
resAbNameIndex: 85
- resName: t_tehuishangcheng_mwlb
extension: .png
resPathIndex: 170
resAbNameIndex: 85
- resName: t_tequan_henlan02
extension: .png
resPathIndex: 170
@ -26335,6 +26403,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 170
resAbNameIndex: 85
- resName: t_tequan_vip13
extension: .png
resPathIndex: 170
resAbNameIndex: 85
- resName: t_tequan_vip14
extension: .png
resPathIndex: 170
resAbNameIndex: 85
- resName: t_tequan_vip2
extension: .png
resPathIndex: 170
@ -58899,6 +58975,10 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 699
resAbNameIndex: 3151
- resName: JingjishiLianPatface
extension: .prefab
resPathIndex: 699
resAbNameIndex: 3151
- resName: FindFairyPanel
extension: .prefab
resPathIndex: 700
@ -78273,7 +78353,6 @@ MonoBehaviour:
- lz4/publicartres/models.unity3d
- assetBundleName: lz4/prefabs/ui/fight.unity3d
dependences:
- lz4/atlas/activityaltas.unity3d
- lz4/atlas/fightatlas.unity3d
- lz4/atlas/fightlevelatlas.unity3d
- lz4/atlas/popupatlas.unity3d
@ -78346,6 +78425,8 @@ MonoBehaviour:
- lz4/bg/s_shanhe_ditu.unity3d
- lz4/bg/s_shanhe_xiaoditu_beijing.unity3d
- lz4/bg/s_shanhe_xiaoditu_zhezhao.unity3d
- lz4/bg/ui/findfairy/d_dhxx_biaoti_02.unity3d
- lz4/bg/ui/findfairy/d_dhxx_pailiandi.unity3d
- lz4/dynamicatlas/card/t_biandui_hong.unity3d
- lz4/dynamicatlas/card/t_chengyuankuang_kuang.unity3d
- lz4/dynamicatlas/card/t_zhandoukuang_hong01.unity3d
@ -79406,7 +79487,6 @@ MonoBehaviour:
- lz4/bg/r_daren_dabei.unity3d
- lz4/bg/r_lianxuchongzhi_beijing.unity3d
- lz4/bg/s_qihun_bg.unity3d
- lz4/bg/ui/vip/r_tequan_juan_mian.unity3d
- lz4/dynamicatlas/artfont/c_czlb_banner2.unity3d
- lz4/dynamicatlas/artfont/r_daren_dianjing_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/l_mrlb_mrl_zh.unity3d
@ -79919,7 +79999,6 @@ MonoBehaviour:
- lz4/dynamicatlas/l_mrlb_time.unity3d
- lz4/dynamicatlas/r_tequan_muhengshang.unity3d
- lz4/fonts/fzjinls.unity3d
- lz4/fonts/kaiu.unity3d
- lz4/fonts/vipfont.unity3d
- lz4/icons.unity3d
- lz4/publicartres/animations.unity3d

View File

@ -2,6 +2,7 @@ GemManager = {}
local this = GemManager
local gemConfig = ConfigManager.GetConfig(ConfigName.GemConfig)
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
function this.Initialize()
this.myGemList = {}--我穿戴命石的id
this.typeGemList = {}
@ -119,10 +120,11 @@ function this.OneKeyConpound()
local curMoney = BagManager.GetTotalItemNum(14)--当前金币数量
--1-8的外部循环
for i = 1, #configMap do
-- LogError("循环"..i.."================================================================")
local money = this.DoCircle1(finalList,configMap[i],curMoney)
curMoney = curMoney - money
totalMoney = totalMoney + money
curMoney = curMoney - totalMoney
-- LogGreen("money:"..tostring(totalMoney))
-- LogWarn("totalMoney:"..tostring(totalMoney).." leftMongey:"..tostring(curMoney))
end
local tempList = {}
for key, value in pairs(finalList) do--存在数据为0的情况剔除
@ -139,7 +141,7 @@ function this.DoCircle1(finalList,data,money)
local lastGNum = 0--上一次合成出来的数量
for i = 1, #data do
local tempData = data[i]
-- LogPink("Id:"..tostring(tempData.Id).." lastGNum:"..tostring(lastGNum))
-- LogPink("Id:"..tostring(tempData.Id).." 名字:"..tostring(ItemConfig[tempData.Id].Name).." lastGNum:"..tostring(lastGNum))
--判断是否满级
if not tempData.NextGem or tempData.NextGem == 0 then
if lastGNum > 0 then
@ -191,7 +193,7 @@ function this.DoCircle1(finalList,data,money)
end
end
lastGNum = curGemNum/tempData.UpgradeNum
-- LogGreen("lastGNum:"..tostring(lastGNum))
-- Log("lastGNum:"..tostring(lastGNum))
end
end
end

View File

@ -415,13 +415,14 @@ function this.GetBianshenka()
end)
end
-- 一键命石
function this.GetGem()
local ic = ConfigManager.GetConfig(ConfigName.ItemConfig)
local i = 0
coroutine.start(function()
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.ItemConfig)) do
if ItemType.Gem == configInfo.ItemType then
NetManager.GMEvent("1#"..configInfo.Id.."#5")
NetManager.GMEvent("1#"..configInfo.Id.."#20")
coroutine.wait(0.01)
end
end

View File

@ -21,6 +21,7 @@ function RewardGemSingleShowPopup:InitComponent()
this.itemView = SubUIManager.Open(SubUIConfig.ItemView,this.itemPos.transform)
this.armorType = Util.GetGameObject(self.transform, "bg/topBar/armor/info/armorType"):GetComponent("Text")
this.armorLanTuNum = Util.GetGameObject(self.transform, "bg/topBar/armor/info/armorLanTuNum"):GetComponent("Text")
this.effectbaijin = Util.GetGameObject(self.topBar, "fx_zhuangbeijiemian")
this.info = Util.GetGameObject(self.transform, "bg/topBar/armor/info")
this.itemName = Util.GetGameObject(this.info, "name"):GetComponent("Text")
@ -63,6 +64,7 @@ function RewardGemSingleShowPopup:BindEvent()
end)
Util.AddClick(this.btnUse, function()--使用跳转
JumpManager.GoJump(40056)
self:ClosePanel()
end)
Util.AddClick(this.btnClose, function()--替换,穿戴
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.SelectGem,this.gemType,this.position,function ()
@ -184,6 +186,8 @@ function RewardGemSingleShowPopup:OnShow()
this.armorLanTuNum.gameObject:SetActive(this.openType ~= 2)
this.armorType.text = this.getType()--道具类型显示
this.armorInfoText.text = string.gsub(GetLanguageStrById(itemConfigData.ItemDescribe), "\\n", "")
this.effectbaijin:SetActive(itemConfigData.Quantity1==7)
Util.SetParticleSortLayer(this.effectbaijin,self.sortingOrder + 1)
local jumpDataList = itemConfigData.Jump
local jumpSortData = creatJumpData(jumpDataList)
for i = 1, #jumpSortData do

View File

@ -398,6 +398,11 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, _itemData.backData.itemId, nil)
end)
elseif _itemData.ItemType == ItemType.Gem then
if effectLayer > 0 and _itemData.configData.Quantity1 then
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6)
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7)
end
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
end)