diff --git a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt index c48fcf8663..09c7e5a046 100644 --- a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt +++ b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.atlas.txt @@ -1,5 +1,5 @@ -ive2d_npc_map_nv.png +live2d_npc_map_nv_png.png size: 1024,1024 format: RGBA8888 filter: Linear,Linear diff --git a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Material.mat b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.mat similarity index 93% rename from Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Material.mat rename to Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.mat index 014a9b5c57..d4a3866acc 100644 --- a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Material.mat +++ b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.mat @@ -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 diff --git a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Material.mat.meta b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.mat.meta similarity index 79% rename from Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Material.mat.meta rename to Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.mat.meta index 3416a2edf4..752aaa58c7 100644 --- a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Material.mat.meta +++ b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 201c0d253e1b776459f1966f9138d201 +guid: 47972af36bd2b0447a526e78fb037180 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset index ea86c9460c..d079fddc14 100644 --- a/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset +++ b/Assets/ManagedResources/Spine/ive2d_npc_map_nv/ive2d_npc_map_nv_Atlas.asset @@ -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} diff --git a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map.atlas.txt b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map.atlas.txt index ea8db3450b..8393c38e67 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map.atlas.txt +++ b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map.atlas.txt @@ -1,5 +1,5 @@ -live2d_npc_map.png +live2d_npc_map_png.png size: 1024,1024 format: RGBA8888 filter: Linear,Linear diff --git a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Atlas.asset b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Atlas.asset index 06a9e648e1..1a83239c0f 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Atlas.asset +++ b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Atlas.asset @@ -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} diff --git a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat index 3743b55097..44c26f2067 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat +++ b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat @@ -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 diff --git a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta index 8040d13116..33b13dbf8e 100644 --- a/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta +++ b/Assets/ManagedResources/Spine/live2d_npc_map/live2d_npc_map_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35e4fdf329b2235448a158a29f882788 +guid: c2bb688986a567e4fab27d66d9664b10 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index 5e5e53e37a..47410df2d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -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("%s", needGoldNum) else materidaIsCan = true - this.needGoldText.text =string.format("%s", needGoldNum) + this.needGoldText.text = string.format("%s", 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) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 0baec2c4fc..1f75a9963c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index ef4db96613..aff9258c12 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -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