diff --git a/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1.fnt b/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1.fnt index 78cfdf8532..b8d34c9289 100644 --- a/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1.fnt +++ b/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1.fnt @@ -1,15 +1,15 @@ info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 -common lineHeight=32 base=26 scaleW=256 scaleH=128 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 +common lineHeight=32 base=26 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 page id=0 file="ArtFont_1_0.png" chars count=11 -char id=46 x=235 y=0 width=12 height=16 xoffset=0 yoffset=0 xadvance=12 page=0 chnl=15 -char id=48 x=0 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=49 x=47 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=50 x=94 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=51 x=141 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=52 x=188 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=53 x=0 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=54 x=47 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=55 x=94 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=56 x=141 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=57 x=188 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=46 x=0 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=48 x=47 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=49 x=94 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=50 x=141 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=51 x=188 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=52 x=0 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=53 x=47 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=54 x=94 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=55 x=141 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=56 x=188 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=57 x=0 y=94 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 diff --git a/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1_0.png b/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1_0.png index eecc7f07ec..f5f4495cc0 100644 Binary files a/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1_0.png and b/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1_0.png differ diff --git a/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1_cfont.fontsettings b/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1_cfont.fontsettings index a310189396..5017e607c9 100644 --- a/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1_cfont.fontsettings +++ b/Assets/ManagedResources/Fonts/ArtFont_1/ArtFont_1_cfont.fontsettings @@ -9,7 +9,7 @@ Font: m_Name: ArtFont_1_cfont serializedVersion: 5 m_LineSpacing: 0.1 - m_DefaultMaterial: {fileID: 0} + m_DefaultMaterial: {fileID: 2100000, guid: e9e7c229699f9a941808d71077df2f31, type: 2} m_FontSize: 0 m_Texture: {fileID: 0} m_AsciiStartOffset: 0 @@ -17,7 +17,183 @@ Font: m_CharacterSpacing: 0 m_CharacterPadding: 1 m_ConvertCase: 0 - m_CharacterRects: [] + m_CharacterRects: + - serializedVersion: 2 + index: 46 + uv: + serializedVersion: 2 + x: 0 + y: 1 + width: 0.046875 + height: -0.125 + vert: + serializedVersion: 2 + x: 20 + y: -20 + width: 12 + height: 16 + advance: 12 + flipped: 0 + - serializedVersion: 2 + index: 48 + uv: + serializedVersion: 2 + x: 0 + y: 1 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 49 + uv: + serializedVersion: 2 + x: 0.18359375 + y: 1 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 50 + uv: + serializedVersion: 2 + x: 0.3671875 + y: 1 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 51 + uv: + serializedVersion: 2 + x: 0.55078125 + y: 1 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 52 + uv: + serializedVersion: 2 + x: 0.734375 + y: 1 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 53 + uv: + serializedVersion: 2 + x: 0 + y: 0.6328125 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 54 + uv: + serializedVersion: 2 + x: 0.18359375 + y: 0.6328125 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 55 + uv: + serializedVersion: 2 + x: 0.3671875 + y: 0.6328125 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 56 + uv: + serializedVersion: 2 + x: 0.55078125 + y: 0.6328125 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 + - serializedVersion: 2 + index: 57 + uv: + serializedVersion: 2 + x: 0.734375 + y: 0.6328125 + width: 0.1796875 + height: -0.359375 + vert: + serializedVersion: 2 + x: 0 + y: -23 + width: 46 + height: 46 + advance: 46 + flipped: 0 m_KerningValues: [] m_PixelScale: 0.1 m_FontData: diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt index f29ad71a22..38342f4e88 100644 --- a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt +++ b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt @@ -2,14 +2,14 @@ info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smoo common lineHeight=32 base=26 scaleW=512 scaleH=512 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 page id=0 file="ArtFont_2_0.png" chars count=11 -char id=46 x=468 y=162 width=39 height=39 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=15 -char id=48 x=121 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 -char id=49 x=114 y=324 width=95 height=159 xoffset=0 yoffset=0 xadvance=95 page=0 chnl=15 -char id=50 x=0 y=324 width=113 height=159 xoffset=0 yoffset=0 xadvance=113 page=0 chnl=15 -char id=51 x=0 y=162 width=117 height=161 xoffset=0 yoffset=0 xadvance=117 page=0 chnl=15 -char id=52 x=229 y=162 width=121 height=159 xoffset=0 yoffset=0 xadvance=121 page=0 chnl=15 -char id=53 x=118 y=162 width=110 height=160 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15 +char id=46 x=121 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=48 x=240 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=49 x=231 y=324 width=95 height=159 xoffset=0 yoffset=0 xadvance=95 page=0 chnl=15 +char id=50 x=117 y=324 width=113 height=159 xoffset=0 yoffset=0 xadvance=113 page=0 chnl=15 +char id=51 x=119 y=162 width=117 height=161 xoffset=0 yoffset=0 xadvance=117 page=0 chnl=15 +char id=52 x=348 y=162 width=121 height=159 xoffset=0 yoffset=0 xadvance=121 page=0 chnl=15 +char id=53 x=237 y=162 width=110 height=160 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15 char id=54 x=0 y=0 width=120 height=161 xoffset=0 yoffset=0 xadvance=120 page=0 chnl=15 -char id=55 x=351 y=162 width=116 height=159 xoffset=0 yoffset=0 xadvance=116 page=0 chnl=15 -char id=56 x=240 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 -char id=57 x=359 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=55 x=0 y=324 width=116 height=159 xoffset=0 yoffset=0 xadvance=116 page=0 chnl=15 +char id=56 x=359 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=57 x=0 y=162 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png index bcc9fc457f..3721c293dc 100644 Binary files a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png and b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index bf4e7175e8..738a495640 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -1095,7 +1095,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 867, y: 187} + m_SizeDelta: {x: 868, y: 188} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3977152365312893247 CanvasRenderer: @@ -1436,7 +1436,7 @@ RectTransform: 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: 255.57, y: 56.025} + m_AnchoredPosition: {x: 255.57, y: -45} m_SizeDelta: {x: 220.99, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5939520279966165509 @@ -1824,7 +1824,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 741.43, y: -115.8} + m_AnchoredPosition: {x: 741.43, y: -93} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5679312751743760484 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 50906b88cb..a4499d71fb 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -12784,7 +12784,7 @@ ParticleSystem: --- !u!199 &6361814840690037554 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -17221,7 +17221,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 172.8001, y: -23.2} + m_AnchoredPosition: {x: 168, y: -23.2} m_SizeDelta: {x: 46, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1284397404239783252 @@ -17265,7 +17265,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 999 + m_Text: 2999 LanguageIndex: 0 --- !u!114 &1445299429138733215 MonoBehaviour: @@ -23105,7 +23105,7 @@ ParticleSystem: --- !u!199 &56297470826831929 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31917,7 +31917,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000022711816, y: 0} + m_AnchoredPosition: {x: -0.000007730629, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8625427577928505908 @@ -34944,7 +34944,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 160, y: -25} + m_AnchoredPosition: {x: 156, y: -25} m_SizeDelta: {x: 22, y: 43} m_Pivot: {x: 0, y: 0.5} --- !u!222 &49029013758658618 diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index a591f7d3b1..674702ae26 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -331,7 +331,7 @@ RectTransform: 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: 91, y: -73} + m_AnchoredPosition: {x: 107, y: -69} m_SizeDelta: {x: 38, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &218052765 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 4b9de495aa..d567f503f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -194,6 +194,7 @@ function this.SetData(root, data, ldata) local storeData=ConfigManager.GetConfigDataByDoubleKey(ConfigName.StoreConfig,"StoreId",7,"Limit",data.PrivilegeId[1])--商店表数据 title.sprite=Util.LoadSprite(qualityBg[data.Quality].s) + title:SetNativeSize() bgQuality.sprite=Util.LoadSprite(qualityBg[data.Quality].b) ResetItemView(root,reward.transform,itemList,3,0.9,orginLayer,false,data.RewardView) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index 0449a85547..2c551db03b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -226,7 +226,8 @@ function GrowthGiftPage:SetBtnInvestState() local packageInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward)--packageInfo:当前成长基金礼包ID(ID:101、102、103、104、105) if packageInfo and packageInfo.buyTimes == 0 then self.btnInvest:GetComponent("Button").enabled = true - self.btnInvestText.text = "$98" + local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, packageInfo.goodsId) + self.btnInvestText.text = string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(rechargeConfig.Price))--"$98" Util.SetGray(self.btnInvest, false) curGiftsId = packageInfo.goodsId else diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index fffe18c490..fe03ddbfcb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -219,7 +219,7 @@ function UpperMonthCard:SetBuyState() self.buyPanel:SetActive(not isBought) Util.SetGray(self.btnBuy, not isActive) -- self.textBuy.text = isActive and (self.panelType .. MoneyUtil.GetMoneyUnitName()) or (self.panelType .. MoneyUtil.GetMoneyUnitName()) - self.textBuy.text = isActive and (string.format(MoneyUtil.GetMoneyUnitName(),self.panelType)) or (string.format(MoneyUtil.GetMoneyUnitName(),self.panelType))-- .. MoneyUtil.GetMoneyUnitName()) + self.textBuy.text = isActive and (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(self.panelType))) or (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(self.panelType)))-- .. MoneyUtil.GetMoneyUnitName()) if not isBought then self:SetBuyPanelInfo() diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 9f3b21d79c..2e985fb144 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -32,9 +32,7 @@ function this.InitTypeTaskList(_userMissionList) userMissionList.type = _userMissionList[i].type userMissionList.takeTimes = _userMissionList[i].takeTimes userMissionList.heroId = _userMissionList[i].heroId - if userMissionList.type == 1 then - -- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state) - end + LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state) if not TypeTaskData[_userMissionList[i].type] then TypeTaskData[_userMissionList[i].type] = {} end diff --git a/FontArt/ArtFont_1/ArtFont_1.fnt b/FontArt/ArtFont_1/ArtFont_1.fnt index 78cfdf8532..b8d34c9289 100644 --- a/FontArt/ArtFont_1/ArtFont_1.fnt +++ b/FontArt/ArtFont_1/ArtFont_1.fnt @@ -1,15 +1,15 @@ info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 -common lineHeight=32 base=26 scaleW=256 scaleH=128 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 +common lineHeight=32 base=26 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 page id=0 file="ArtFont_1_0.png" chars count=11 -char id=46 x=235 y=0 width=12 height=16 xoffset=0 yoffset=0 xadvance=12 page=0 chnl=15 -char id=48 x=0 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=49 x=47 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=50 x=94 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=51 x=141 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=52 x=188 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=53 x=0 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=54 x=47 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=55 x=94 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=56 x=141 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 -char id=57 x=188 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=46 x=0 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=48 x=47 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=49 x=94 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=50 x=141 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=51 x=188 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=52 x=0 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=53 x=47 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=54 x=94 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=55 x=141 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=56 x=188 y=47 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 +char id=57 x=0 y=94 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 diff --git a/FontArt/ArtFont_1/ArtFont_1_0.png b/FontArt/ArtFont_1/ArtFont_1_0.png index eecc7f07ec..f5f4495cc0 100644 Binary files a/FontArt/ArtFont_1/ArtFont_1_0.png and b/FontArt/ArtFont_1/ArtFont_1_0.png differ diff --git a/FontArt/ArtFont_1/c_czlb_dian.png b/FontArt/ArtFont_1/c_czlb_dian.png index ec04c80fbc..0787c93dc7 100644 Binary files a/FontArt/ArtFont_1/c_czlb_dian.png and b/FontArt/ArtFont_1/c_czlb_dian.png differ diff --git a/FontArt/ArtFont_1/config.bmfc b/FontArt/ArtFont_1/config.bmfc index 791d4064a1..cfcd450902 100644 --- a/FontArt/ArtFont_1/config.bmfc +++ b/FontArt/ArtFont_1/config.bmfc @@ -35,7 +35,7 @@ widthPaddingFactor=0.00 # output file outWidth=256 -outHeight=128 +outHeight=256 outBitDepth=32 fontDescFormat=0 fourChnlPacked=0 @@ -54,7 +54,7 @@ invB=0 outlineThickness=0 # selected chars - +chars=46 # imported icon images icon="c_czlb_0.png",48,0,0,0 diff --git a/FontArt/ArtFont_2/ArtFont_2.fnt b/FontArt/ArtFont_2/ArtFont_2.fnt index f29ad71a22..38342f4e88 100644 --- a/FontArt/ArtFont_2/ArtFont_2.fnt +++ b/FontArt/ArtFont_2/ArtFont_2.fnt @@ -2,14 +2,14 @@ info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smoo common lineHeight=32 base=26 scaleW=512 scaleH=512 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 page id=0 file="ArtFont_2_0.png" chars count=11 -char id=46 x=468 y=162 width=39 height=39 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=15 -char id=48 x=121 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 -char id=49 x=114 y=324 width=95 height=159 xoffset=0 yoffset=0 xadvance=95 page=0 chnl=15 -char id=50 x=0 y=324 width=113 height=159 xoffset=0 yoffset=0 xadvance=113 page=0 chnl=15 -char id=51 x=0 y=162 width=117 height=161 xoffset=0 yoffset=0 xadvance=117 page=0 chnl=15 -char id=52 x=229 y=162 width=121 height=159 xoffset=0 yoffset=0 xadvance=121 page=0 chnl=15 -char id=53 x=118 y=162 width=110 height=160 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15 +char id=46 x=121 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=48 x=240 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=49 x=231 y=324 width=95 height=159 xoffset=0 yoffset=0 xadvance=95 page=0 chnl=15 +char id=50 x=117 y=324 width=113 height=159 xoffset=0 yoffset=0 xadvance=113 page=0 chnl=15 +char id=51 x=119 y=162 width=117 height=161 xoffset=0 yoffset=0 xadvance=117 page=0 chnl=15 +char id=52 x=348 y=162 width=121 height=159 xoffset=0 yoffset=0 xadvance=121 page=0 chnl=15 +char id=53 x=237 y=162 width=110 height=160 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15 char id=54 x=0 y=0 width=120 height=161 xoffset=0 yoffset=0 xadvance=120 page=0 chnl=15 -char id=55 x=351 y=162 width=116 height=159 xoffset=0 yoffset=0 xadvance=116 page=0 chnl=15 -char id=56 x=240 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 -char id=57 x=359 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=55 x=0 y=324 width=116 height=159 xoffset=0 yoffset=0 xadvance=116 page=0 chnl=15 +char id=56 x=359 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=57 x=0 y=162 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 diff --git a/FontArt/ArtFont_2/ArtFont_2_0.png b/FontArt/ArtFont_2/ArtFont_2_0.png index bcc9fc457f..3721c293dc 100644 Binary files a/FontArt/ArtFont_2/ArtFont_2_0.png and b/FontArt/ArtFont_2/ArtFont_2_0.png differ diff --git a/FontArt/ArtFont_2/config.bmfc b/FontArt/ArtFont_2/config.bmfc index 8b5c397ad2..0042c3966c 100644 --- a/FontArt/ArtFont_2/config.bmfc +++ b/FontArt/ArtFont_2/config.bmfc @@ -34,8 +34,8 @@ forceZero=0 widthPaddingFactor=0.00 # output file -outWidth=256 -outHeight=128 +outWidth=512 +outHeight=512 outBitDepth=32 fontDescFormat=0 fourChnlPacked=0 diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_dian.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_dian.png index 70c6076810..b353c547b4 100644 Binary files a/FontArt/ArtFont_2/r_lianxuchongzhizi_dian.png and b/FontArt/ArtFont_2/r_lianxuchongzhizi_dian.png differ