diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultPanel.prefab
index 061f729b98..5058621629 100644
--- a/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultPanel.prefab
@@ -859,7 +859,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: 203, y: 593}
+ m_AnchoredPosition: {x: 300, y: 593}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4628305833288301820
@@ -1106,7 +1106,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: 82, y: -133.8}
+ m_AnchoredPosition: {x: 185, y: -133.8}
m_SizeDelta: {x: 50, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &292353098418717606
@@ -1340,7 +1340,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: 83, y: -377.6}
+ m_AnchoredPosition: {x: 185, y: -377.6}
m_SizeDelta: {x: 50, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &559628078360310452
@@ -1414,7 +1414,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: 83, y: -298.8}
+ m_AnchoredPosition: {x: 185, y: -298.8}
m_SizeDelta: {x: 50, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &599154745447938448
@@ -1488,7 +1488,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: 82.1, y: -215.1}
+ m_AnchoredPosition: {x: 185, y: -215.1}
m_SizeDelta: {x: 50, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &416257105069952145
@@ -2620,7 +2620,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: 82, y: -50.1}
+ m_AnchoredPosition: {x: 185, y: -50.1}
m_SizeDelta: {x: 50, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8854462857226213966
@@ -2725,7 +2725,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: f37e2408c1cff024183a3c775aa93065, type: 3}
+ m_Sprite: {fileID: 21300000, guid: e063a2e495260874383a0517cc48594e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultTips.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultTips.prefab
index 528d437491..3bbd8ef4be 100644
--- a/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultTips.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultTips.prefab
@@ -269,14 +269,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 42
m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 4
+ m_BestFit: 1
+ m_MinSize: 20
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u795E\u5C06\u7B49\u7EA7\uFF1A"
LanguageIndex: 11583
@@ -608,7 +608,7 @@ MonoBehaviour:
m_Right: 10
m_Top: 100
m_Bottom: 30
- m_ChildAlignment: 0
+ m_ChildAlignment: 3
m_Spacing: 35
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
@@ -742,14 +742,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 42
m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 4
+ m_BestFit: 1
+ m_MinSize: 20
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7075\u5B9D\u5F3A\u5316\uFF1A"
LanguageIndex: 11583
@@ -822,14 +822,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 42
m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 4
+ m_BestFit: 1
+ m_MinSize: 20
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u88C5\u5907\u54C1\u7EA7\uFF1A"
LanguageIndex: 11583
@@ -1431,14 +1431,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 42
m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 4
+ m_BestFit: 1
+ m_MinSize: 20
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6CD5\u5B9D\u7B49\u7EA7\uFF1A"
LanguageIndex: 11583
@@ -1511,14 +1511,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 42
m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 4
+ m_BestFit: 1
+ m_MinSize: 20
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9B42\u5B9D\u5F3A\u5316\uFF1A"
LanguageIndex: 11583
diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengUnLoadPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengUnLoadPanel.prefab
index c5102de338..2b5273c983 100644
--- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengUnLoadPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengUnLoadPanel.prefab
@@ -648,7 +648,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: -248, y: -49}
+ m_AnchoredPosition: {x: -141, y: -49}
m_SizeDelta: {x: 195, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1962112155060276043
@@ -1043,7 +1043,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: 26.6, y: 99.7}
+ m_AnchoredPosition: {x: 133.6, y: 99.7}
m_SizeDelta: {x: 50, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4206330108937451210
@@ -1867,7 +1867,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: -248.00003, y: -128}
+ m_AnchoredPosition: {x: -141.00003, y: -128}
m_SizeDelta: {x: 195, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3794753255847681849
@@ -1947,7 +1947,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: -248.00003, y: -203}
+ m_AnchoredPosition: {x: -141.00003, y: -203}
m_SizeDelta: {x: 195, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1462565709785835919
@@ -2571,7 +2571,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: 144, y: 86.5}
+ m_AnchoredPosition: {x: 251, y: 86.5}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3763684332243154989
@@ -3072,7 +3072,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: -81, y: 18.3}
+ m_AnchoredPosition: {x: 26, y: 18.3}
m_SizeDelta: {x: 100, y: 337.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4280895127486242528
@@ -3971,7 +3971,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: 26.6, y: -50.599926}
+ m_AnchoredPosition: {x: 133.6, y: -50.599926}
m_SizeDelta: {x: 50, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7363972359412869008
@@ -4371,7 +4371,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: 26.6, y: 19.700073}
+ m_AnchoredPosition: {x: 133.6, y: 19.700073}
m_SizeDelta: {x: 50, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6498901457816195781
@@ -4825,7 +4825,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: 26.6, y: -204.79993}
+ m_AnchoredPosition: {x: 133.6, y: -204.79993}
m_SizeDelta: {x: 50, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &318246702306781352
@@ -5083,7 +5083,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: 26.6, y: -126.69993}
+ m_AnchoredPosition: {x: 133.6, y: -126.69993}
m_SizeDelta: {x: 50, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3568995946386747307
@@ -5157,7 +5157,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: -248.00003, y: 95.49997}
+ m_AnchoredPosition: {x: -141.00003, y: 95.49997}
m_SizeDelta: {x: 195, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4879915484820718942
@@ -5356,7 +5356,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: -248.00003, y: 25.099976}
+ m_AnchoredPosition: {x: -141.00003, y: 25.099976}
m_SizeDelta: {x: 195, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &826119108422463413
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleProInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleProInfoPopup.prefab
index 3c9b21a7e7..39f9c8ad9f 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleProInfoPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleProInfoPopup.prefab
@@ -1159,7 +1159,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 339.8, y: -47.700092}
+ m_AnchoredPosition: {x: 370, y: -47.700092}
m_SizeDelta: {x: 84, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1153332209881672862
@@ -2671,7 +2671,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -58.9, y: -47.7}
+ m_AnchoredPosition: {x: -30, y: -47.7}
m_SizeDelta: {x: 84, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &604174248880203762
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
index 8f4f07f047..69a2766a2e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
@@ -11,17 +11,7 @@ local SelectHero = nil
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
--初始化组件(用于子类重写)
function GongMingResultTips:InitComponent()
-
- -- this.BtnBack = Util.GetGameObject(self.transform, "btnBack")
-
-
- -- this.TextAll = Util.GetGameObject(self.transform,"grid/TextAll")
- -- this.contentHunText = Util.GetGameObject(self.transform,"grid/ver/recordPer (1)/name/text (3)")
- -- this.contentLingText = Util.GetGameObject(self.transform,"grid/ver/recordPer (1)/name/text (4)")
-
self.BackMask = Util.GetGameObject(self.transform, "BackMask")
-
-
self.breakOpenSkillGrid =Util.GetGameObject(self.transform, "bg/breakOpenSkill/Mask")
self.upStarSkillTextPreDegree = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre")
self.upStarSkillTextPreEquip = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre (1)")
@@ -53,163 +43,58 @@ end
function GongMingResultTips:OnOpen(skinId)
- LogGreen("打开面板")
local data = HarmonyManager:GetAdditions()
- -- for key, value in pairs(heroConfig[]) do
- -- -- body
- -- print(key, " ",value)
- -- end
-
- --if HarmonyManager.hongmengTablet >= HarmonyManager.TowerStartLimit then
- -- body
- --LogGreen(HarmonyManager.hongmengTablet)
- for i = 1, #data do
-
- if data[i].additionType == 1 then
- if data[i].heroTid == 0 then
- -- body
- local num = HarmonyManager:HongMengTowerUpLimit()
- self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12195],data[i].value,num)
- elseif data[i].heroTid == -1 then
- -- body
-
- else
- self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12196],data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
- end
-
- elseif data[i].additionType == 2 then
- if data[i].value == -1 then
- -- body
- self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format(Language[12197])
- else
- local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value)
-
- self.upStarSkillTextPreEquip:GetComponent("Text").text = GetStringByEquipQua(equip.Quality,string.format(Language[12198],GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName))
- --string.format("\t\t\t\t\t\t%s%d星(%s)",GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
- end
-
- -- body ReadingName
- elseif data[i].additionType == 3 then
- if data[i].heroTid~= 0 and data[i].value > 0 then
- -- body
- self.upStarSkillTextPreHun:SetActive(true)
- self.upStarSkillTextPreHun:GetComponent("Text").text = string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
- else
- print(" textHun ",data[i].value)
- if PlayerManager.level<75 then
- -- body
- self.upStarSkillTextPreHun:SetActive(false)
- self.upStarSkillTextPreHun:GetComponent("Text").text = ""
- else
- self.upStarSkillTextPreHun:SetActive(true)
- self.upStarSkillTextPreHun:GetComponent("Text").text = string.format(Language[12197])
- end
-
- end
-
- -- body
- elseif data[i].additionType == 4 then
- if data[i].heroTid ~= 0 and data[i].value > 0 then
- -- body
- -- print(tostring(data[i].value).." "..data[i].heroTid.." ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName ")
- self.upStarSkillTextPreSoul:SetActive(true)
- self.upStarSkillTextPreSoul:GetComponent("Text").text =string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
-
-
- else
- if PlayerManager.level<75 then
- -- body
- self.upStarSkillTextPreSoul:SetActive(false)
- self.upStarSkillTextPreSoul:GetComponent("Text").text =""
- else
- self.upStarSkillTextPreSoul:SetActive(true)
- self.upStarSkillTextPreSoul:GetComponent("Text").text = string.format(Language[12197])
- end
-
-
- end
-
- -- body
+ for i = 1, #data do
+ if data[i].additionType == 1 then
+ if data[i].heroTid == 0 then
+ local num = HarmonyManager:HongMengTowerUpLimit()
+ self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12195],data[i].value,num)
+ elseif data[i].heroTid == -1 then
else
- if data[i].value ~= -1 then
- -- body
- print(data[i].heroTid )
- self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ self.upStarSkillTextPreDegree:GetComponent("Text").text = string.format(Language[12196],data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ end
+ elseif data[i].additionType == 2 then
+ if data[i].value == -1 then
+ self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format(Language[12197])
+ else
+ local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value)
+ self.upStarSkillTextPreEquip:GetComponent("Text").text = GetStringByEquipQua(equip.Quality,string.format(Language[12198],GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName))
+ end
+ elseif data[i].additionType == 3 then
+ if data[i].heroTid~= 0 and data[i].value > 0 then
+ self.upStarSkillTextPreHun:SetActive(true)
+ self.upStarSkillTextPreHun:GetComponent("Text").text = string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ else
+ if PlayerManager.level<75 then
+ self.upStarSkillTextPreHun:SetActive(false)
+ self.upStarSkillTextPreHun:GetComponent("Text").text = ""
else
- self.upStarSkillTextPreFa:GetComponent("Text").text =string.format(Language[12197])
+ self.upStarSkillTextPreHun:SetActive(true)
+ self.upStarSkillTextPreHun:GetComponent("Text").text = string.format(Language[12197])
end
-
+ end
+ elseif data[i].additionType == 4 then
+ if data[i].heroTid ~= 0 and data[i].value > 0 then
+ self.upStarSkillTextPreSoul:SetActive(true)
+ self.upStarSkillTextPreSoul:GetComponent("Text").text =string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ else
+ if PlayerManager.level<75 then
+ self.upStarSkillTextPreSoul:SetActive(false)
+ self.upStarSkillTextPreSoul:GetComponent("Text").text =""
+ else
+ self.upStarSkillTextPreSoul:SetActive(true)
+ self.upStarSkillTextPreSoul:GetComponent("Text").text = string.format(Language[12197])
+ end
+ end
+ else
+ if data[i].value ~= -1 then
+ print(data[i].heroTid )
+ self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("\t\t\t\t\t\t%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
+ else
+ self.upStarSkillTextPreFa:GetComponent("Text").text =string.format(Language[12197])
end
end
- --else
- -- for i = 1, #data do
-
- -- if data[i].additionType == 1 then
- -- print(data[i].value," ")
- -- Util.GetGameObject(this.TextAll,"textDegree"):GetComponent("Text").text = string.format("%d级(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
- -- elseif data[i].additionType == 2 then
- -- if data[i].value == -1 then
- -- -- body
- -- Util.GetGameObject(this.TextAll,"textEqiue"):GetComponent("Text").text = string.format("无")
- -- else
- -- Util.GetGameObject(this.TextAll,"textEqiue"):GetComponent("Text").text = string.format("装备%d品(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
- -- end
-
- -- -- body ReadingName
- -- elseif data[i].additionType == 3 then
- -- if data[i].heroTid~=0 then
- -- -- body
- -- this.contentLingText:SetActive(true)
- -- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
- -- else
- -- if PlayerManager.level<75 then
- -- -- body
- -- this.contentLingText:SetActive(false)
- -- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = ""
- -- else
- -- this.contentLingText:SetActive(true)
- -- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("无")
- -- end
- -- -- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value)
- -- --Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("无")
- -- end
-
- -- -- body
- -- elseif data[i].additionType == 4 then
- -- if data[i].heroTid ~= 0 then
- -- -- body
- -- -- print(tostring(data[i].value).." "..data[i].heroTid.." ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName ")
- -- this.contentHunText:SetActive(true)
- -- Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text =string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
-
- -- else
- -- if PlayerManager.level<75 then
- -- -- body
- -- this.contentHunText:SetActive(false)
- -- Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = ""
- -- else
- -- this.contentHunText:SetActive(true)
- -- Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("无")
- -- end
- -- -- Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("%d",data[i].value)
- -- --Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("无")
- -- end
-
- -- -- body
- -- else
- -- if data[i].value > 0 then
- -- -- body
- -- Util.GetGameObject(this.TextAll,"textFa"):GetComponent("Text").text =string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
- -- else
- -- Util.GetGameObject(this.TextAll,"textFa"):GetComponent("Text").text =string.format("无")
- -- end
-
- -- end
- -- end
-
- --end
-
-
+ end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
index 91bd3267e9..362be56d9a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
@@ -17,7 +17,6 @@ function LoadingPanel:OnOpen()
local index = 0
math.randomseed(os.time())
index = math.random(1, #sprites)
- LogGreen("index:"..index.." 名字:"..tostring(sprites[index]))
this.bg.sprite = Util.LoadSprite(sprites[index])
math.randomseed(os.time())
index = math.random(1, 20)