Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
commit
c1b73bdbd9
|
@ -1679,6 +1679,9 @@ function GetEquipSuitStr(Star,num)
|
|||
end
|
||||
|
||||
function GetCutOutStr(_str,_num)
|
||||
if not _str then
|
||||
return ""
|
||||
end
|
||||
local str=""
|
||||
if LengthString(_str) > _num + 1 then
|
||||
str=SubString(_str,_num) .. "..."
|
||||
|
|
|
@ -124,7 +124,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
self.innateImage:SetActive(false)
|
||||
self.iconGo:SetActive(true)
|
||||
self.circleFrameBg:SetActive(false)
|
||||
self.name:GetComponent("Text").text = GetCutOutStr(_itemData.configData.Name,4)
|
||||
self.name:GetComponent("Text").text = GetCutOutStr(_itemData.itemConfig.Name,4)
|
||||
Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu)
|
||||
Util.AddParticleSortLayer(self.UI_Effect_Kuang_HongSe, effectLayer - self.EffectOrginLayerQu)
|
||||
Util.AddParticleSortLayer(self.UI_Effect_jinkuang_Fang, effectLayer - self.EffectOrginLayerQu)
|
||||
|
|
|
@ -166,7 +166,7 @@ namespace GameEditor.Core.DataConfig
|
|||
|
||||
public class DataConfigWindow : EditorWindow
|
||||
{
|
||||
[MenuItem("Data Config/Window")]
|
||||
//[MenuItem("Data Config/Window")]
|
||||
private static void ShowConfigWin()
|
||||
{
|
||||
var win = GetWindow<DataConfigWindow>();
|
||||
|
@ -309,13 +309,13 @@ namespace GameEditor.Core.DataConfig
|
|||
}
|
||||
}
|
||||
|
||||
[MenuItem("Data Config/一键导表")]
|
||||
//[MenuItem("Data Config/一键导表")]
|
||||
public static void ExcelALLConfig()
|
||||
{
|
||||
excelALLConfig(false, DataConfigSetting.execlDir);
|
||||
}
|
||||
|
||||
[MenuItem("Data Config/变化导表")]
|
||||
//[MenuItem("Data Config/变化导表")]
|
||||
public static void ExcelChangeConfig()
|
||||
{
|
||||
excelALLConfig(true, DataConfigSetting.execlDir);
|
||||
|
|
Loading…
Reference in New Issue