From f834e2e17d3acb8e7d182af38821e40317e281b6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 30 Jun 2021 10:12:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1009590=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E4=BF=A1=E6=81=AF=E3=80=91=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E8=8E=B7=E5=8F=96=E9=80=94=E5=BE=84=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/JumpView/JumpViewNew.prefab | 10 +- .../UI/Popup/RewardItemSingleShowPopup.prefab | 178 ++++++++++++++++++ .../Popup/RewardItemSingleShowPopup.lua | 15 +- .../~Lua/View/JumpViewNew.lua | 29 ++- 4 files changed, 220 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/JumpView/JumpViewNew.prefab b/Assets/ManagedResources/Prefabs/UI/JumpView/JumpViewNew.prefab index 10e384400d..23d698ddf4 100644 --- a/Assets/ManagedResources/Prefabs/UI/JumpView/JumpViewNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JumpView/JumpViewNew.prefab @@ -404,8 +404,8 @@ 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 40 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 m_MinSize: 3 @@ -485,7 +485,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 35 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -530,7 +530,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 87.4, y: 88.8} + m_SizeDelta: {x: 48, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3232585226682570758 GameObject: @@ -588,7 +588,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 3 - m_Spacing: 0 + m_Spacing: 20 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index 6e3aab0e49..5ea687a3e1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -1187,6 +1187,102 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &2597576072556741130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3758923872283339064} + - component: {fileID: 7415649165955874725} + - component: {fileID: 900494711695977845} + - component: {fileID: 9218462581357101871} + m_Layer: 5 + m_Name: armorDesc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3758923872283339064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2597576072556741130} + 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: 8184831178004648247} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7415649165955874725 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2597576072556741130} + m_CullTransparentMesh: 0 +--- !u!114 &900494711695977845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2597576072556741130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8000001, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: + LanguageIndex: 0 +--- !u!114 &9218462581357101871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2597576072556741130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 1, g: 0.18115139, b: 0.023584902, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3424855928141266984 GameObject: m_ObjectHideFlags: 0 @@ -1703,6 +1799,86 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &4439645633199583344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1709640756964467835} + - component: {fileID: 573021905495986909} + - component: {fileID: 5481502169182312107} + m_Layer: 5 + m_Name: armorTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1709640756964467835 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4439645633199583344} + 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: 8184831178004648247} + 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: 0, y: 0} + m_SizeDelta: {x: 160, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &573021905495986909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4439645633199583344} + m_CullTransparentMesh: 0 +--- !u!114 &5481502169182312107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4439645633199583344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8000001, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: + LanguageIndex: 0 --- !u!1 &5528526065496566687 GameObject: m_ObjectHideFlags: 0 @@ -2168,6 +2344,8 @@ RectTransform: m_Children: - {fileID: 2381061194019258018} - {fileID: 8509208401530327142} + - {fileID: 1709640756964467835} + - {fileID: 3758923872283339064} m_Father: {fileID: 8883771383315985959} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index b051f8e6bd..25a04e886f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -26,6 +26,9 @@ function RewardItemSingleShowPopup:InitComponent() this.posText = Util.GetGameObject(this.pos, "PosText"):GetComponent("Text") this.armorType = Util.GetGameObject(self.transform, "bgPanel/armor/info/armorType"):GetComponent("Text") this.armorLanTuNum = Util.GetGameObject(self.transform, "armor/info/armorLanTuNum"):GetComponent("Text") + + this.armorTitle = Util.GetGameObject(self.transform, "bgPanel/armor/info/armorTitle"):GetComponent("Text") + this.armorDesc = Util.GetGameObject(self.transform, "armor/info/armorDesc"):GetComponent("Text") this.equipQuaText = Util.GetGameObject(self.transform, "bgPanel/armor/equipQuaText"):GetComponent("Text") this.armorInfo = Util.GetGameObject(self.transform, "bgPanel/armorInfo") this.armorInfoText = Util.GetGameObject(self.transform, "bgPanel/armorInfo/text"):GetComponent("Text") @@ -309,8 +312,12 @@ function RewardItemSingleShowPopup:OnShow() this.equipQuaText.gameObject:SetActive(false) this.pos.gameObject:SetActive(true) this.armorInfo.gameObject:SetActive(false) - this.armorType.text = string.format("%s",itemConfigData.Name) - this.armorLanTuNum.text = string.format("%s",heroConfig.HeroLocationDesc4) + this.armorTitle.gameObject:SetActive(true) + this.armorDesc.gameObject:SetActive(true) + this.armorTitle.text = string.format("%s",itemConfigData.Name) + this.armorDesc.text = string.format("%s",heroConfig.HeroLocationDesc4) + this.armorType.gameObject:SetActive(false) + this.armorLanTuNum.gameObject:SetActive(false) this.posIcon.sprite =this.spLoader:LoadSprite(GetHeroPosStr(heroConfig.Profession)) this.posText.text=GetLanguageStrById(heroConfig.HeroLocation) SetTextVerTial(this.posText.gameObject,Vector3.New(64,21,0),"MiddleLeft") @@ -331,6 +338,10 @@ function RewardItemSingleShowPopup:OnShow() this.equipQuaText.text = GetStringByEquipQua(itemConfigData.Quantity, GetQuaStringByEquipQua(itemConfigData.Quantity)) this.pos.gameObject:SetActive(false) this.armorInfo.gameObject:SetActive(true) + this.armorTitle.gameObject:SetActive(false) + this.armorDesc.gameObject:SetActive(false) + this.armorType.gameObject:SetActive(true) + this.armorLanTuNum.gameObject:SetActive(true) this.armorType.text = this.getType()--道具类型显示 this.armorLanTuNum.text = Language[11516] .. BagManager.GetItemCountById(itemSid) this.armorInfoText.text = string.gsub(GetLanguageStrById(itemConfigData.ItemDescribe), "\\n", "") diff --git a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua index 3c0b335b17..b4693e6df8 100644 --- a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua @@ -64,9 +64,7 @@ function JumpViewNew:OnOpen(jumpId,heroConfig,parent) self.costIconPos.gameObject:SetActive(false) self.desc.text = "设为心愿神将会有更高概率" elseif self.jumpSData.Type == JumpType.ElementDrawCard then - self.costIconPos.gameObject:SetActive(false) - self.desc.text = "抽取时额外赠送元神玉" - elseif self.jumpSData.Type == JumpType.ElementDrawCard then + self.info.text = GetLanguageStrById(self.jumpSData.Title).."·"..HeroElementDef[heroConfig.PropertyName] self.costIconPos.gameObject:SetActive(false) self.desc.text = "抽取时额外赠送元神玉" elseif self.jumpSData.Type == JumpType.ZhuTiHuoDong then @@ -92,10 +90,31 @@ function JumpViewNew:OnOpen(jumpId,heroConfig,parent) end local needCostNum = math.ceil(self.needChipNum/getChipNum)*costItemNum self.desc.text = ItemConfig[costItemId].Name..":"..BagManager.GetItemCountById(costItemId).."/"..needCostNum - self.itemView:OnOpen(false, {costItemId,needCostNum}, 0.6, false, false, false, self.parent.sortingOrder) + self.itemView:OnOpen(false, {costItemId,needCostNum}, 0.4, false, false, false, self.parent.sortingOrder) + elseif self.jumpSData.Type == JumpType.XingChenShangDian then + LogGreen("self.jumpSData.Skipfactor[1]:"..self.jumpSData.Skipfactor[1]) + local storeTypeConfig = ConfigManager.GetConfigDataByKey(ConfigName.StoreTypeConfig,"StoreType",70) + local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.StoreConfig,"StoreId",storeTypeConfig.Id) + local getChipNum = 1 + local costItemId = 0 + local costItemNum = 0 + for i = 1,#configs do + LogGreen("self.needChipId:"..self.needChipId.." configs[i].Goods[1][1]:"..configs[i].Goods[1][1]) + if self.needChipId == configs[i].Goods[1][1] then + getChipNum = configs[i].Goods[1][2] + costItemId = configs[i].Cost[1][1] + local a,b,c,d = configs[i].Cost[2][1],configs[i].Cost[2][2],configs[i].Cost[2][3],configs[i].Cost[2][4] + local x = 1 + costItemNum = a*x^3+b*x^2+c*x+d + break + end + end + local needCostNum = math.ceil(self.needChipNum/getChipNum)*costItemNum + self.desc.text = ItemConfig[costItemId].Name..":"..BagManager.GetItemCountById(costItemId).."/"..needCostNum + self.itemView:OnOpen(false, {costItemId,needCostNum}, 0.4, false, false, false, self.parent.sortingOrder) elseif self.jumpSData.Type == 30003 then self.btnSureText.text = "合成" - self.itemView:OnOpen(false, {self.needChipId,self.needChipNum}, 0.6, false, false, false, self.parent.sortingOrder) + self.itemView:OnOpen(false, {self.needChipId,self.needChipNum}, 0.4, false, false, false, self.parent.sortingOrder) self.desc.text = ItemConfig[self.needChipId].Name..":"..BagManager.GetItemCountById(self.needChipId).."/"..self.needChipNum end end