diff --git a/OSL-Web/Pages/InGame/InGameView1_1Page.razor b/OSL-Web/Pages/InGame/InGameView1_1Page.razor index 15bc638..4d4d974 100644 --- a/OSL-Web/Pages/InGame/InGameView1_1Page.razor +++ b/OSL-Web/Pages/InGame/InGameView1_1Page.razor @@ -439,9 +439,46 @@ - - - + // + +
+
+
+ +
+
+ @foreach (string dragon in DataProcessing.InGame.gameInformation.Order.Drakes) + { + + } + @if (DataProcessing.InGame.gameInformation.Chaos.Drakes.Count() == 4) + { + for (int i = 0; i < DataProcessing.InGame.gameInformation.Order.Drakes.Count() - 4; i++) + { + + } + } +
+
+
+
+ +
+
+ @foreach (string dragon in DataProcessing.InGame.gameInformation.Chaos.Drakes) + { + + } + @if (DataProcessing.InGame.gameInformation.Order.Drakes.Count() == 4) + { + for (int i = 0; i < 4 - DataProcessing.InGame.gameInformation.Chaos.Drakes.Count(); i++) + { + + } + } +
+
+
diff --git a/OSL-Web/Pages/InGame/InGameView1_1Page.razor.cs b/OSL-Web/Pages/InGame/InGameView1_1Page.razor.cs index 0e5145e..15a880b 100644 --- a/OSL-Web/Pages/InGame/InGameView1_1Page.razor.cs +++ b/OSL-Web/Pages/InGame/InGameView1_1Page.razor.cs @@ -56,7 +56,7 @@ public static void ResetColor() public static bool ItemToDisplay(int idItem) { - var itemsNotDisplay = new List { 1001, 1004, 1006, 1011, 1018, 1026, 1027, 1028, 1029, 1031, 1033, 1035, 1036, 1037, 1038, 1039, 1040, 1042, 1043, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1082, 1083, 1104, 1500, 1501, 1502, 1503, 1504, 1506, 1507, 1508, 1509, 1540, 1511, 1512, 1515, 1516, 1516, 1517, 1518, 15119, 1520, 1521, 1522, 2001, 2003, 2007, 2008, 2010, 2015, 2019, 2031, 2033, 2049, 2050, 2051, 2052, 2055, 2141, 2142, 2143, 2144, 2403, 2421, 2422, 2424, 3012, 3023, 3024, 3035, 3039, 3051, 3057, 3067, 3070, 3076, 3077, 3082, 3086, 3108, 3112, 3113, 3114, 3123, 3128, 3133, 3134, 3140, 3145, 3155, 3177, 3184, 3191, 3211, 3330, 3340, 3348, 3349, 3363, 3364, 3400, 3130, 3599, 3600, 3801, 3802, 3803, 3850, 3851, 3854, 3855, 3858, 3859, 3860, 3862, 3863, 3864, 3901, 3902, 3903, 3916, 4004, 4010, 4403, 4630, 4632, 4635, 4638, 4641, 6670, 6677, 222051, 223112, 223177, 223184, 223185, 224403 }; + var itemsNotDisplay = new List { 1001, 1004, 1006, 1011, 1018, 1026, 1027, 1028, 1029, 1031, 1033, 1035, 1036, 1037, 1038, 1039, 1040, 1042, 1043, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1082, 1083, 1104, 1500, 1501, 1502, 1503, 1504, 1506, 1507, 1508, 1509, 1540, 1511, 1512, 1515, 1516, 1516, 1517, 1518, 15119, 1520, 1521, 1522, 2001, 2003, 2007, 2008, 2010, 2015, 2019, 2031, 2033, 2049, 2050, 2051, 2052, 2055, 2141, 2142, 2143, 2144, 2403, 2421, 2422, 2424, 3012, 3023, 3024, 3035, 3039, 3051, 3057, 3067, 3070, 3076, 3077, 3082, 3086, 3108, 3112, 3113, 3114, 3123, 3128, 3133, 3134, 3140, 3145, 3155, 3177, 3184, 3191, 3211, 3330, 3340, 3348, 3349, 3363, 3364, 3400, 3130, 3599, 3600, 3801, 3802, 3803, 3850, 3851, 3854, 3855, 3858, 3859, 3860, 3862, 3863, 3864, 3901, 3902, 3903, 3916, 4004, 4010, 4403, 4630, 4632, 4635, 4638, 4641, 6029, 6670, 6677, 222051, 223112, 223177, 223184, 223185, 224403 }; //var starterItems = new List { 1101, 1102, 1103 }; //var potionsConsumables = new List { 2138, 2139, 2140 }; //var distributedItems = new List { 3513 }; @@ -68,5 +68,37 @@ public static bool ItemToDisplay(int idItem) } return true; } + + public static string GetDragonPath(string dragon) + { + if (dragon.Equals("SRU_Dragon_Fire")) + { + return "/assets/ingame/dragon/infernal_dragon_icon.png"; + } + else if (dragon.Equals("SRU_Dragon_Chemtech")) + { + return "/assets/ingame/dragon/chemtech_dragon_icon.png"; + } + else if (dragon.Equals("SRU_Dragon_Air")) + { + return "/assets/ingame/dragon/cloud_dragon_icon.png"; + } + else if (dragon.Equals("SRU_Dragon_Hextech")) + { + return "/assets/ingame/dragon/hextech_dragon_icon.png"; + } + else if (dragon.Equals("SRU_Dragon_Earth")) + { + return "/assets/ingame/dragon/mountain_dragon_icon.png"; + } + else if (dragon.Equals("SRU_Dragon_Water")) + { + return "/assets/ingame/dragon/ocean_dragon_icon.png"; + } + else + { + return "/assets/ingame/dragon/no_dragon.png"; + } + } } } diff --git a/OSL-Web/Pages/InGame/InGameView1_1Page.razor.css b/OSL-Web/Pages/InGame/InGameView1_1Page.razor.css index 49c7a3d..15ce864 100644 --- a/OSL-Web/Pages/InGame/InGameView1_1Page.razor.css +++ b/OSL-Web/Pages/InGame/InGameView1_1Page.razor.css @@ -235,7 +235,7 @@ div { z-index: 100; } -.order-item-wrapper-frame .order-item-info{ +.order-item-wrapper-frame .order-item-info { height: 74px; width: 0px; background-color: #0b849e; @@ -265,9 +265,9 @@ div { /*.order-item-text { font-size: 10px;*/ - /*height: 72px; +/*height: 72px; width: 77px;*/ - /*display: table-cell; +/*display: table-cell; vertical-align: middle; text-align: center; animation: order-item-text 4s 1 linear; @@ -356,39 +356,38 @@ div { /*######################### Level ##########################*/ /*##########################################################*/ - .order-level-wrapper-0 { position: absolute; top: 153px; - left: 0px; + left: 3px; z-index: 100; } .order-level-wrapper-1 { position: absolute; top: 256px; - left: 0px; + left: 3px; z-index: 100; } .order-level-wrapper-2 { position: absolute; top: 359px; - left: 0px; + left: 3px; z-index: 100; } .order-level-wrapper-3 { position: absolute; top: 462px; - left: 0px; + left: 3px; z-index: 100; } .order-level-wrapper-4 { position: absolute; top: 564px; - left: 0px; + left: 3px; z-index: 100; } @@ -415,35 +414,35 @@ div { .chaos-level-wrapper-0 { position: absolute; top: 153px; - right: 0px; + right: 3px; z-index: 100; } .chaos-level-wrapper-1 { position: absolute; top: 256px; - right: 0px; + right: 3px; z-index: 100; } .chaos-level-wrapper-2 { position: absolute; - top: 358px; - right: 0px; + top: 359px; + right: 3px; z-index: 100; } .chaos-level-wrapper-3 { position: absolute; top: 462px; - right: 0px; + right: 3px; z-index: 100; } .chaos-level-wrapper-4 { position: absolute; top: 564px; - right: 0px; + right: 3px; z-index: 100; } @@ -528,9 +527,113 @@ div { /*margin: 0px 0px 0px -100px;*/ /*}*/ } +/*##########################################################*/ +/*######################### Dragon #########################*/ +/*##########################################################*/ + +.dragon-banner-kill, dragon-banner-kill-order, dragon-banner-kill-chaos { + position: absolute; +} + +.dragon-banner-kill-order-banner { + position: absolute; + height: 50px; + left: 659px; + /*left: 659px;*/ + top: 58px; +} + +.dragon-banner-kill-chaos-banner { + position: absolute; + height: 50px; + left: 1033px; + top: 58px; +} + + +.dragon-banner-kill-order-icon:nth-child(1) { + position: absolute; + height: 41.5px; + top: 61px; + left: 839.7px; +} + +.dragon-banner-kill-order-icon:nth-child(2) { + position: absolute; + height: 41.5px; + top: 61px; + left: 784.7px; +} + +.dragon-banner-kill-order-icon:nth-child(3) { + position: absolute; + height: 41.5px; + top: 61px; + left: 730px; +} + +.dragon-banner-kill-order-icon:nth-child(4) { + position: absolute; + height: 41.5px; + top: 61px; + left: 675px; +} +.dragon-banner-kill-chaos-icon:nth-child(1) { + position: absolute; + height: 41.5px; + top: 61px; + left: 1049px; +} +.dragon-banner-kill-chaos-icon:nth-child(2) { + position: absolute; + height: 41.5px; + top: 61px; + left: 1104px; +} +.dragon-banner-kill-chaos-icon:nth-child(3) { + position: absolute; + height: 41.5px; + top: 61px; + left: 1159px; +} + +.dragon-banner-kill-chaos-icon:nth-child(4) { + position: absolute; + height: 41.5px; + top: 61px; + left: 1214px; +} + +/*.dragon-banner-kill-order-icon:nth-child(1) { + position: absolute; + height: 41.5px; + top: 61px; + left: 839.7px; +} + +.dragon-banner-kill-order-icon:nth-child(2) { + position: absolute; + height: 41.5px; + top: 61px; + left: 784.7px; +} + +.dragon-banner-kill-order-icon:nth-child(3) { + position: absolute; + height: 41.5px; + top: 61px; + left: 730px; +} + +.dragon-banner-kill-order-icon:nth-child(4) { + position: absolute; + height: 41.5px; + top: 61px; + left: 675px; +}*/ /*##########################################################*/