From 8d6c2d3adfc433e8349946df606e045049c3bd94 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 28 Aug 2020 14:06:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E5=AE=9D=E7=89=A9=E3=80=91?= =?UTF-8?q?=E9=87=91=E5=B8=81=E4=B8=8D=E8=B6=B3=EF=BC=8C=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E5=90=88=E6=88=90=E6=B2=A1=E6=9C=89=E5=90=88=E7=90=86=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Compound/view/CompoundPanel_Treasure.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index 0e671f68db..61aabc78d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -227,6 +227,7 @@ end --一种装备一种装备的循环检测 金币能合成的数量 与 背包装备能合成的数量 取最小值 然后扣除临时消耗道具 --最后所有装备存在curPosEquips 与 之前背包 bagPosEquips 作比较 看合成了什么装备 删除了什么装备 和计算消耗材料 function this.AutoCompound(_position) + local goldIsEnough = true --表数据 local curPosEquips = EquipTreasureManager.GetAllTabletTreasuresByRaceAndType(_position)--,curSelectEquip.equipType) --实际数据 @@ -304,6 +305,8 @@ function this.AutoCompound(_position) --LogGreen("合成curPosEquipsData[equipData.equipType][equipData.quantity]之后:"..curPosEquipsData[equipData.equipType][equipData.quantity]) end end + else + goldIsEnough = false end end local origiData = EquipTreasureManager.GeEquipTreasureDatas(_position) @@ -313,12 +316,16 @@ function this.AutoCompound(_position) --LogGreen("m:"..m.." origiData[i][n]:"..origiData[i][n]) if m > origiData[i][n] then local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelConfig,"Location",i,"Level",n,"Race",_position) + local num = m - origiData[i][n] --LogGreen("config.id:"..config.Id.." num:"..m - origiData[i][n]) - table.insert(endReward,{config.Id,m - origiData[i][n]}) + table.insert(endReward,{config.Id,num}) end end end - if LengthOfTable(endReward) < 1 then + if not goldIsEnough and LengthOfTable(endReward) < 1 then + PopupTipPanel.ShowTip("金币不足,无法合成") + return + elseif LengthOfTable(endReward) < 1 then PopupTipPanel.ShowTip(Language[12258]) return end From ad2ec008812fa613b27f28882f4e1714c525d87f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 15:29:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=88=90=E9=95=BF=E5=9F=BA=E9=87=91?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E9=9A=90=E5=8A=A0=E5=85=A5=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 2 +- .../~Lua/Modules/Operating/OperatingManager.lua | 2 ++ .../~Lua/Modules/Operating/OperatingPanel.lua | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 8aff68d615..8ce9ebb398 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -44,7 +44,7 @@ function this.LoginRequest(openId, func) data.distinct_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDistinctId() or "" data.openId = openId data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid - data.platform_s = AppConst.isSDK and "ADR" or "PC" + data.platform_s = AppConst.Platform --and "ADR" or "PC" local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.LOGIN_REQUEST, MessageTypeProto_pb.LOGIN_RESPONSE, msg, function(buffer) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 13d7d84879..cf3fed272f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -201,6 +201,8 @@ end function this.GetGrowthRedPointState() local redPoint = false + local hasGift = OperatingManager.HasGoodsByShowType(4) + if not hasGift then return false end local giftGoodsInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward) if giftGoodsInfo then return false end local openId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index c0d584e4a0..d878fe0cc1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -215,12 +215,15 @@ function OperatingPanel:RefreshTabStatus() --判断成长基金活动是否开启或结束(16是最后一档活动ActivityId) local t2 = false local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) - local singleRewardData if GrowthRewardId then--是否开启 t2 = true end - if GrowthRewardId == 16 then--是否结束 - singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324) + local hasGift = OperatingManager.HasGoodsByShowType(4) + if t2 and not hasGift then + t2 = false + end + if t2 and GrowthRewardId == 16 then--是否结束 + local singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324) if not singleRewardData then t2 = false else From dd1493ee90913e9cb7c75d7c585662a3084e6d99 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 29 Aug 2020 15:14:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E7=A2=8E=E7=89=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E3=80=91=E7=A1=AE=E8=AE=A4=E8=B4=AD=E4=B9=B0=E5=92=8C?= =?UTF-8?q?=E7=A2=8E=E7=89=87=E5=90=88=E6=88=90=E6=97=B6=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=A2=8E=E7=89=87=E9=81=93=E5=85=B7=E7=9A=84?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=92=8C=E7=A2=8E=E7=89=87=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 8 ++++---- .../~Lua/Modules/Shop/ShopBuyPopup.lua | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 7fbe74f3d4..fd073fd8d3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -5081,9 +5081,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316.40005, y: -73.150055} + m_AnchoredPosition: {x: 0.000057485686, y: -73.150055} m_SizeDelta: {x: 0, y: 151} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &5729675956691850897 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19668,9 +19668,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316.40002, y: -73.150055} + m_AnchoredPosition: {x: 0.000028742843, y: -73.150055} m_SizeDelta: {x: 0, y: 151} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &4796361513380277662 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua index 0c4c5b56e1..eb0d893dcb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua @@ -94,6 +94,7 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId) this.shopType = shopType this.shopItemId = shopItemId this.shopItemInfo = ShopManager.GetShopItemInfo(shopItemId) + LogGreen(shopItemId..":shopItemId") this.shopItemData = ShopManager.GetShopItemData(shopType, shopItemId) -- 商品基础信息显示 @@ -104,7 +105,14 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) this.itemContent.text = string.gsub(itemConfig[goodsId].ItemDescribe, "\\n", "\n") this.itemIcon.sprite = SetIcon(goodsId) - this.itemBg.sprite = SetFrame(goodsId) + if itemConfig[this.shopItemInfo.Goods[1][1]].ItemType == 2 then + this.itemBg.sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[this.shopItemInfo.Goods[1][1]].Quantity)) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(true) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):GetComponent("Image").sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(itemConfig[this.shopItemInfo.Goods[1][1]].PropertyName)) + else + this.itemBg.sprite = SetFrame(goodsId) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(false) + end this.itemNum.text = this.goods[1][2] -- 计算最大可购买的数量 local countLimitNum = ShopManager.GetShopItemLimitBuyCount(shopItemId) From 638022dbadf8d02ef881587ec8992850e6623f31 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 29 Aug 2020 15:17:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E4=BA=94=E6=98=9F=E6=88=90?= =?UTF-8?q?=E9=95=BF=E7=A4=BC=E3=80=91=E6=8B=8D=E8=84=B8=E5=9B=BE=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E2=80=9C=E6=88=98=E2=80=9D=E5=AD=97=E6=9C=89=E9=98=B4?= =?UTF-8?q?=E5=BD=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UpGradePackage/UpGradePackagePanel.prefab | 74 ------------------- 1 file changed, 74 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab index 378323cbc3..e8ca05f7a3 100644 --- a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab @@ -43979,80 +43979,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6406938328886149404 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3122847029739947333} - - component: {fileID: 9172115513959909474} - - component: {fileID: 6269553500272781496} - m_Layer: 0 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3122847029739947333 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6406938328886149404} - 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: 2931217454655974565} - 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} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9172115513959909474 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6406938328886149404} - m_CullTransparentMesh: 0 ---- !u!114 &6269553500272781496 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6406938328886149404} - 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: 0, g: 0, b: 0, a: 0.8} - 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 &6801484805305654314 GameObject: m_ObjectHideFlags: 0 From b35000e14fec92cb876e9306b6e29f661a7587ae Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 15:36:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dupdatepanel=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab index 4cc8b066bd..c9702840b3 100644 --- a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab +++ b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab @@ -2185,7 +2185,7 @@ 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: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0