TERA_p3104/Client-Datasheets
1
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Post Merge Baldera

Browse Source
This commit is contained in:
Archgeus
2025-03-16 21:42:48 -05:00
parent 89951e164c
commit 31606b0e9e
7 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DataCenter_Final_EUR/MapDefineData/MapDefineData-00331.xml
View File

@@ -1,12 +1,7 @@
<MapDefineData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/MapDefineData MapDefineData.xsd" xmlns="https://vezel.dev/novadrop/dc/MapDefineData">
<<<<<<< HEAD
<MapDefine id="WMap_DG_BurningCave" backgroundImage="WMap_DG_BurningCave.WMap_DG_BurningCave" titleStringId="9757001" height="512" width="512" leftMargin="300" overlayMapId="img://__WMap_DG_BurningCave.WMap_DG_BurningCave" overlayMapType="dungeon" topMargin="100" />
</MapDefineData>
=======
<MapDefine id="WMap_ACN_Guard" backgroundImage="WMap_ACN.WMap_ACN_Guard" titleStringId="207" height="768" width="1024" leftMargin="0" topMargin="0">
<MapButton id="WMap_ACN_BTN" x="182" y="45" stringId="99100" click="WMap_ACN_Field" txtX="230" txtY="230" />
<Text x="695" y="400" stringId="58001" click="WMap_ACN_Vill_01" align="center" fontStyle="village" />
<Text x="397" y="630" stringId="203" click="" align="left" fontStyle="outside" />
</MapDefine>
</MapDefineData>
>>>>>>> baldera

6
DataCenter_Final_EUR/MapDefineData/MapDefineData-00332.xml
View File

@@ -1,8 +1,4 @@
<MapDefineData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/MapDefineData MapDefineData.xsd" xmlns="https://vezel.dev/novadrop/dc/MapDefineData">
<<<<<<< HEAD
<MapDefine id="WMap_DG_BurningCave_h" backgroundImage="WMap_DG_BurningCave.WMap_DG_BurningCave" titleStringId="9057001" height="512" width="512" leftMargin="300" overlayMapId="img://__WMap_DG_BurningCave.WMap_DG_BurningCave" overlayMapType="dungeon" topMargin="100" />
</MapDefineData>
=======
<MapDefine id="WMap_ACN_Vill_01" backgroundImage="WMap_ACN.WMap_ACN_Vill_01" titleStringId="1002" height="768" width="1024" leftMargin="0" overlayMapId="img://__WMap_Vill_Over.WMap_ACN_Vill_01_over" overlayMapType="village" topMargin="0">
<Text x="270" y="650" stringId="207" click="" align="left" fontStyle="outside" />
<Text x="430" y="280" stringId="5801007" click="" align="left" fontStyle="village" />
@@ -15,4 +11,4 @@
<Text x="300" y="600" stringId="5801015" click="" align="left" fontStyle="spot" />
</MapDefine>
</MapDefineData>
>>>>>>> baldera

3
DataCenter_Final_EUR/MapDefineData/MapDefineData-00335.xml Normal file
View File

@@ -0,0 +1,3 @@
<MapDefineData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/MapDefineData MapDefineData.xsd" xmlns="https://vezel.dev/novadrop/dc/MapDefineData">
<MapDefine id="WMap_DG_BurningCave" backgroundImage="WMap_DG_BurningCave.WMap_DG_BurningCave" titleStringId="9757001" height="512" width="512" leftMargin="300" overlayMapId="img://__WMap_DG_BurningCave.WMap_DG_BurningCave" overlayMapType="dungeon" topMargin="100" />
</MapDefineData>

3
DataCenter_Final_EUR/MapDefineData/MapDefineData-00336.xml Normal file
View File

@@ -0,0 +1,3 @@
<MapDefineData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/MapDefineData MapDefineData.xsd" xmlns="https://vezel.dev/novadrop/dc/MapDefineData">
<MapDefine id="WMap_DG_BurningCave_h" backgroundImage="WMap_DG_BurningCave.WMap_DG_BurningCave" titleStringId="9057001" height="512" width="512" leftMargin="300" overlayMapId="img://__WMap_DG_BurningCave.WMap_DG_BurningCave" overlayMapType="dungeon" topMargin="100" />
</MapDefineData>