diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index dafb1632a4..f1f63d6ec2 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -14109,12 +14109,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1830989272795780814}
- m_Father: {fileID: 1467844528978285286}
- m_RootOrder: 7
+ m_Father: {fileID: 3434667051725398}
+ m_RootOrder: 1
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: -250}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 50, y: -135}
m_SizeDelta: {x: 250, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7306719755428207597
@@ -17933,8 +17933,7 @@ RectTransform:
- {fileID: 1177825343982519204}
- {fileID: 6475382134693875839}
- {fileID: 2332250532228594229}
- - {fileID: 8375336840715324144}
- - {fileID: 203817331770009106}
+ - {fileID: 3434667051725398}
m_Father: {fileID: 2925180131101153177}
m_RootOrder: 39
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -23511,12 +23510,12 @@ RectTransform:
m_Children:
- {fileID: 2406047672103772645}
- {fileID: 5892851672121453996}
- m_Father: {fileID: 1467844528978285286}
- m_RootOrder: 6
+ m_Father: {fileID: 3434667051725398}
+ 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: -160.2}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 50, y: -35}
m_SizeDelta: {x: 188, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1738108596221402211
@@ -27206,6 +27205,67 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u589E\u76CA\u6548\u679C"
LanguageIndex: 11275
+--- !u!1 &5762612044416986375
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3434667051725398}
+ - component: {fileID: 2812018699646066945}
+ m_Layer: 5
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3434667051725398
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5762612044416986375}
+ 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:
+ - {fileID: 8375336840715324144}
+ - {fileID: 203817331770009106}
+ m_Father: {fileID: 1467844528978285286}
+ m_RootOrder: 6
+ 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: -203}
+ m_SizeDelta: {x: 100, y: 200}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2812018699646066945
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5762612044416986375}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 1
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
--- !u!1 &5804231184545886116
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua
index 8cd232e86f..71b0ed6be3 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua
@@ -12,20 +12,17 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) }
local _TabData = {
[1]= {txt = "全部",quality = 0},
- [2]= {txt = "蓝色",quality = 2},
- [3]= {txt = "紫色",quality = 3},
- [4]= {txt = "金色",quality = 4},
- [5]= {txt = "红色",quality = 5},
+ [2]= {txt = "蓝色",quality = 3},
+ [3]= {txt = "紫色",quality = 4},
+ [4]= {txt = "金色",quality = 5},
+ [5]= {txt = "红色",quality = 6},
}
local QUALITY = {
- -- [1] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
- [2] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
- [3] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
- [4] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
- [5] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
+ [3] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
+ [4] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
+ [5] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
[6] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
- -- [7] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
}
--初始化组件(用于子类重写)
@@ -109,7 +106,7 @@ function QiJieTreasure:SetSingleData(index,_go,_data)
local obj = Util.GetGameObject(_go,"Pre ("..i..")")
if _data[i] then
obj:SetActive(true)
- Util.GetGameObject(obj,"Name"):GetComponent("Text").text = string.format( "%s",QualityTextDef[_data[i].Quality+1],_data[i].Name)
+ Util.GetGameObject(obj,"Name"):GetComponent("Text").text = string.format( "%s",QualityTextDef[_data[i].Quality],_data[i].Name)
local img = Util.GetGameObject(obj,"Image"):GetComponent("Image")
local imgLight = Util.GetGameObject(obj,"light"):GetComponent("Image")
local imgKuang = Util.GetGameObject(obj,"kuang"):GetComponent("Image")
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QiJieSingleTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QiJieSingleTreasure.lua
index 6e9442a196..37be0bc5db 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QiJieSingleTreasure.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QiJieSingleTreasure.lua
@@ -6,13 +6,10 @@ local QijieHolyConfig=ConfigManager.GetConfig(ConfigName.QijieHolyConfig)
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local QUALITY = {
- -- [1] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
- [2] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
- [3] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
- [4] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
- [5] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
+ [3] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
+ [4] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
+ [5] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
[6] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
- -- [7] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
}
function QiJieSingleTreasure:InitComponent(gameObject)
@@ -22,10 +19,10 @@ function QiJieSingleTreasure:InitComponent(gameObject)
self.Img = Util.GetGameObject(gameObject,"Image"):GetComponent("Image")
self.light = Util.GetGameObject(gameObject,"light"):GetComponent("Image")
self.kuang = Util.GetGameObject(gameObject,"kuang"):GetComponent("Image")
- self.cost = Util.GetGameObject(gameObject,"cost")
- self.costIcon = Util.GetGameObject(gameObject,"cost/Icon"):GetComponent("Image")
- self.costNum = Util.GetGameObject(gameObject,"cost/Num"):GetComponent("Text")
- self.activeBtn = Util.GetGameObject(gameObject,"activeBtn")
+ self.cost = Util.GetGameObject(gameObject,"GameObject/cost")
+ self.costIcon = Util.GetGameObject(gameObject,"GameObject/cost/Icon"):GetComponent("Image")
+ self.costNum = Util.GetGameObject(gameObject,"GameObject/cost/Num"):GetComponent("Text")
+ self.activeBtn = Util.GetGameObject(gameObject,"GameObject/activeBtn")
self.activeText = Util.GetGameObject(self.activeBtn,"Text"):GetComponent("Text")
end
@@ -54,7 +51,7 @@ function QiJieSingleTreasure:OnShow(_parent,...)
end
function QiJieSingleTreasure:Refresh()
- self.title.text = self.data.Name
+ self.title.text = string.format( "%s",QualityTextDef[self.data.Quality],self.data.Name)
self.Img.sprite = self.spLoader:LoadSprite(artResourcesConfig[self.data.Icon].Name)
self.light.sprite = self.spLoader:LoadSprite(QUALITY[self.data.Quality].light)
self.kuang.sprite = self.spLoader:LoadSprite(QUALITY[self.data.Quality].kuang)