From a26c76aa60a3de9bb3f9ad1118b7a972e4000100 Mon Sep 17 00:00:00 2001 From: 0auBSQ <58159635+0auBSQ@users.noreply.github.com> Date: Thu, 25 Jul 2024 01:44:49 +0900 Subject: [PATCH] stars --- OpenTaiko/Saves.db3 | Bin 114688 -> 114688 bytes .../Modules/NamePlate/Config.json | 13 +- .../Modules/NamePlate/Script.lua | 73 ++++- .../Modules/NamePlate/Textures/Stars/1/0.png | Bin 0 -> 6230 bytes .../Modules/NamePlate/Textures/Stars/2/0.png | Bin 0 -> 6683 bytes .../Modules/NamePlate/Textures/Stars/3/0.png | Bin 0 -> 7881 bytes OpenTaiko/src/Common/SaveFile.cs | 6 + OpenTaiko/src/Databases/DBSaves.cs | 4 + .../src/Lua/Scripts/CLuaNamePlateScript.cs | 4 +- OpenTaiko/src/Stages/11.Heya/CStageHeya.cs | 24 +- OpenTaiko/src/Stages/CNamePlate.cs | 286 ------------------ 11 files changed, 111 insertions(+), 299 deletions(-) create mode 100644 OpenTaiko/System/Open-World Memories/Modules/NamePlate/Textures/Stars/1/0.png create mode 100644 OpenTaiko/System/Open-World Memories/Modules/NamePlate/Textures/Stars/2/0.png create mode 100644 OpenTaiko/System/Open-World Memories/Modules/NamePlate/Textures/Stars/3/0.png diff --git a/OpenTaiko/Saves.db3 b/OpenTaiko/Saves.db3 index 1aadfa70fc255d7ee510bb0a63d30611516c00cf..e52103b0e4e2a8520a616f28e90b929c11a6f20f 100644 GIT binary patch delta 771 zcmZuuOK1~O6n%F-nHeX^n>1+?n@VbF^HFJjjbdmFcIUzp>Y_W7362s>Lrq4Zh?tEO z7Z$@nXQ>3~)=I#EY|^EWMa`;$tAYd<0TEmkb$m%daLl{!z`1ZZ_i}E%&eiMOOTWvH z5Sk&FCSVAzHZCQ>|E}-`PjJp-gg@bZyp3<;6c(MwEtk}FX2Ui&nml)w=Xp$O_>cg% z9u^ZT%DqyhqE!34`(N7aSj-HwW0ZO<0G_92h;bv=KQ16ZE@ky#%n&_JxMUU5W{4Um zOj?DM83gxD%WQ$n{(t`c^dpVFK2T6~{M+kq%N4Spy1WXC#%YYcSbxkn)7$;_I#4_dcCj{YWW?{ zz__~%&q43TK-6A2SYb`Bmej2q6;cghWk#q||(oCDL7_=o9@Q2^aL0Yv5sh zBqn3jYXjCJ(xg>~yS=z>9H+rfPtVTf%JP;{U6nVK&9ba2mi6>O2EtS_q4%yp$oP>Z m*`MZ?gJ1ZR6$mq!0{q19>mW*km)vHGV1gWFfSa=t`F{YN+t79Z delta 738 zcmZo@U~gz(pCBzL#lXNI1H>Sj1&B>2>KHRhZA@6gznH~Afrpv@Is^Yl{%8Ex`44VZ zR9Mfi$7fUy@mplUmHlz4?W`%mrq4 zzHi&v1sMOy%d_og;QY^-&2^n?4Ob)Eel8mh7WVV}r};!6aN|@g8TqA6;*HQPH<1LYDn?c%ZxU~ap$cSHG|=@7 zn#z;U^DA)}6(^Q)nJ~|se34&G8Ysz}CoV3|*b@o%5l}9*7)-EEFSKDiAIN@!u|`~9 zpRrXDB99&b=++rZItRHrhPWz(I6C>bDkx#dZ+Ea@)Mnhi-;8k=GYg*x1IP4QD@J`L zO&y@)G`PjuthCv|?g`$WXv4_EJbi{4qdFS{1LJlik1DeRBad+I) z>F4bkRRxR@kphflMnjOO0lNe+82%t>+fsum`sGS*znfQP4-{b$XS= 5 then + star_count = 3 + end + + if star_count > 0 then + star_frame = 1 + math.ceil(titleplate_counter * (#title_stars[star_count] - 1)) + tx_titlestar = title_stars[star_count][star_frame] + tx_titlestar.Opacity = opacity + tx_titlestar:t2D_DisplayImage(x + config_title_plate_offset_x, y + config_title_plate_offset_y) + end +end + function implDrawTitlePlate(x, y, opacity, titleTexIndex) if titleTexIndex >= 1 and titleTexIndex <= #title_plates then titleplate_frame = 1 + math.ceil(titleplate_counter * (#title_plates[titleTexIndex] - 1)) @@ -215,7 +243,7 @@ function getCharaOffset() end function setInfos(player, name, title, dan, data) - player_lua = player + 1 + local player_lua = player + 1 player_data[player_lua] = data @@ -281,6 +309,7 @@ function loadAssets() end players_blue = loadTexture("1P_Blue.png") + --Load title plates for i = 1, #config_titletypes do titledir = "Title/"..config_titletypes[i] @@ -307,6 +336,25 @@ function loadAssets() end end + + --Load rarity stars + for i = 1, #title_stars_folders do + stardir = "Stars/"..title_stars_folders[i] + + title_stars_config = config["stars"][title_stars_folders[i]] + + config_stars_framecount = 0 + + if title_stars_config ~= nil then + config_stars_framecount = getNum(title_stars_config["framecount"]) + end + + local stars = { } + for j = 0, config_stars_framecount do + stars[j + 1] = loadTexture(stardir.."/"..j..".png") + end + title_stars[i] = stars + end font_name_normal_size = loadFontRenderer(config_font_name_normal_size, "regular") font_name_withtitle = loadFontRenderer(config_font_name_withtitle_size, "regular") @@ -314,7 +362,11 @@ function loadAssets() font_dan = loadFontRenderer(config_font_dan_size, "regular") end -function drawDan(x, y, opacity, type, titleTex) +function drawDan(o_x, o_y, opacity, type, titleTex) + --Shift on side bar + local x = o_x - 180 + local y = o_y + 5 + --White background base.Opacity = opacity base:t2D_DisplayImage(x, y) @@ -336,7 +388,11 @@ function drawDan(x, y, opacity, type, titleTex) end end -function drawTitlePlate(x, y, opacity, titletype, titleTex) +function drawTitlePlate(o_x, o_y, opacity, titletype, titleTex, rarityInt, nameplateId) + --Shift on side bar + local x = o_x - 180 + local y = o_y + 5 + --White background base.Opacity = opacity base:t2D_DisplayImage(x, y) @@ -344,6 +400,9 @@ function drawTitlePlate(x, y, opacity, titletype, titleTex) --Upper (title) plate implDrawTitlePlate(x, y, opacity, titletype + 1) + --Rarity stars + implDrawRarityStars(x, y, opacity, rarityInt) + --Glow implDrawTitleEffect(x, y, titletype + 1) @@ -369,8 +428,9 @@ function update() end function draw(x, y, opacity, player, side) - player_lua = player + 1 - side_lua = side + 1 + local player_lua = player + 1 + local side_lua = side + 1 + local rarityInt = player_data[player_lua].TitleRarityInt --White background base.Opacity = opacity @@ -381,6 +441,9 @@ function draw(x, y, opacity, player, side) if not(notitle[player_lua]) then implDrawTitlePlate(x, y, opacity, titleplate_index) end + + --Rarity stars + implDrawRarityStars(x, y, opacity, rarityInt) --Dan plate if not(player_data[player_lua].Dan == nil) and not(player_data[player_lua].Dan == "") then diff --git a/OpenTaiko/System/Open-World Memories/Modules/NamePlate/Textures/Stars/1/0.png b/OpenTaiko/System/Open-World Memories/Modules/NamePlate/Textures/Stars/1/0.png new file mode 100644 index 0000000000000000000000000000000000000000..02fcb6a886a5ede29a00ef89f79ded78fdd08d1c GIT binary patch literal 6230 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 literal 0 HcmV?d00001 diff --git a/OpenTaiko/src/Common/SaveFile.cs b/OpenTaiko/src/Common/SaveFile.cs index 474d47ad..4488b829 100644 --- a/OpenTaiko/src/Common/SaveFile.cs +++ b/OpenTaiko/src/Common/SaveFile.cs @@ -223,6 +223,12 @@ namespace TJAPlayer3 [JsonProperty("titleType")] public int TitleType = 0; + [JsonIgnore] + public int TitleRarityInt = 1; + + [JsonIgnore] + public int TitleId = -1; + [JsonProperty("puchiChara")] public string PuchiChara = "0"; diff --git a/OpenTaiko/src/Databases/DBSaves.cs b/OpenTaiko/src/Databases/DBSaves.cs index 288f9142..37e4e4ea 100644 --- a/OpenTaiko/src/Databases/DBSaves.cs +++ b/OpenTaiko/src/Databases/DBSaves.cs @@ -180,6 +180,8 @@ namespace TJAPlayer3 sf.data.TotalPlaycount = (int)(Int64)reader["TotalPlaycount"]; sf.data.AIBattleModePlaycount = (int)(Int64)reader["AIBattleModePlaycount"]; sf.data.AIBattleModeWins = (int)(Int64)reader["AIBattleModeWins"]; + sf.data.TitleRarityInt = (int)(Int64)reader["PlayerNameplateRarityInt"]; + sf.data.TitleId = (int)(Int64)reader["PlayerNameplateId"]; sf.tInitSaveFile(); sf.tLoadUnlockables(); @@ -233,6 +235,8 @@ namespace TJAPlayer3 PlayerNameplateType = {SaveData.TitleType}, PlayerPuchichara = '{SaveData.PuchiChara.EscapeSingleQuotes()}', PlayerCharacter = {SaveData.Character}, + PlayerNameplateRarityInt = {SaveData.TitleRarityInt}, + PlayerNameplateId = {SaveData.TitleId}, PlayerCharacterName = '{SaveData.CharacterName.EscapeSingleQuotes()}' WHERE SaveId = {SaveData.SaveId}; ;"; diff --git a/OpenTaiko/src/Lua/Scripts/CLuaNamePlateScript.cs b/OpenTaiko/src/Lua/Scripts/CLuaNamePlateScript.cs index dced065f..dfd15ab0 100644 --- a/OpenTaiko/src/Lua/Scripts/CLuaNamePlateScript.cs +++ b/OpenTaiko/src/Lua/Scripts/CLuaNamePlateScript.cs @@ -48,11 +48,11 @@ namespace TJAPlayer3 RunLuaCode(lfDrawDan, x, y, opacity, danGrade, titleTex); } - public void DrawTitlePlate(int x, int y, int opacity, int type, CTexture titleTex) + public void DrawTitlePlate(int x, int y, int opacity, int type, CTexture titleTex, int rarity, int nameplateId) { if (!Avaibale) return; - RunLuaCode(lfDrawTitlePlate, x, y, opacity, type, titleTex); + RunLuaCode(lfDrawTitlePlate, x, y, opacity, type, titleTex, rarity, nameplateId); } public void Update(params object[] args) diff --git a/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs b/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs index e593a295..997156d0 100644 --- a/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs +++ b/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs @@ -472,12 +472,16 @@ namespace TJAPlayer3 var scroll = DrawSide_Menu(i + (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2)); int iType = -1; + int _rarity = 1; + int _titleid = -1; if (TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null && TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds.Contains(this.titlesKeys[pos])) { var _dc = TJAPlayer3.Databases.DBNameplateUnlockables.data[this.titlesKeys[pos]]; iType = _dc.nameplateInfo.iType; + _rarity = HRarity.tRarityToLangInt(_dc.rarity); + _titleid = this.titlesKeys[pos]; //iType = TJAPlayer3.SaveFileInstances[iPlayer].data.NamePlateTitles[this.titlesKeys[pos]].iType; } else if (pos == 0) @@ -492,7 +496,7 @@ namespace TJAPlayer3 } */ - TJAPlayer3.NamePlate.lcNamePlate.DrawTitlePlate(scroll.Item1, scroll.Item2, 255, iType, tmpTex); + TJAPlayer3.NamePlate.lcNamePlate.DrawTitlePlate(scroll.Item1, scroll.Item2, 255, iType, tmpTex, _rarity, _titleid); //tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[0], scroll.Item2 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[1]); @@ -720,12 +724,22 @@ namespace TJAPlayer3 { var _dc = TJAPlayer3.Databases.DBNameplateUnlockables.data[this.titlesKeys[iTitleCurrent]]; TJAPlayer3.SaveFileInstances[iPlayer].data.TitleType = _dc.nameplateInfo.iType; + TJAPlayer3.SaveFileInstances[iPlayer].data.TitleId = this.titlesKeys[iTitleCurrent]; + TJAPlayer3.SaveFileInstances[iPlayer].data.TitleRarityInt = HRarity.tRarityToLangInt(_dc.rarity); + } + else if (iTitleCurrent == 0) + { + TJAPlayer3.SaveFileInstances[iPlayer].data.TitleType = 0; + TJAPlayer3.SaveFileInstances[iPlayer].data.TitleId = -1; + TJAPlayer3.SaveFileInstances[iPlayer].data.TitleRarityInt = 1; + } + else + { + TJAPlayer3.SaveFileInstances[iPlayer].data.TitleType = -1; + TJAPlayer3.SaveFileInstances[iPlayer].data.TitleId = -1; + TJAPlayer3.SaveFileInstances[iPlayer].data.TitleRarityInt = 1; } - else if (iTitleCurrent == 0) - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleType = 0; - else - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleType = -1; TJAPlayer3.NamePlate.tNamePlateRefreshTitles(iPlayer); diff --git a/OpenTaiko/src/Stages/CNamePlate.cs b/OpenTaiko/src/Stages/CNamePlate.cs index c7b3f1a3..e305bbd4 100644 --- a/OpenTaiko/src/Stages/CNamePlate.cs +++ b/OpenTaiko/src/Stages/CNamePlate.cs @@ -124,17 +124,6 @@ namespace TJAPlayer3 int basePlayer = player; player = TJAPlayer3.GetActualPlayer(player); - //tNamePlateRefreshTitles(player); - - /* - ctNamePlateEffect.TickLoop(); - ctAnimatedNamePlateTitle.TickLoop(); - - this.txName[player].Opacity = Opacity; - this.txTitle[player].Opacity = Opacity; - this.txdan[player].Opacity = Opacity; - */ - bool isAI = TJAPlayer3.ConfigIni.bAIBattleMode && basePlayer == 1; if (bIsPrevAI[basePlayer] != isAI) { @@ -143,283 +132,8 @@ namespace TJAPlayer3 bIsPrevAI[basePlayer] = isAI; lcNamePlate.Draw(x, y, Opacity, basePlayer, player); - - /* - TJAPlayer3.Tx.NamePlateBase.Opacity = Opacity; - - - for (int i = 0; i < 5; i++) - TJAPlayer3.Tx.NamePlate_Effect[i].Opacity = Opacity; - - // White background - tNamePlateDisplayNamePlateBase(x, y, 3); - - // Upper (title) plate - if (TJAPlayer3.SaveFileInstances[player].data.Title != "" && TJAPlayer3.SaveFileInstances[player].data.Title != null) - { - int tt = TJAPlayer3.SaveFileInstances[player].data.TitleType; - if (tt >= 0 && tt < TJAPlayer3.Skin.Config_NamePlate_Ptn_Title) - { - var _tex = TJAPlayer3.Tx.NamePlate_Title[tt][ctAnimatedNamePlateTitle.CurrentValue % TJAPlayer3.Skin.Config_NamePlate_Ptn_Title_Boxes[tt]]; - - if (_tex != null) - { - _tex.Opacity = Opacity; - _tex.t2D描画(x - (2 * resolutionScaleX), y - (2 * resolutionScaleY)); - } - } - } - - // Dan plate - if (TJAPlayer3.SaveFileInstances[player].data.Dan != "" && TJAPlayer3.SaveFileInstances[player].data.Dan != null) - { - tNamePlateDisplayNamePlateBase(x, y, 7); - tNamePlateDisplayNamePlateBase(x, y, (8 + TJAPlayer3.SaveFileInstances[player].data.DanType)); - } - - // Glow - tNamePlateDraw(player, x, y, Opacity); - - // Player number - if (TJAPlayer3.PlayerSide == 0 || TJAPlayer3.ConfigIni.nPlayerCount > 1) - { - if (basePlayer < 2) - { - tNamePlateDisplayNamePlateBase(x, y, basePlayer == 1 ? 2 : 0); - } - else - { - tNamePlateDisplayNamePlate_Extension(x, y, basePlayer - 2); - } - } - else - tNamePlateDisplayNamePlateBase(x, y, 1); - - // Name text squash (to add to skin config) - if (TJAPlayer3.SaveFileInstances[player].data.Dan != "" && TJAPlayer3.SaveFileInstances[player].data.Dan != null) - { - if (txName[player].szTextureSize.Width > TJAPlayer3.Skin.NamePlate_Name_Width_Full) - txName[player].vcScaleRatio.X = (float)TJAPlayer3.Skin.NamePlate_Name_Width_Full / txName[player].szTextureSize.Width; - } - else - { - if (txName[player].szTextureSize.Width > TJAPlayer3.Skin.NamePlate_Name_Width_Normal) - txName[player].vcScaleRatio.X = (float)TJAPlayer3.Skin.NamePlate_Name_Width_Normal / txName[player].szTextureSize.Width; - } - - // Dan text squash (to add to skin config) - if (txdan[player].szTextureSize.Width > TJAPlayer3.Skin.NamePlate_Dan_Width) - txdan[player].vcScaleRatio.X = (float)TJAPlayer3.Skin.NamePlate_Dan_Width / txdan[player].szTextureSize.Width; - - // Dan text - if (TJAPlayer3.SaveFileInstances[player].data.Dan != "" && TJAPlayer3.SaveFileInstances[player].data.Dan != null) - { - this.txdan[player].t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.NamePlate_Dan_Offset[0], y + TJAPlayer3.Skin.NamePlate_Dan_Offset[1]); - } - - // Title text - if (TJAPlayer3.SaveFileInstances[player].data.Title != "" && TJAPlayer3.SaveFileInstances[player].data.Title != null) - { - if (txTitle[player].szTextureSize.Width > TJAPlayer3.Skin.NamePlate_Title_Width) - { - txTitle[player].vcScaleRatio.X = (float)TJAPlayer3.Skin.NamePlate_Title_Width / txTitle[player].szTextureSize.Width; - txTitle[player].vcScaleRatio.Y = (float)TJAPlayer3.Skin.NamePlate_Title_Width / txTitle[player].szTextureSize.Width; - } - - txTitle[player].t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.NamePlate_Title_Offset[0], y + TJAPlayer3.Skin.NamePlate_Title_Offset[1]); - - // Name text - if (TJAPlayer3.SaveFileInstances[player].data.Dan == "" || TJAPlayer3.SaveFileInstances[player].data.Dan == null) - this.txName[player].t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.NamePlate_Name_Offset_WithTitle[0], y + TJAPlayer3.Skin.NamePlate_Name_Offset_WithTitle[1]); - else - this.txName[player].t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.NamePlate_Name_Offset_Full[0], y + TJAPlayer3.Skin.NamePlate_Name_Offset_Full[1]); - } - else - this.txName[player].t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.NamePlate_Name_Offset_Normal[0], y + TJAPlayer3.Skin.NamePlate_Name_Offset_Normal[1]); - - - // Overlap frame - tNamePlateDisplayNamePlateBase(x, y, 4); - */ } - /* - private void tNamePlateDraw(int player, int x, int y, int Opacity = 255) - { - if (Opacity == 0) - return; - - float resolutionScaleX = TJAPlayer3.Skin.Resolution[0] / 1280.0f; - float resolutionScaleY = TJAPlayer3.Skin.Resolution[1] / 720.0f; - - if (TJAPlayer3.SaveFileInstances[player].data.TitleType != 0 && !TJAPlayer3.ConfigIni.SimpleMode) - { - int Type = TJAPlayer3.SaveFileInstances[player].data.TitleType - 1; - if (this.ctNamePlateEffect.CurrentValue <= 10) - { - tNamePlateStarDraw(player, 1.0f - (ctNamePlateEffect.CurrentValue / 10f * 1.0f), x + (63 * resolutionScaleX), y + (25 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 3 && this.ctNamePlateEffect.CurrentValue <= 10) - { - tNamePlateStarDraw(player, 1.0f - ((ctNamePlateEffect.CurrentValue - 3) / 7f * 1.0f), x + (38 * resolutionScaleX), y + (7 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 6 && this.ctNamePlateEffect.CurrentValue <= 10) - { - tNamePlateStarDraw(player, 1.0f - ((ctNamePlateEffect.CurrentValue - 6) / 4f * 1.0f), x + (51 * resolutionScaleX), y + (5 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 8 && this.ctNamePlateEffect.CurrentValue <= 10) - { - tNamePlateStarDraw(player, 0.3f - ((ctNamePlateEffect.CurrentValue - 8) / 2f * 0.3f), x + (110 * resolutionScaleX), y + (25 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 11 && this.ctNamePlateEffect.CurrentValue <= 13) - { - tNamePlateStarDraw(player, 1.0f - ((ctNamePlateEffect.CurrentValue - 11) / 2f * 1.0f), x + (38 * resolutionScaleX), y + (7 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 11 && this.ctNamePlateEffect.CurrentValue <= 15) - { - tNamePlateStarDraw(player, 1.0f, x + (51 * resolutionScaleX), y + 5); - } - if (this.ctNamePlateEffect.CurrentValue >= 11 && this.ctNamePlateEffect.CurrentValue <= 17) - { - tNamePlateStarDraw(player, 1.0f - ((ctNamePlateEffect.CurrentValue - 11) / 7f * 1.0f), x + (110 * resolutionScaleX), y + (25 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 16 && this.ctNamePlateEffect.CurrentValue <= 20) - { - tNamePlateStarDraw(player, 0.2f - ((ctNamePlateEffect.CurrentValue - 16) / 4f * 0.2f), x + (63 * resolutionScaleX), y + (25 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 17 && this.ctNamePlateEffect.CurrentValue <= 20) - { - tNamePlateStarDraw(player, 1.0f - ((ctNamePlateEffect.CurrentValue - 17) / 3f * 1.0f), x + (99 * resolutionScaleX), y + (1 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 20 && this.ctNamePlateEffect.CurrentValue <= 24) - { - tNamePlateStarDraw(player, 0.4f, x + (63 * resolutionScaleX), y + 25); - } - if (this.ctNamePlateEffect.CurrentValue >= 20 && this.ctNamePlateEffect.CurrentValue <= 25) - { - tNamePlateStarDraw(player, 1.0f, x + (99 * resolutionScaleX), y + 1); - } - if (this.ctNamePlateEffect.CurrentValue >= 20 && this.ctNamePlateEffect.CurrentValue <= 30) - { - tNamePlateStarDraw(player, 0.5f - ((this.ctNamePlateEffect.CurrentValue - 20) / 10f * 0.5f), x + (152 * resolutionScaleX), y + (7 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 31 && this.ctNamePlateEffect.CurrentValue <= 37) - { - tNamePlateStarDraw(player, 0.5f - ((this.ctNamePlateEffect.CurrentValue - 31) / 6f * 0.5f), x + (176 * resolutionScaleX), y + (8 * resolutionScaleY)); - tNamePlateStarDraw(player, 1.0f - ((this.ctNamePlateEffect.CurrentValue - 31) / 6f * 1.0f), x + (175 * resolutionScaleX), y + (25 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 31 && this.ctNamePlateEffect.CurrentValue <= 40) - { - tNamePlateStarDraw(player, 0.9f - ((this.ctNamePlateEffect.CurrentValue - 31) / 9f * 0.9f), x + (136 * resolutionScaleX), y + (24 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 34 && this.ctNamePlateEffect.CurrentValue <= 40) - { - tNamePlateStarDraw(player, 0.7f - ((this.ctNamePlateEffect.CurrentValue - 34) / 6f * 0.7f), x + (159 * resolutionScaleX), y + (25 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 41 && this.ctNamePlateEffect.CurrentValue <= 42) - { - tNamePlateStarDraw(player, 0.7f, x + (159 * resolutionScaleX), y + (25 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 43 && this.ctNamePlateEffect.CurrentValue <= 50) - { - tNamePlateStarDraw(player, 0.8f - ((this.ctNamePlateEffect.CurrentValue - 43) / 7f * 0.8f), x + (196 * resolutionScaleX), y + (23 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 51 && this.ctNamePlateEffect.CurrentValue <= 57) - { - tNamePlateStarDraw(player, 0.8f - ((this.ctNamePlateEffect.CurrentValue - 51) / 6f * 0.8f), x + (51 * resolutionScaleX), y + (5 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 51 && this.ctNamePlateEffect.CurrentValue <= 52) - { - tNamePlateStarDraw(player, 0.2f, x + (166 * resolutionScaleX), y + (22 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 51 && this.ctNamePlateEffect.CurrentValue <= 53) - { - tNamePlateStarDraw(player, 0.8f, x + (136 * resolutionScaleX), y + (24 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 51 && this.ctNamePlateEffect.CurrentValue <= 55) - { - tNamePlateStarDraw(player, 1.0f, x + (176 * resolutionScaleX), y + (8 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 51 && this.ctNamePlateEffect.CurrentValue <= 55) - { - tNamePlateStarDraw(player, 1.0f, x + (176 * resolutionScaleX), y + (8 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 61 && this.ctNamePlateEffect.CurrentValue <= 70) - { - tNamePlateStarDraw(player, 1.0f - ((this.ctNamePlateEffect.CurrentValue - 61) / 9f * 1.0f), x + (196 * resolutionScaleX), y + (23 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 61 && this.ctNamePlateEffect.CurrentValue <= 67) - { - tNamePlateStarDraw(player, 0.7f - ((this.ctNamePlateEffect.CurrentValue - 61) / 6f * 0.7f), x + (214 * resolutionScaleX), y + (14 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 63 && this.ctNamePlateEffect.CurrentValue <= 70) - { - tNamePlateStarDraw(player, 0.5f - ((this.ctNamePlateEffect.CurrentValue - 63) / 7f * 0.5f), x + (129 * resolutionScaleX), y + (24 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 63 && this.ctNamePlateEffect.CurrentValue <= 70) - { - tNamePlateStarDraw(player, 0.5f - ((this.ctNamePlateEffect.CurrentValue - 63) / 7f * 0.5f), x + (129 * resolutionScaleX), y + (24 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 65 && this.ctNamePlateEffect.CurrentValue <= 70) - { - tNamePlateStarDraw(player, 0.8f - ((this.ctNamePlateEffect.CurrentValue - 65) / 5f * 0.8f), x + (117 * resolutionScaleX), y + (7 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 71 && this.ctNamePlateEffect.CurrentValue <= 72) - { - tNamePlateStarDraw(player, 0.8f, x + (151 * resolutionScaleX), y + (25 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 71 && this.ctNamePlateEffect.CurrentValue <= 74) - { - tNamePlateStarDraw(player, 0.8f, x + (117 * resolutionScaleX), y + (7 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 85 && this.ctNamePlateEffect.CurrentValue <= 112) - { - TJAPlayer3.Tx.NamePlate_Effect[4].Opacity = (int)(1400 - (this.ctNamePlateEffect.CurrentValue - 85) * 50f); - - TJAPlayer3.Tx.NamePlate_Effect[4].t2D描画(x + ((((this.ctNamePlateEffect.CurrentValue - 85) * (150f / 27f))) * resolutionScaleX), y + (7 * resolutionScaleY)); - } - if (this.ctNamePlateEffect.CurrentValue >= 105 && this.ctNamePlateEffect.CurrentValue <= 120) - { - int tt = TJAPlayer3.SaveFileInstances[player].data.TitleType; - if (tt >= 0 && tt < TJAPlayer3.Skin.Config_NamePlate_Ptn_Title && TJAPlayer3.Tx.NamePlate_Title_Big[tt] != null) { - TJAPlayer3.Tx.NamePlate_Title_Big[tt].Opacity = this.ctNamePlateEffect.CurrentValue >= 112 ? (int)(255 - (this.ctNamePlateEffect.CurrentValue - 112) * 31.875f) : 255; - TJAPlayer3.Tx.NamePlate_Title_Big[tt].vcScaleRatio.X = this.ctNamePlateEffect.CurrentValue >= 112 ? 1.0f : (this.ctNamePlateEffect.CurrentValue - 105) / 8f; - TJAPlayer3.Tx.NamePlate_Title_Big[tt].vcScaleRatio.Y = this.ctNamePlateEffect.CurrentValue >= 112 ? 1.0f : (this.ctNamePlateEffect.CurrentValue - 105) / 8f; - TJAPlayer3.Tx.NamePlate_Title_Big[tt].t2D拡大率考慮中央基準描画(x + (193 * resolutionScaleX), y + (6 * resolutionScaleY)); - } - - } - } - } - */ - - /* - private void tNamePlateStarDraw(int player, float Scale, float x, float y) - { - int tt = TJAPlayer3.SaveFileInstances[player].data.TitleType; - if (tt >= 0 && tt < TJAPlayer3.Skin.Config_NamePlate_Ptn_Title && TJAPlayer3.Tx.NamePlate_Title_Small[tt] != null) - { - TJAPlayer3.Tx.NamePlate_Title_Small[tt].vcScaleRatio.X = Scale; - TJAPlayer3.Tx.NamePlate_Title_Small[tt].vcScaleRatio.Y = Scale; - TJAPlayer3.Tx.NamePlate_Title_Small[tt].t2D拡大率考慮中央基準描画(x, y); - } - - } - */ - - /* - private CCachedFontRenderer[] pfName = new CCachedFontRenderer[5]; - private CCachedFontRenderer pfTitle; - private CCachedFontRenderer pfdan; - private CCounter ctNamePlateEffect; - - public CCounter ctAnimatedNamePlateTitle; - - private CTexture[] txName = new CTexture[5]; - private CTexture[] txTitle = new CTexture[5]; - private CTexture[] txdan = new CTexture[5]; - */ - private bool[] bIsPrevAI = new bool[5]; } } \ No newline at end of file