diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index dc2e583b68..268de7b1f5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 108231851} - component: {fileID: 108231850} - component: {fileID: 108231849} + - component: {fileID: 209465186265776254} m_Layer: 0 m_Name: name (2) m_TagString: Untagged @@ -95,6 +96,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &209465186265776254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108231847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &260925510 GameObject: m_ObjectHideFlags: 0 @@ -190,6 +206,7 @@ GameObject: - component: {fileID: 504652898} - component: {fileID: 504652897} - component: {fileID: 504652896} + - component: {fileID: 85599837847414458} m_Layer: 0 m_Name: name (3) m_TagString: Untagged @@ -273,6 +290,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &85599837847414458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 504652894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &1135636950 GameObject: m_ObjectHideFlags: 0 @@ -285,6 +317,7 @@ GameObject: - component: {fileID: 1135636954} - component: {fileID: 1135636953} - component: {fileID: 1135636952} + - component: {fileID: 7980533243361849878} m_Layer: 0 m_Name: name (8) m_TagString: Untagged @@ -368,6 +401,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &7980533243361849878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1135636950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &1205616569 GameObject: m_ObjectHideFlags: 0 @@ -380,6 +428,7 @@ GameObject: - component: {fileID: 1205616573} - component: {fileID: 1205616572} - component: {fileID: 1205616571} + - component: {fileID: 8930849595961668279} m_Layer: 0 m_Name: name (6) m_TagString: Untagged @@ -463,6 +512,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &8930849595961668279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205616569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &1534131012 GameObject: m_ObjectHideFlags: 0 @@ -475,6 +539,7 @@ GameObject: - component: {fileID: 1534131016} - component: {fileID: 1534131015} - component: {fileID: 1534131014} + - component: {fileID: 4134159051794440237} m_Layer: 0 m_Name: name (5) m_TagString: Untagged @@ -558,6 +623,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &4134159051794440237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1534131012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &1576026674 GameObject: m_ObjectHideFlags: 0 @@ -662,6 +742,7 @@ GameObject: - component: {fileID: 1772367826} - component: {fileID: 1772367825} - component: {fileID: 1772367824} + - component: {fileID: 4531583303311046064} m_Layer: 0 m_Name: name (1) m_TagString: Untagged @@ -745,6 +826,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &4531583303311046064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772367822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &1824923494 GameObject: m_ObjectHideFlags: 0 @@ -757,6 +853,7 @@ GameObject: - component: {fileID: 1824923498} - component: {fileID: 1824923497} - component: {fileID: 1824923496} + - component: {fileID: 1461880751316712203} m_Layer: 0 m_Name: name (4) m_TagString: Untagged @@ -840,6 +937,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &1461880751316712203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1824923494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &2144366497 GameObject: m_ObjectHideFlags: 0 @@ -852,6 +964,7 @@ GameObject: - component: {fileID: 2144366501} - component: {fileID: 2144366500} - component: {fileID: 2144366499} + - component: {fileID: 1152800264446457185} m_Layer: 0 m_Name: name (7) m_TagString: Untagged @@ -935,6 +1048,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &1152800264446457185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144366497} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &103375257141528838 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua index 8de563a5f1..bc276fa890 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua @@ -240,9 +240,9 @@ function Gem:UpdatePanelData(_type) index=index+1 self.propertyList[index].gameObject:SetActive(true) if PropertyConfig[k].Style==1 then - str=string.format( "%s+%s",PropertyConfig[k].Info,v) + str=string.format( "%s+%s",PropertyConfig[k].Info,v) elseif PropertyConfig[k].Style==2 then - str=string.format( "%s+%s%s",PropertyConfig[k].Info,v/100,"%") + str=string.format( "%s+%s%s",PropertyConfig[k].Info,v/100,"%") end self.propertyList[index].text=str end