Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
2abfd842cf
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
ive2d_npc_map_nv.png
|
||||
live2d_npc_map_nv_png.png
|
||||
size: 1024,1024
|
||||
format: RGBA8888
|
||||
filter: Linear,Linear
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: ive2d_npc_map_nv_Material
|
||||
m_Name: ive2d_npc_map_nv_live2d_npc_map_nv_png
|
||||
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 201c0d253e1b776459f1966f9138d201
|
||||
guid: 47972af36bd2b0447a526e78fb037180
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
@ -14,4 +14,4 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
atlasFile: {fileID: 4900000, guid: 174f4d67f2549d44ba6253c2c4862616, type: 3}
|
||||
materials:
|
||||
- {fileID: 2100000, guid: 201c0d253e1b776459f1966f9138d201, type: 2}
|
||||
- {fileID: 2100000, guid: 47972af36bd2b0447a526e78fb037180, type: 2}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
live2d_npc_map.png
|
||||
live2d_npc_map_png.png
|
||||
size: 1024,1024
|
||||
format: RGBA8888
|
||||
filter: Linear,Linear
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
atlasFile: {fileID: 4900000, guid: d4d9c867ba93190468604e99b72bc3a8, type: 3}
|
||||
materials:
|
||||
- {fileID: 2100000, guid: 35e4fdf329b2235448a158a29f882788, type: 2}
|
||||
- {fileID: 2100000, guid: c2bb688986a567e4fab27d66d9664b10, type: 2}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: live2d_npc_map_Material
|
||||
m_Name: live2d_npc_map_material
|
||||
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 35e4fdf329b2235448a158a29f882788
|
||||
guid: c2bb688986a567e4fab27d66d9664b10
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -114,7 +114,8 @@ function this.ShowTitleData(_data)
|
|||
this.progressImage.fillAmount = #allCanCompoundEquips/curSelectEquip.quaUpCount
|
||||
compoundNum = math.floor(#allCanCompoundEquips/curSelectEquip.quaUpCount)
|
||||
compoundMaxNum = math.floor(#allCanCompoundEquips/curSelectEquip.quaUpCount)
|
||||
this.ShowGoldNum(curSelectEquip.costCoin,compoundNum)
|
||||
local costCoin = jewelConfig[curSelectEquip.Id-1].RankupResources
|
||||
this.ShowGoldNum(costCoin,compoundNum)
|
||||
end
|
||||
--显示金币数量
|
||||
function this.ShowGoldNum(_costData,_num)
|
||||
|
|
@ -125,7 +126,7 @@ function this.ShowGoldNum(_costData,_num)
|
|||
this.needGoldText.text = string.format("<color=#FF0011>%s</color>", needGoldNum)
|
||||
else
|
||||
materidaIsCan = true
|
||||
this.needGoldText.text =string.format("<color=#FCF5D3FF>%s</color>", needGoldNum)
|
||||
this.needGoldText.text = string.format("<color=#FCF5D3FF>%s</color>", needGoldNum)
|
||||
end
|
||||
this.numText.text = compoundNum
|
||||
Util.SetGray(this.addBtn,false)
|
||||
|
|
@ -199,7 +200,8 @@ function this.CompoundNumChange(type)
|
|||
compoundNum = compoundNum - 1
|
||||
end
|
||||
--LogError("compoundNum "..compoundNum)
|
||||
this.ShowGoldNum(curSelectEquip.costCoin,compoundNum)
|
||||
local costCoin = jewelConfig[curSelectEquip.Id-1].RankupResources
|
||||
this.ShowGoldNum(costCoin,compoundNum)
|
||||
end
|
||||
function this.Compound()
|
||||
--LogError(" `````````````````` "..curIndex.." "..curSelectEquip.Star.." "..compoundNum)
|
||||
|
|
|
|||
|
|
@ -203,12 +203,12 @@ function GMPanel:BindEvent()
|
|||
Util.AddClick(this.btnGenRole, function()
|
||||
if not this.strMsg.text or this.strMsg.text == "" then
|
||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) do
|
||||
local str=chooseID.."#"..v.Id.."#"..1
|
||||
local str=chooseID.."#"..v.Id.."#"..5
|
||||
LogBlue(str)
|
||||
NetManager.GMEvent(str)
|
||||
end
|
||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig)) do
|
||||
local str=chooseID.."#"..v.Id.."#"..1
|
||||
local str=chooseID.."#"..v.Id.."#"..5
|
||||
LogBlue(str)
|
||||
NetManager.GMEvent(str)
|
||||
end
|
||||
|
|
@ -222,7 +222,7 @@ function GMPanel:BindEvent()
|
|||
Util.AddClick(this.GenerateHero, function()
|
||||
if not this.strInputFieldHeroMsg.text or this.strInputFieldHeroMsg.text == "" then
|
||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do
|
||||
local str= 4 .. "#" .. v.Id .. "#" ..10
|
||||
local str= 4 .. "#" .. v.Id .. "#" ..v.MaxRank
|
||||
LogBlue(str)
|
||||
NetManager.GMEvent(str)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -224,7 +224,11 @@ function this.GetAllTabletTreasuresByRaceAndType(_index, _Location)
|
|||
table.sort(
|
||||
list,
|
||||
function(a, b)
|
||||
return a.race < b.race
|
||||
if a.race == b.race then
|
||||
return a.Id < b.Id
|
||||
else
|
||||
return a.race < b.race
|
||||
end
|
||||
end
|
||||
)
|
||||
return list
|
||||
|
|
|
|||
Loading…
Reference in New Issue