Commit c065defb authored by deed's avatar deed

ajout des fichiers modifié de khanat-code et deplacment des fichiers generer par le shard

parent 0512a2a5
This diff is collapsed.
......@@ -2,73 +2,39 @@
<root id="interface" x="0" y="0" w="800" h="600" active="true" />
<lua file="bg_downloader.lua" />
<proc id="bg_downloader_active">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:BG_DOWNLOADER|value=1" />
</proc>
<proc id="bg_downloader_deactive">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:BG_DOWNLOADER|value=0" />
</proc>
<!-- Window for the background downloader -->
<group type="container" id="bg_downloader" title="uiBGD_WindowTitle" global_color="false" line_at_bottom="false"
movable="true" opened="true" openable="false"
pop_min_w="410" pop_min_h="100" pop_max_w="410" pop_max_h="100"
h="100"
w="410"
active="false"
savable="true"
header_color="UI:SAVE:WIN:COLORS:OPT"
on_deactive="proc" on_deactive_params="bg_downloader_deactive"
on_active="proc" on_active_params="bg_downloader_active"
>
<group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL"
group_onclick_r="active_menu"
group_params_r="menu=ui:interface:base_menu_with_color"
>
</group>
<group id="header_opened" x="0" y="0" w="800" h="16" posref="TL TL"
group_onclick_r="active_menu"
group_params_r="menu=ui:interface:base_menu_with_color"
>
<group type="container" id="bg_downloader" title="uiBGD_WindowTitle" global_color="false" line_at_bottom="false"movable="true" opened="true" openable="false" pop_min_w="410" pop_min_h="100" pop_max_w="410" pop_max_h="100" h="100" w="410" active="false" savable="true" header_color="UI:SAVE:WIN:COLORS:OPT" on_deactive="proc" on_deactive_params="bg_downloader_deactive" on_active="proc" on_active_params="bg_downloader_active">
<group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
</group>
<group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL" >
<view type="text" id="text" active="true" y="-12" posref="TM TM" hardtext="" fontsize="10" color="255 255 255 255"
auto_clamp="true"
global_color="false"
/>
<view type="text" id="ellipsis" active="true" y="0" posref="BR BL" posparent="text" hardtext="" fontsize="13" color="255 255 255 255"
global_color="false"
/>
<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR"
global_color="false"
/>
<view type="bar" id="progress" parent="" active="true" posparent="text" posref="BM TM" y="-2"
global_color="false"
/>
<group id="header_opened" x="0" y="0" w="800" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
</group>
<group type="combo_box" id="prio" sizeref="w" w="32" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false"
posref="BM TM"
posparent="progress"
on_change="lua:bgdownloader:onChangePriority()" on_change_params=""
tooltip="uiBGD_PriorityTooltip"
global_color="false"
>
<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
<group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL" >
<view type="text" id="text" active="true" y="-12" posref="TM TM" hardtext="" fontsize="10" color="255 255 255 255" auto_clamp="true" global_color="false" />
<view type="text" id="ellipsis" active="true" y="0" posref="BR BL" posparent="text" hardtext="" fontsize="13" color="255 255 255 255" global_color="false" />
<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR" global_color="false" />
<view type="bar" id="progress" parent="" active="true" posparent="text" posref="BM TM" y="-2" global_color="false" />
<group type="combo_box" id="prio" sizeref="w" w="32" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" posref="BM TM" posparent="progress" on_change="lua:bgdownloader:onChangePriority()" on_change_params="" tooltip="uiBGD_PriorityTooltip" global_color="false">
<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
<combo_text name="uiBGD_Paused" />
<combo_text name="uiBGD_LowPriority" />
<combo_text name="uiBGD_NormalPriority" />
<combo_text name="uiBGD_NormalPriority" />
</group>
</group>
</group>
<tree node="bg_downloader"/>
</interface_config>
\ No newline at end of file
</interface_config>
......@@ -1510,14 +1510,14 @@
posref="MR MR"
mini="true"
x="-16"
color1="%sta_color"
color1="ChaScore2_color"
value1="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore1"
range1="UI:CONST:127"
color2="%sap_color"
color2="%ChaScore3_color"
value2="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore2"
range2="UI:CONST:127"
color3="%hp_color"
color3_negative="%hp_color_neg"
color3="%ChaScore1_color"
color3_negative="%ChaScore1_color_neg"
value3="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore1"
range3="UI:CONST:127" />
<view type="bitmap"
......
......@@ -352,7 +352,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
<!-- ******************** -->
<!-- * CHECKING PROGESS * -->
<!-- * CHECKING PROGRESS * -->
<!-- ******************** -->
......
......@@ -52,7 +52,7 @@
<ctrl type="tooltip"
id="tt1"
on_tooltip="player_tt_stamina"
color="%sta_color"
color="%ChaScore2_color"
posparent="jauges"
posref="TL TL"
x="0"
......@@ -576,7 +576,7 @@
posparent="b_ChaScore1"
posref="TL TL"
color="214 56 7 255"
color_gray="160 42 5 255"
color_gray="200 42 5 255"
text="uiHP"
val="%player_ChaScore1"
maxval="%player_ChaScore1_max"
......@@ -587,7 +587,7 @@
posparent="b_ChaScore3"
posref="TL TL"
color="133 189 5 255"
color_gray="100 141 3 255"
color_gray="100 161 3 255"
text="uiSap"
val="%player_ChaScore3"
maxval="%player_ChaScore3_max"
......@@ -598,7 +598,7 @@
posparent="b_ChaScore2"
posref="TL TL"
color="202 67 152 255"
color_gray="151 50 114 255"
color_gray="181 50 134 255"
text="uiStamina"
val="%player_ChaScore2"
maxval="%player_ChaScore2_max"
......@@ -608,8 +608,8 @@
id="jChaScore4"
posparent="b_ChaScore4"
posref="TL TL"
color="31 155 197 255"
color_gray="23 116 147 255"
color="150 150 150 255"
color_gray="130 130 130 255"
text="uiFocus"
val="%player_ChaScore4"
maxval="%player_ChaScore4_max"
......
......@@ -3897,39 +3897,39 @@
active="false"
global_color="false"/>
<view type="bitmap"
id="ChaScore1_cost"
id="hp_cost"
texture="ico_heal.tga"
global_color="false"
posref="BL TL"
posparent="success_rate" />
<view type="bitmap"
id="ChaScore2_cost"
id="sta_cost"
y="0"
texture="ico_stamina.tga"
global_color="false"
posref="BL TL"
posparent="ChaScore1_cost" />
posparent="hp_cost" />
<view type="bitmap"
id="ChaScore3_cost"
id="sap_cost"
y="0"
texture="ico_sap.tga"
global_color="false"
posref="BL TL"
posparent="ChaScore2_cost" />
posparent="sta_cost" />
<view type="bitmap"
id="ChaScore4_cost"
id="focus_cost"
y="0"
texture="ico_focus.tga"
global_color="false"
posref="BL TL"
posparent="ChaScore3_cost" />
posparent="sap_cost" />
<view type="bitmap"
id="cast_time"
y="0"
texture="ico_time.tga"
global_color="false"
posref="BL TL"
posparent="ChaScore4_cost" />
posparent="focus_cost" />
<view type="bitmap"
id="cast_range"
y="0"
......@@ -3938,26 +3938,26 @@
posref="BL TL"
posparent="cast_time" />
<view type="text"
id="ChaScore1_cost_text"
posparent="ChaScore1_cost"
id="hp_cost_text"
posparent="hp_cost"
posref="MR ML"
hardtext="0"
global_color="false"/>
<view type="text"
id="ChaScore2_cost_text"
posparent="ChaScore2_cost"
id="sta_cost_text"
posparent="sta_cost"
posref="MR ML"
hardtext="0"
global_color="false"/>
<view type="text"
id="ChaScore3_cost_text"
posparent="ChaScore3_cost"
id="sap_cost_text"
posparent="sap_cost"
posref="MR ML"
hardtext="0"
global_color="false"/>
<view type="text"
id="ChaScore4_cost_text"
posparent="ChaScore4_cost"
id="focus_cost_text"
posparent="focus_cost"
posref="MR ML"
hardtext="0"
global_color="false"/>
......@@ -4104,7 +4104,7 @@
line_maxw="300"
multi_line_maxw_only="true" />
<view type="bitmap"
id="ChaScore1_buff"
id="hp_buff"
h="15"
y="0"
texture="ico_heal.tga"
......@@ -4113,47 +4113,47 @@
posparent="text"
active="true"/>
<view type="bitmap"
id="ChaScore2_buff"
id="sta_buff"
y="0"
texture="ico_stamina.tga"
global_color="false"
posref="BL TL"
posparent="ChaScore1_buff" />
posparent="hp_buff" />
<view type="bitmap"
id="ChaScore3_buff"
id="sap_buff"
y="0"
texture="ico_sap.tga"
global_color="false"
posref="BL TL"
posparent="ChaScore2_buff" />
posparent="sta_buff" />
<view type="bitmap"
id="ChaScore4_buff"
id="focus_buff"
y="0"
texture="ico_focus.tga"
global_color="false"
posref="BL TL"
posparent="ChaScore3_buff" />
posparent="sap_buff" />
<view type="text"
id="ChaScore1_buff_text"
posparent="ChaScore1_buff"
id="hp_buff_text"
posparent="hp_buff"
posref="MR ML"
hardtext="0"
global_color="false"/>
<view type="text"
id="ChaScore2_buff_text"
posparent="ChaScore2_buff"
id="sta_buff_text"
posparent="sta_buff"
posref="MR ML"
hardtext="0"
global_color="false"/>
<view type="text"
id="ChaScore3_buff_text"
posparent="ChaScore3_buff"
id="sap_buff_text"
posparent="sap_buff"
posref="MR ML"
hardtext="0"
global_color="false"/>
<view type="text"
id="ChaScore4_buff_text"
posparent="ChaScore4_buff"
id="focus_buff_text"
posparent="focus_buff"
posref="MR ML"
hardtext="0"
global_color="false"/>
......