From ce3c7eab80948971c07c4e97dd53a14c4d71c8a8 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 23 Dec 2022 12:06:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E9=99=86=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Login/LoginPanel.prefab | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index 432838574a..721ecb1bce 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -186,7 +186,10 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: + m_Text: "ISBN\uFF1A978-7-498-08833-8 \u8F6F\u8457\u767B\u8BB0\u53F7\uFF1A2020SR0806186 + \u5BA1\u6279\u6587\u53F7\uFF1A\u56FD\u65B0\u51FA\u5BA1\u30102021\u3011424\u53F7\n\u6765\u6587\u6587\u53F7\uFF1A\u4EAC\u65B0\u51FA\u6587\u30102020\u3011241\u53F7 + \u8457\u4F5C\u6743\u4EBA\uFF1A\u5317\u4EAC\u84DD\u9CB8\u65F6\u4EE3\u79D1\u6280\u6709\u9650\u516C\u53F8\n\u51FA\u7248\u5355\u4F4D\uFF1A\u5317\u4EAC\u51A0\u6E38\u65F6\u7A7A\u6570\u7801\u6280\u672F\u6709\u9650\u516C\u53F8 + \u8FD0\u8425\u5355\u4F4D\uFF1A\u5317\u4EAC\u84DD\u9CB8\u65F6\u4EE3\u79D1\u6280\u6709\u9650\u516C\u53F8" --- !u!1 &2126607396 GameObject: m_ObjectHideFlags: 0 @@ -222,7 +225,7 @@ RectTransform: 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: 0, y: 141} + m_AnchoredPosition: {x: 0, y: 152.70001} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2126607399 @@ -265,8 +268,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u62B5\u5236\u4E0D\u826F\u6E38\u620F\uFF0C\u62D2\u7EDD\u76D7\u7248\u6E38\u620F\u3002\u6CE8\u610F\u81EA\u6211\u4FDD\u62A4\uFF0C\u8C28\u9632\u53D7\u9A97\u4E0A\u5F53\u3002\n\u9002\u5EA6\u6E38\u620F\u76CA\u8111\uFF0C\u6C89\u8FF7\u6E38\u620F\u4F24\u8EAB\u3002\u5408\u7406\u5B89\u6392\u65F6\u95F4\uFF0C\u4EAB\u53D7\u5065\u5EB7\u751F\u6D3B\u3002\n\u672C\u6E38\u620F\u9002\u5408\u5E74\u6EE118\u5468\u5C81\u4EE5\u4E0A\u7684\u7528\u6237\u4F7F\u7528\uFF0C\u4E3A\u4E86\u60A8\u7684\u5065\u5EB7\uFF0C\u8BF7\u5408\u7406\u63A7\u5236\u6E38\u620F\u65F6\u95F4\u3002" + m_LineSpacing: 0.9 + m_Text: "\u62B5\u5236\u4E0D\u826F\u6E38\u620F\uFF0C\u62D2\u7EDD\u76D7\u7248\u6E38\u620F\u3002\u6CE8\u610F\u81EA\u6211\u4FDD\u62A4\uFF0C\u8C28\u9632\u53D7\u9A97\u4E0A\u5F53\u3002\n\u9002\u5EA6\u6E38\u620F\u76CA\u8111\uFF0C\u6C89\u8FF7\u6E38\u620F\u4F24\u8EAB\u3002\u5408\u7406\u5B89\u6392\u65F6\u95F4\uFF0C\u4EAB\u53D7\u5065\u5EB7\u751F\u6D3B\u3002\n\u672C\u7F51\u7EDC\u6E38\u620F\u9002\u5408\u5E74\u6EE116\u5468\u5C81\u4EE5\u4E0A\u7684\u7528\u6237\u4F7F\u7528\uFF0C\u6839\u636E\u56FD\u5BB6\u65B0\u95FB\u51FA\u7248\u7F72\u8981\u6C42\uFF0C\n\u5FC5\u987B\u4F7F\u7528\u6709\u6548\u8EAB\u4EFD\u8BC1\u8FDB\u884C\u6CE8\u518C\uFF0C\u5E76\u63A5\u53D7\u9632\u6C89\u8FF7\u529F\u80FD\u9650\u5236" --- !u!1 &366038928903595888 GameObject: m_ObjectHideFlags: 0 @@ -301,7 +304,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: 0, y: -797} + m_AnchoredPosition: {x: 0, y: -773.3} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &543350825205658828 @@ -1418,7 +1421,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: 0, y: -734} + m_AnchoredPosition: {x: 0, y: -710.3} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2913722661133017400 From 2429aa88fc9f5c224af3a6668b9e118baeadaeee Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 23 Dec 2022 13:28:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=20=E6=8C=91=E6=88=98=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Carbon/CarbonManager.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index 0bf897fdce..f99b095231 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -1115,32 +1115,33 @@ end --获取战斗结束后信息(拼接) function this.GetBattleResult() local data = {} + local boutNum=this.battleResult.lossBloodOrTimes>20 and 20 or this.battleResult.lossBloodOrTimes if this.battleResult.type==1 then local reward1= ConfigManager.GetConfigData(ConfigName.ChallengeStage,1).Reward1 - data[1] = "回合数: "..this.battleResult.lossBloodOrTimes + data[1] = "回合数: "..boutNum local j=#reward1 for i =1, #reward1 do - if this.battleResult.lossBloodOrTimes>=reward1[j][1] then + if boutNum>=reward1[j][1] then data[1]= string.format("%s\n\n当前评价奖励加成%s",data[1],(reward1[j][2]/100).."%") break end j=j-1 end - data[2]=this.battleResult.lossBloodOrTimes/20 + data[2]=boutNum/20 data[3] = reward1 else local reward1= ConfigManager.GetConfigData(ConfigName.ChallengeStage,1001).Reward1 - data[1] = "回合数: "..this.battleResult.lossBloodOrTimes + data[1] = "回合数: "..boutNum local j=#reward1 for i = #reward1, 1 do - if this.battleResult.lossBloodOrTimes<=reward1[j][1] then + if boutNum<=reward1[j][1] then data[1]= string.format("%s\n当前评价奖励加成%s",data[1],reward1[j][2]) break end j=j-1 end - data[2]=(20-this.battleResult.lossBloodOrTimes)/20 + data[2]=(20-boutNum)/20 data[3] = reward1 end data[4] = this.battleResult.type From 729f426538d6e2925185b5942eb3c93f32d342b2 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 23 Dec 2022 14:13:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BA=A2=E5=8C=85=E6=A6=82=E7=8E=87?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua index 8cf3a8b6dc..748ad5e3f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua @@ -41,6 +41,7 @@ function this:OnOpen(rewardGroup) local itemInfo={} itemInfo.weight=rewardItemConfig.Chance itemInfo.itemId=rewardItemConfig.ItemId + itemInfo.itemNum=rewardItemConfig.RandomMin itemInfo.randomMax=rewardItemConfig.RandomMax winData[i].itemList[j]=itemInfo end @@ -54,7 +55,7 @@ function this:OnOpen(rewardGroup) view.gameObject.name = "frame"..index itemListPrefab[index] = view index=index+1 - view:OnOpen(false,{itemData.itemId,1},1.15,true,false,false,self.sortingOrder) + view:OnOpen(false,{itemData.itemId,itemData.itemNum},1.15,true,false,false,self.sortingOrder) local str=string.format("获取概率:%s%%",itemData.weight/ winData[i].allWeight*100) view:ResetName(str) end