diff --git a/assets/ETC/ymir work/environment/12zi_stage_01_02.msenv b/assets/ETC/ymir work/environment/12zi_stage_01_02.msenv index f295f5e2..332606ac 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_01_02.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_01_02.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/12zi_stage_02_01.msenv b/assets/ETC/ymir work/environment/12zi_stage_02_01.msenv index 56977cd5..92816987 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_02_01.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_02_01.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/12zi_stage_02_02.msenv b/assets/ETC/ymir work/environment/12zi_stage_02_02.msenv index 54499071..a2328052 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_02_02.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_02_02.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/12zi_stage_03_01.msenv b/assets/ETC/ymir work/environment/12zi_stage_03_01.msenv index 4c75e806..274bf321 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_03_01.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_03_01.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/12zi_stage_03_02.msenv b/assets/ETC/ymir work/environment/12zi_stage_03_02.msenv index 7fab900c..470b1140 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_03_02.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_03_02.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/12zi_stage_04_01.msenv b/assets/ETC/ymir work/environment/12zi_stage_04_01.msenv index 4a32646d..a910cf46 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_04_01.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_04_01.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/12zi_stage_04_02.msenv b/assets/ETC/ymir work/environment/12zi_stage_04_02.msenv index 12d2394f..79095305 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_04_02.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_04_02.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/12zi_stage_05_01.msenv b/assets/ETC/ymir work/environment/12zi_stage_05_01.msenv index 39f91232..d65560cc 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_05_01.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_05_01.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/12zi_stage_05_02.msenv b/assets/ETC/ymir work/environment/12zi_stage_05_02.msenv index c534a28c..adca3abe 100644 --- a/assets/ETC/ymir work/environment/12zi_stage_05_02.msenv +++ b/assets/ETC/ymir work/environment/12zi_stage_05_02.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/a1.msenv b/assets/ETC/ymir work/environment/a1.msenv index 4c2e7105..080793b8 100644 --- a/assets/ETC/ymir work/environment/a1.msenv +++ b/assets/ETC/ymir work/environment/a1.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/a2.msenv b/assets/ETC/ymir work/environment/a2.msenv index 5349638d..5a18ac6c 100644 --- a/assets/ETC/ymir work/environment/a2.msenv +++ b/assets/ETC/ymir work/environment/a2.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/a3.msenv b/assets/ETC/ymir work/environment/a3.msenv index 0098dbb6..3c62069d 100644 --- a/assets/ETC/ymir work/environment/a3.msenv +++ b/assets/ETC/ymir work/environment/a3.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/anglar_dungeon_01.msenv b/assets/ETC/ymir work/environment/anglar_dungeon_01.msenv index 6ed04ec5..d82a2ef4 100644 --- a/assets/ETC/ymir work/environment/anglar_dungeon_01.msenv +++ b/assets/ETC/ymir work/environment/anglar_dungeon_01.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/b1.msenv b/assets/ETC/ymir work/environment/b1.msenv index c2e31537..d6295975 100644 --- a/assets/ETC/ymir work/environment/b1.msenv +++ b/assets/ETC/ymir work/environment/b1.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/b2.msenv b/assets/ETC/ymir work/environment/b2.msenv index fa253b05..c870de78 100644 --- a/assets/ETC/ymir work/environment/b2.msenv +++ b/assets/ETC/ymir work/environment/b2.msenv @@ -79,7 +79,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/b3.msenv b/assets/ETC/ymir work/environment/b3.msenv index 0098dbb6..3c62069d 100644 --- a/assets/ETC/ymir work/environment/b3.msenv +++ b/assets/ETC/ymir work/environment/b3.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/battle_guild01.msenv b/assets/ETC/ymir work/environment/battle_guild01.msenv index 1da8b99f..437bd81b 100644 --- a/assets/ETC/ymir work/environment/battle_guild01.msenv +++ b/assets/ETC/ymir work/environment/battle_guild01.msenv @@ -82,7 +82,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/battlefield.msenv b/assets/ETC/ymir work/environment/battlefield.msenv index 8430222c..8830e74b 100644 --- a/assets/ETC/ymir work/environment/battlefield.msenv +++ b/assets/ETC/ymir work/environment/battlefield.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/bayblacksand.msenv b/assets/ETC/ymir work/environment/bayblacksand.msenv index e22f42eb..8fc2330b 100644 --- a/assets/ETC/ymir work/environment/bayblacksand.msenv +++ b/assets/ETC/ymir work/environment/bayblacksand.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.980392 0.980392 0.980392 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/c1.msenv b/assets/ETC/ymir work/environment/c1.msenv index 4fedf51f..ed341242 100644 --- a/assets/ETC/ymir work/environment/c1.msenv +++ b/assets/ETC/ymir work/environment/c1.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/c2.msenv b/assets/ETC/ymir work/environment/c2.msenv index 37ad09c8..054da489 100644 --- a/assets/ETC/ymir work/environment/c2.msenv +++ b/assets/ETC/ymir work/environment/c2.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/c3.msenv b/assets/ETC/ymir work/environment/c3.msenv index 0098dbb6..3c62069d 100644 --- a/assets/ETC/ymir work/environment/c3.msenv +++ b/assets/ETC/ymir work/environment/c3.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/capedragonhead.msenv b/assets/ETC/ymir work/environment/capedragonhead.msenv index 2679d69a..58a0b964 100644 --- a/assets/ETC/ymir work/environment/capedragonhead.msenv +++ b/assets/ETC/ymir work/environment/capedragonhead.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/dark.msenv b/assets/ETC/ymir work/environment/dark.msenv index f458d622..1aa03ffd 100644 --- a/assets/ETC/ymir work/environment/dark.msenv +++ b/assets/ETC/ymir work/environment/dark.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/dawnmistwood.msenv b/assets/ETC/ymir work/environment/dawnmistwood.msenv index 8592a795..20a6976d 100644 --- a/assets/ETC/ymir work/environment/dawnmistwood.msenv +++ b/assets/ETC/ymir work/environment/dawnmistwood.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/dawnmistwood_dungeon.msenv b/assets/ETC/ymir work/environment/dawnmistwood_dungeon.msenv index 3c6903d1..63e98055 100644 --- a/assets/ETC/ymir work/environment/dawnmistwood_dungeon.msenv +++ b/assets/ETC/ymir work/environment/dawnmistwood_dungeon.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/defensewave_blue.msenv b/assets/ETC/ymir work/environment/defensewave_blue.msenv index e953ca39..48bb84d0 100644 --- a/assets/ETC/ymir work/environment/defensewave_blue.msenv +++ b/assets/ETC/ymir work/environment/defensewave_blue.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.384314 0.392157 0.584314 1.000000 MaxBrightness 0.740000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/desert_02.msenv b/assets/ETC/ymir work/environment/desert_02.msenv index bbdf5395..9b94739b 100644 --- a/assets/ETC/ymir work/environment/desert_02.msenv +++ b/assets/ETC/ymir work/environment/desert_02.msenv @@ -80,7 +80,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/e1.msenv b/assets/ETC/ymir work/environment/e1.msenv index 90e67641..e8734d18 100644 --- a/assets/ETC/ymir work/environment/e1.msenv +++ b/assets/ETC/ymir work/environment/e1.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/eastplain_01.msenv b/assets/ETC/ymir work/environment/eastplain_01.msenv index ecba0bb0..053e3f92 100644 --- a/assets/ETC/ymir work/environment/eastplain_01.msenv +++ b/assets/ETC/ymir work/environment/eastplain_01.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/eastplain_02.msenv b/assets/ETC/ymir work/environment/eastplain_02.msenv index 2b1370c7..70ad8806 100644 --- a/assets/ETC/ymir work/environment/eastplain_02.msenv +++ b/assets/ETC/ymir work/environment/eastplain_02.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.384314 0.392157 0.584314 1.000000 MaxBrightness 0.740000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/eastplain_03.msenv b/assets/ETC/ymir work/environment/eastplain_03.msenv index 1dbcd48a..e4bef6bc 100644 --- a/assets/ETC/ymir work/environment/eastplain_03.msenv +++ b/assets/ETC/ymir work/environment/eastplain_03.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/empirecastle.msenv b/assets/ETC/ymir work/environment/empirecastle.msenv index e154ab7a..ffaec34f 100644 --- a/assets/ETC/ymir work/environment/empirecastle.msenv +++ b/assets/ETC/ymir work/environment/empirecastle.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/gm_guild_build.msenv b/assets/ETC/ymir work/environment/gm_guild_build.msenv index ed028157..06ddd8f9 100644 --- a/assets/ETC/ymir work/environment/gm_guild_build.msenv +++ b/assets/ETC/ymir work/environment/gm_guild_build.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/guild_village.msenv b/assets/ETC/ymir work/environment/guild_village.msenv index e4bd095c..cba3a877 100644 --- a/assets/ETC/ymir work/environment/guild_village.msenv +++ b/assets/ETC/ymir work/environment/guild_village.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/map_b_fielddungeo.msenv b/assets/ETC/ymir work/environment/map_b_fielddungeo.msenv index e64f1cd2..5aca0119 100644 --- a/assets/ETC/ymir work/environment/map_b_fielddungeo.msenv +++ b/assets/ETC/ymir work/environment/map_b_fielddungeo.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/map_boss_entrance.msenv b/assets/ETC/ymir work/environment/map_boss_entrance.msenv index 31aa5149..de88ca38 100644 --- a/assets/ETC/ymir work/environment/map_boss_entrance.msenv +++ b/assets/ETC/ymir work/environment/map_boss_entrance.msenv @@ -93,7 +93,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/map_dd.msenv b/assets/ETC/ymir work/environment/map_dd.msenv index 622b4681..1dce18e8 100644 --- a/assets/ETC/ymir work/environment/map_dd.msenv +++ b/assets/ETC/ymir work/environment/map_dd.msenv @@ -76,7 +76,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/map_dd_teste.msenv b/assets/ETC/ymir work/environment/map_dd_teste.msenv index 6ef40514..a9277d32 100644 --- a/assets/ETC/ymir work/environment/map_dd_teste.msenv +++ b/assets/ETC/ymir work/environment/map_dd_teste.msenv @@ -62,7 +62,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/map_devilscatacomb.msenv b/assets/ETC/ymir work/environment/map_devilscatacomb.msenv index 4947fdf5..98c37559 100644 --- a/assets/ETC/ymir work/environment/map_devilscatacomb.msenv +++ b/assets/ETC/ymir work/environment/map_devilscatacomb.msenv @@ -74,7 +74,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/map_n_desert_01.msenv b/assets/ETC/ymir work/environment/map_n_desert_01.msenv index c6b9ae80..622a25c7 100644 --- a/assets/ETC/ymir work/environment/map_n_desert_01.msenv +++ b/assets/ETC/ymir work/environment/map_n_desert_01.msenv @@ -82,7 +82,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/map_n_flame_01.msenv b/assets/ETC/ymir work/environment/map_n_flame_01.msenv index 9daa599f..0244bb17 100644 --- a/assets/ETC/ymir work/environment/map_n_flame_01.msenv +++ b/assets/ETC/ymir work/environment/map_n_flame_01.msenv @@ -86,7 +86,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_guild_pve.msenv b/assets/ETC/ymir work/environment/metin2_guild_pve.msenv index 04f9b083..c77a5e69 100644 --- a/assets/ETC/ymir work/environment/metin2_guild_pve.msenv +++ b/assets/ETC/ymir work/environment/metin2_guild_pve.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/metin2_guild_war1.msenv b/assets/ETC/ymir work/environment/metin2_guild_war1.msenv index 4ad35aad..4c650172 100644 --- a/assets/ETC/ymir work/environment/metin2_guild_war1.msenv +++ b/assets/ETC/ymir work/environment/metin2_guild_war1.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_guild_war3.msenv b/assets/ETC/ymir work/environment/metin2_guild_war3.msenv index 4ad35aad..4c650172 100644 --- a/assets/ETC/ymir work/environment/metin2_guild_war3.msenv +++ b/assets/ETC/ymir work/environment/metin2_guild_war3.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_battleroyale.msenv b/assets/ETC/ymir work/environment/metin2_map_battleroyale.msenv index 969e1fa4..3d734db0 100644 --- a/assets/ETC/ymir work/environment/metin2_map_battleroyale.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_battleroyale.msenv @@ -87,7 +87,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_eastplain_mystery.msenv b/assets/ETC/ymir work/environment/metin2_map_eastplain_mystery.msenv index b2375d78..1de15ca2 100644 --- a/assets/ETC/ymir work/environment/metin2_map_eastplain_mystery.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_eastplain_mystery.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_elemental_01.msenv b/assets/ETC/ymir work/environment/metin2_map_elemental_01.msenv index 6bcd55ff..546ae3d1 100644 --- a/assets/ETC/ymir work/environment/metin2_map_elemental_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_elemental_01.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_elemental_01_01.msenv b/assets/ETC/ymir work/environment/metin2_map_elemental_01_01.msenv index fb8f4bf1..3cd4e849 100644 --- a/assets/ETC/ymir work/environment/metin2_map_elemental_01_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_elemental_01_01.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_elemental_02.msenv b/assets/ETC/ymir work/environment/metin2_map_elemental_02.msenv index 43923246..c4e79aa0 100644 --- a/assets/ETC/ymir work/environment/metin2_map_elemental_02.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_elemental_02.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_elemental_02_01.msenv b/assets/ETC/ymir work/environment/metin2_map_elemental_02_01.msenv index af78e3fb..b70d06c9 100644 --- a/assets/ETC/ymir work/environment/metin2_map_elemental_02_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_elemental_02_01.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_elemental_03.msenv b/assets/ETC/ymir work/environment/metin2_map_elemental_03.msenv index 8feb2aee..faf41230 100644 --- a/assets/ETC/ymir work/environment/metin2_map_elemental_03.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_elemental_03.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_elemental_03_01.msenv b/assets/ETC/ymir work/environment/metin2_map_elemental_03_01.msenv index 4adee11e..6ef477b4 100644 --- a/assets/ETC/ymir work/environment/metin2_map_elemental_03_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_elemental_03_01.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_elemental_04.msenv b/assets/ETC/ymir work/environment/metin2_map_elemental_04.msenv index c3e09591..751697c1 100644 --- a/assets/ETC/ymir work/environment/metin2_map_elemental_04.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_elemental_04.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_guild_battle_01.msenv b/assets/ETC/ymir work/environment/metin2_map_guild_battle_01.msenv index cb18bb6b..e4b51324 100644 --- a/assets/ETC/ymir work/environment/metin2_map_guild_battle_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_guild_battle_01.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_guild_battle_02.msenv b/assets/ETC/ymir work/environment/metin2_map_guild_battle_02.msenv index 8ae9b138..2e357790 100644 --- a/assets/ETC/ymir work/environment/metin2_map_guild_battle_02.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_guild_battle_02.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_guild_battle_03.msenv b/assets/ETC/ymir work/environment/metin2_map_guild_battle_03.msenv index 640dde55..a6305b02 100644 --- a/assets/ETC/ymir work/environment/metin2_map_guild_battle_03.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_guild_battle_03.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/metin2_map_guild_whitedragon.msenv b/assets/ETC/ymir work/environment/metin2_map_guild_whitedragon.msenv index 77ff3e73..503cfcc0 100644 --- a/assets/ETC/ymir work/environment/metin2_map_guild_whitedragon.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_guild_whitedragon.msenv @@ -67,7 +67,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_icecrystalcave.msenv b/assets/ETC/ymir work/environment/metin2_map_icecrystalcave.msenv index 068a4ee8..a2375607 100644 --- a/assets/ETC/ymir work/environment/metin2_map_icecrystalcave.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_icecrystalcave.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/metin2_map_mists_of_island.msenv b/assets/ETC/ymir work/environment/metin2_map_mists_of_island.msenv index 4280dc4c..e3d83d42 100644 --- a/assets/ETC/ymir work/environment/metin2_map_mists_of_island.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_mists_of_island.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_n_flame_dragon_01.msenv b/assets/ETC/ymir work/environment/metin2_map_n_flame_dragon_01.msenv index d935dda7..3db95972 100644 --- a/assets/ETC/ymir work/environment/metin2_map_n_flame_dragon_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_n_flame_dragon_01.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_n_flame_dungeon_01.msenv b/assets/ETC/ymir work/environment/metin2_map_n_flame_dungeon_01.msenv index d46849cd..ebcf72ed 100644 --- a/assets/ETC/ymir work/environment/metin2_map_n_flame_dungeon_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_n_flame_dungeon_01.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_n_snow_dragon.msenv b/assets/ETC/ymir work/environment/metin2_map_n_snow_dragon.msenv index 20ee7e7f..def0cadf 100644 --- a/assets/ETC/ymir work/environment/metin2_map_n_snow_dragon.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_n_snow_dragon.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_n_snow_dungeon_01.msenv b/assets/ETC/ymir work/environment/metin2_map_n_snow_dungeon_01.msenv index c25a9d48..d3953c47 100644 --- a/assets/ETC/ymir work/environment/metin2_map_n_snow_dungeon_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_n_snow_dungeon_01.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/metin2_map_otherworld_01.msenv b/assets/ETC/ymir work/environment/metin2_map_otherworld_01.msenv index a3358fe6..b0964fe0 100644 --- a/assets/ETC/ymir work/environment/metin2_map_otherworld_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_otherworld_01.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_otherworld_02.msenv b/assets/ETC/ymir work/environment/metin2_map_otherworld_02.msenv index d89e4dbf..6396a847 100644 --- a/assets/ETC/ymir work/environment/metin2_map_otherworld_02.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_otherworld_02.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_secretdungeon.msenv b/assets/ETC/ymir work/environment/metin2_map_secretdungeon.msenv index d8788fa9..220bcf50 100644 --- a/assets/ETC/ymir work/environment/metin2_map_secretdungeon.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_secretdungeon.msenv @@ -87,7 +87,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_snake_temple.msenv b/assets/ETC/ymir work/environment/metin2_map_snake_temple.msenv index 7e416c81..ee2380aa 100644 --- a/assets/ETC/ymir work/environment/metin2_map_snake_temple.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_snake_temple.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_treasure_hunt.msenv b/assets/ETC/ymir work/environment/metin2_map_treasure_hunt.msenv index d74655e0..2a7d6208 100644 --- a/assets/ETC/ymir work/environment/metin2_map_treasure_hunt.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_treasure_hunt.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_whitdragonvalley.msenv b/assets/ETC/ymir work/environment/metin2_map_whitdragonvalley.msenv index 254d0e15..4a6b6290 100644 --- a/assets/ETC/ymir work/environment/metin2_map_whitdragonvalley.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_whitdragonvalley.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_01.msenv b/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_01.msenv index 3f784e7c..8a26876c 100644 --- a/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_01.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_01.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_02.msenv b/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_02.msenv index 4eec0ece..c53c791c 100644 --- a/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_02.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_02.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_boss.msenv b/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_boss.msenv index 6e19f47b..58c9e670 100644 --- a/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_boss.msenv +++ b/assets/ETC/ymir work/environment/metin2_map_whitedragoncave_boss.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/milgyo.msenv b/assets/ETC/ymir work/environment/milgyo.msenv index 96d9ca66..a1c7bc45 100644 --- a/assets/ETC/ymir work/environment/milgyo.msenv +++ b/assets/ETC/ymir work/environment/milgyo.msenv @@ -87,7 +87,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/monkeydungeon.msenv b/assets/ETC/ymir work/environment/monkeydungeon.msenv index ca6eecac..5f3e297f 100644 --- a/assets/ETC/ymir work/environment/monkeydungeon.msenv +++ b/assets/ETC/ymir work/environment/monkeydungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/monkeydungeon_02.msenv b/assets/ETC/ymir work/environment/monkeydungeon_02.msenv index 37ddfd25..2bf6617c 100644 --- a/assets/ETC/ymir work/environment/monkeydungeon_02.msenv +++ b/assets/ETC/ymir work/environment/monkeydungeon_02.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/monkeydungeon_03.msenv b/assets/ETC/ymir work/environment/monkeydungeon_03.msenv index df22bc50..a1896463 100644 --- a/assets/ETC/ymir work/environment/monkeydungeon_03.msenv +++ b/assets/ETC/ymir work/environment/monkeydungeon_03.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/moonlight04.msenv b/assets/ETC/ymir work/environment/moonlight04.msenv index b9889257..e1e655ab 100644 --- a/assets/ETC/ymir work/environment/moonlight04.msenv +++ b/assets/ETC/ymir work/environment/moonlight04.msenv @@ -78,7 +78,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/moonlight05.msenv b/assets/ETC/ymir work/environment/moonlight05.msenv index 0d19556c..a96ed8fe 100644 --- a/assets/ETC/ymir work/environment/moonlight05.msenv +++ b/assets/ETC/ymir work/environment/moonlight05.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/mt_th_dragon.msenv b/assets/ETC/ymir work/environment/mt_th_dragon.msenv index 2af23494..d2ace6c7 100644 --- a/assets/ETC/ymir work/environment/mt_th_dragon.msenv +++ b/assets/ETC/ymir work/environment/mt_th_dragon.msenv @@ -75,7 +75,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/mtthunder.msenv b/assets/ETC/ymir work/environment/mtthunder.msenv index f9d77838..16ee278e 100644 --- a/assets/ETC/ymir work/environment/mtthunder.msenv +++ b/assets/ETC/ymir work/environment/mtthunder.msenv @@ -84,7 +84,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/n-snowm01.msenv b/assets/ETC/ymir work/environment/n-snowm01.msenv index 2046d141..348d40f4 100644 --- a/assets/ETC/ymir work/environment/n-snowm01.msenv +++ b/assets/ETC/ymir work/environment/n-snowm01.msenv @@ -80,7 +80,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/resources_zon.msenv b/assets/ETC/ymir work/environment/resources_zon.msenv index e5f6bedc..821a8e39 100644 --- a/assets/ETC/ymir work/environment/resources_zon.msenv +++ b/assets/ETC/ymir work/environment/resources_zon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/skipia_dungeon.msenv b/assets/ETC/ymir work/environment/skipia_dungeon.msenv index 19893c0f..c0f344ca 100644 --- a/assets/ETC/ymir work/environment/skipia_dungeon.msenv +++ b/assets/ETC/ymir work/environment/skipia_dungeon.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/snakevalley.msenv b/assets/ETC/ymir work/environment/snakevalley.msenv index 04563c4b..76b9c92c 100644 --- a/assets/ETC/ymir work/environment/snakevalley.msenv +++ b/assets/ETC/ymir work/environment/snakevalley.msenv @@ -81,7 +81,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/snowm02.msenv b/assets/ETC/ymir work/environment/snowm02.msenv index 917e283d..8d529a4d 100644 --- a/assets/ETC/ymir work/environment/snowm02.msenv +++ b/assets/ETC/ymir work/environment/snowm02.msenv @@ -80,7 +80,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/spiderdungeon.msenv b/assets/ETC/ymir work/environment/spiderdungeon.msenv index 7e3c35c8..2be1d18e 100644 --- a/assets/ETC/ymir work/environment/spiderdungeon.msenv +++ b/assets/ETC/ymir work/environment/spiderdungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/sungzi.msenv b/assets/ETC/ymir work/environment/sungzi.msenv index 5d9db103..9c115d32 100644 --- a/assets/ETC/ymir work/environment/sungzi.msenv +++ b/assets/ETC/ymir work/environment/sungzi.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/t1.msenv b/assets/ETC/ymir work/environment/t1.msenv index fd90670e..f42d111e 100644 --- a/assets/ETC/ymir work/environment/t1.msenv +++ b/assets/ETC/ymir work/environment/t1.msenv @@ -80,7 +80,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/t2.msenv b/assets/ETC/ymir work/environment/t2.msenv index abc935fb..a10233e2 100644 --- a/assets/ETC/ymir work/environment/t2.msenv +++ b/assets/ETC/ymir work/environment/t2.msenv @@ -80,7 +80,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/t5.msenv b/assets/ETC/ymir work/environment/t5.msenv index 34c3beda..83ea48c3 100644 --- a/assets/ETC/ymir work/environment/t5.msenv +++ b/assets/ETC/ymir work/environment/t5.msenv @@ -87,7 +87,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/trent.msenv b/assets/ETC/ymir work/environment/trent.msenv index 28260d86..31f68bef 100644 --- a/assets/ETC/ymir work/environment/trent.msenv +++ b/assets/ETC/ymir work/environment/trent.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/trent02.msenv b/assets/ETC/ymir work/environment/trent02.msenv index f681ef95..a3d39e7a 100644 --- a/assets/ETC/ymir work/environment/trent02.msenv +++ b/assets/ETC/ymir work/environment/trent02.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/ETC/ymir work/environment/war2.msenv b/assets/ETC/ymir work/environment/war2.msenv index 45a6b3be..8a53385c 100644 --- a/assets/ETC/ymir work/environment/war2.msenv +++ b/assets/ETC/ymir work/environment/war2.msenv @@ -80,7 +80,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/ETC/ymir work/environment/war4.msenv b/assets/ETC/ymir work/environment/war4.msenv index 99f48e61..ec08cfb6 100644 --- a/assets/ETC/ymir work/environment/war4.msenv +++ b/assets/ETC/ymir work/environment/war4.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/metin2_patch_dragon_rock/ymir work/environment/bayblacksand.msenv b/assets/metin2_patch_dragon_rock/ymir work/environment/bayblacksand.msenv index d9bc200e..2914dd41 100644 --- a/assets/metin2_patch_dragon_rock/ymir work/environment/bayblacksand.msenv +++ b/assets/metin2_patch_dragon_rock/ymir work/environment/bayblacksand.msenv @@ -77,7 +77,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.980392 0.980392 0.980392 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/metin2_patch_dragon_rock/ymir work/environment/capedragonhead.msenv b/assets/metin2_patch_dragon_rock/ymir work/environment/capedragonhead.msenv index c974480a..eeabc16d 100644 --- a/assets/metin2_patch_dragon_rock/ymir work/environment/capedragonhead.msenv +++ b/assets/metin2_patch_dragon_rock/ymir work/environment/capedragonhead.msenv @@ -86,7 +86,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/metin2_patch_dragon_rock/ymir work/environment/dawnmistwood.msenv b/assets/metin2_patch_dragon_rock/ymir work/environment/dawnmistwood.msenv index 4b1886b1..70c3ac85 100644 --- a/assets/metin2_patch_dragon_rock/ymir work/environment/dawnmistwood.msenv +++ b/assets/metin2_patch_dragon_rock/ymir work/environment/dawnmistwood.msenv @@ -80,7 +80,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/metin2_patch_dragon_rock/ymir work/environment/mtthunder.msenv b/assets/metin2_patch_dragon_rock/ymir work/environment/mtthunder.msenv index e45c15dd..cfdbc4c0 100644 --- a/assets/metin2_patch_dragon_rock/ymir work/environment/mtthunder.msenv +++ b/assets/metin2_patch_dragon_rock/ymir work/environment/mtthunder.msenv @@ -86,7 +86,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/metin2_patch_eu3/metin2_map_devilscatacomb/map_dd_teste.msenv b/assets/metin2_patch_eu3/metin2_map_devilscatacomb/map_dd_teste.msenv index 50a6635c..42ace31e 100644 --- a/assets/metin2_patch_eu3/metin2_map_devilscatacomb/map_dd_teste.msenv +++ b/assets/metin2_patch_eu3/metin2_map_devilscatacomb/map_dd_teste.msenv @@ -62,7 +62,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/metin2_patch_eu3/ymir work/environment/map_devilscatacomb.msenv b/assets/metin2_patch_eu3/ymir work/environment/map_devilscatacomb.msenv index caaf339f..f025acc6 100644 --- a/assets/metin2_patch_eu3/ymir work/environment/map_devilscatacomb.msenv +++ b/assets/metin2_patch_eu3/ymir work/environment/map_devilscatacomb.msenv @@ -76,7 +76,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/metin2_patch_eu4/ymir work/environment/guild_village.msenv b/assets/metin2_patch_eu4/ymir work/environment/guild_village.msenv index a6611957..e0399e2f 100644 --- a/assets/metin2_patch_eu4/ymir work/environment/guild_village.msenv +++ b/assets/metin2_patch_eu4/ymir work/environment/guild_village.msenv @@ -79,7 +79,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/metin2_patch_flame/ymir work/environment/map_n_flame_01.msenv b/assets/metin2_patch_flame/ymir work/environment/map_n_flame_01.msenv index 9daa599f..0244bb17 100644 --- a/assets/metin2_patch_flame/ymir work/environment/map_n_flame_01.msenv +++ b/assets/metin2_patch_flame/ymir work/environment/map_n_flame_01.msenv @@ -86,7 +86,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/metin2_patch_flame_dungeon/ymir work/environment/metin2_map_n_flame_dungeon_01.msenv b/assets/metin2_patch_flame_dungeon/ymir work/environment/metin2_map_n_flame_dungeon_01.msenv index a325444a..395a2f3a 100644 --- a/assets/metin2_patch_flame_dungeon/ymir work/environment/metin2_map_n_flame_dungeon_01.msenv +++ b/assets/metin2_patch_flame_dungeon/ymir work/environment/metin2_map_n_flame_dungeon_01.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/metin2_patch_sd/metin2_map_spiderdungeon_02/skipia_dungeon.msenv b/assets/metin2_patch_sd/metin2_map_spiderdungeon_02/skipia_dungeon.msenv index 5f6babf6..7262b6a6 100644 --- a/assets/metin2_patch_sd/metin2_map_spiderdungeon_02/skipia_dungeon.msenv +++ b/assets/metin2_patch_sd/metin2_map_spiderdungeon_02/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/metin2_patch_snow_dungeon/ymir work/environment/metin2_map_n_snow_dungeon_01.msenv b/assets/metin2_patch_snow_dungeon/ymir work/environment/metin2_map_n_snow_dungeon_01.msenv index c25a9d48..d3953c47 100644 --- a/assets/metin2_patch_snow_dungeon/ymir work/environment/metin2_map_n_snow_dungeon_01.msenv +++ b/assets/metin2_patch_snow_dungeon/ymir work/environment/metin2_map_n_snow_dungeon_01.msenv @@ -68,7 +68,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 0 diff --git a/assets/patch2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv b/assets/patch2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv index 09b52fef..f3dc95fc 100644 --- a/assets/patch2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv +++ b/assets/patch2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/patch2/metin2_map_skipia_dungeon_boss/skipia_dungeon.msenv b/assets/patch2/metin2_map_skipia_dungeon_boss/skipia_dungeon.msenv index 09b52fef..f3dc95fc 100644 --- a/assets/patch2/metin2_map_skipia_dungeon_boss/skipia_dungeon.msenv +++ b/assets/patch2/metin2_map_skipia_dungeon_boss/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/root/game.py b/assets/root/game.py index f3670379..5a86ce65 100644 --- a/assets/root/game.py +++ b/assets/root/game.py @@ -691,13 +691,6 @@ class GameWindow(ui.ScriptWindow): def RefreshGuildGradePage(self): self.interface.RefreshGuildGradePage() - def RefreshMobile(self): - if self.interface: - self.interface.RefreshMobile() - - def OnMobileAuthority(self): - self.interface.OnMobileAuthority() - def OnBlockMode(self, mode): self.interface.OnBlockMode(mode) diff --git a/assets/root/interfacemodule.py b/assets/root/interfacemodule.py index 25228879..281e5d9a 100644 --- a/assets/root/interfacemodule.py +++ b/assets/root/interfacemodule.py @@ -617,12 +617,6 @@ class Interface(object): self.wndMessenger.ClearGuildMember() self.wndGuild.DeleteGuild() - def RefreshMobile(self): - self.dlgSystem.RefreshMobile() - - def OnMobileAuthority(self): - self.dlgSystem.OnMobileAuthority() - def OnBlockMode(self, mode): self.dlgSystem.OnBlockMode(mode) diff --git a/assets/root/intrologin.py b/assets/root/intrologin.py index bd1dba42..87c8aa0d 100644 --- a/assets/root/intrologin.py +++ b/assets/root/intrologin.py @@ -41,10 +41,6 @@ def Suffle(src): else: return src -def IsFullBackImage(): - global FULL_BACK_IMAGE - return FULL_BACK_IMAGE - def IsLoginDelay(): global LOGIN_DELAY_SEC if LOGIN_DELAY_SEC > 0.0: @@ -243,10 +239,6 @@ class LoginWindow(ui.ScriptWindow): connectingIP = self.stream.GetConnectAddr() if connectingIP: self.__OpenLoginBoard() - if IsFullBackImage(): - self.GetChild("bg1").Hide() - self.GetChild("bg2").Show() - else: self.__RefreshServerList() self.__OpenServerBoard() @@ -501,10 +493,6 @@ class LoginWindow(ui.ScriptWindow): self.pwdEditLine.SetReturnEvent(ui.__mem_func__(self.__OnClickLoginButton)) self.pwdEditLine.SetTabEvent(ui.__mem_func__(self.idEditLine.SetFocus)) - - if IsFullBackImage(): - self.GetChild("bg1").Show() - self.GetChild("bg2").Hide() return 1 def __VirtualKeyboard_SetKeys(self, keyCodes): @@ -997,12 +985,7 @@ class LoginWindow(ui.ScriptWindow): def __OnClickExitServerButton(self): print "exit server" - self.__OpenLoginBoard() - - if IsFullBackImage(): - self.GetChild("bg1").Hide() - self.GetChild("bg2").Show() - + self.__OpenLoginBoard() def __OnClickSelectRegionButton(self): regionID = self.__GetRegionID() @@ -1025,10 +1008,6 @@ class LoginWindow(ui.ScriptWindow): self.__OpenServerBoard() def __OnClickSelectServerButton(self): - if IsFullBackImage(): - self.GetChild("bg1").Hide() - self.GetChild("bg2").Show() - regionID = self.__GetRegionID() serverID = self.__GetServerID() channelID = self.__GetChannelID() @@ -1099,12 +1078,8 @@ class LoginWindow(ui.ScriptWindow): self.stream.SetConnectInfo(ip, tcp_port, account_ip, account_port) self.__OpenLoginBoard() - def __OnClickSelectConnectButton(self): - if IsFullBackImage(): - self.GetChild("bg1").Show() - self.GetChild("bg2").Hide() self.__RefreshServerList() self.__OpenServerBoard() diff --git a/assets/root/intrologo.py b/assets/root/intrologo.py deleted file mode 100644 index 31034abf..00000000 --- a/assets/root/intrologo.py +++ /dev/null @@ -1,76 +0,0 @@ -import app -import net -import ui -import snd -import wndMgr -import uiScriptLocale -import localeInfo - -# Most related code is in PythonApplicationLogo.cpp - -app.SetGuildMarkPath("test") - -class LogoWindow(ui.ScriptWindow): - - # List of videos to display (shown in array order) - videoList = [] - - def __init__(self, stream): - print "NEW LOGO WINDOW ----------------------------------------------------------------------------" - ui.ScriptWindow.__init__(self) - net.SetPhaseWindow(net.PHASE_WINDOW_LOGO, self) - self.stream = stream - self.playingVideo = 0 - self.bNeedUpdate = True - self.nextLogoIndex = 0 - self.videoList = ["logo1.avi", "logo2.avi"] - - def __del__(self): - ui.ScriptWindow.__del__(self) - net.SetPhaseWindow(net.PHASE_WINDOW_LOGO, 0) - print "---------------------------------------------------------------------------- DELETE LOGO WINDOW" - - def Open(self): - self.SetSize(wndMgr.GetScreenWidth(), wndMgr.GetScreenHeight()) - self.SetWindowName("SelectLogoWindow") - self.Show() - - self.LoadNextVideo() - - app.ShowCursor() - print "OPEN LOGO WINDOW ----------------------------------------------------------------------------" - - def Close(self): - print "---------------------------------------------------------------CLOSE LOGO WINDOW" - app.OnLogoClose() - self.KillFocus() - self.Hide() - - app.HideCursor() - - # Skip to introLogin if video playback is impossible or videos are not provided. - def OnUpdate(self): - if self.bNeedUpdate: - if self.playingVideo == 0: - if self.nextLogoIndex < len(self.videoList): - self.CloseVideo() - self.LoadNextVideo() - else: - self.bNeedUpdate = False - self.stream.SetLoginPhase() - else: - self.playingVideo = app.OnLogoUpdate() - - - def OnRender(self): - if self.playingVideo: - app.OnLogoRender() - - def LoadNextVideo(self): - if self.nextLogoIndex < len(self.videoList): - self.playingVideo = app.OnLogoOpen(self.videoList[self.nextLogoIndex]) - self.nextLogoIndex = self.nextLogoIndex + 1 - - def CloseVideo(self): - app.OnLogoClose() - diff --git a/assets/root/networkmodule.py b/assets/root/networkmodule.py index 40108c58..b23710bc 100644 --- a/assets/root/networkmodule.py +++ b/assets/root/networkmodule.py @@ -165,12 +165,6 @@ class MainStream(object): ## SelectPhase ########################################################################################## - def SetLogoPhase(self): - net.Disconnect() - - import introLogo - self.SetPhaseWindow(introLogo.LogoWindow(self)) - def SetLoginPhase(self): net.Disconnect() diff --git a/assets/root/playersettingmodule.py b/assets/root/playersettingmodule.py index bf174e8e..d17d57f4 100644 --- a/assets/root/playersettingmodule.py +++ b/assets/root/playersettingmodule.py @@ -238,9 +238,6 @@ def __InitData(): #chrmgr.RegisterCacheEffect(chrmgr.EFFECT_SUCCESS, "", "season1/effect/success.mse") #chrmgr.RegisterCacheEffect(chrmgr.EFFECT_FAIL, "", "season1/effect/fail.mse") - - chrmgr.RegisterCacheEffect(chrmgr.EFFECT_LEVELUP_ON_14_FOR_GERMANY, "","season1/effect/paymessage_warning.mse") # Level up at 14 (Germany only) - chrmgr.RegisterCacheEffect(chrmgr.EFFECT_LEVELUP_UNDER_15_FOR_GERMANY, "", "season1/effect/paymessage_decide.mse" )# Level up at 15 (Germany only) chrmgr.RegisterCacheEffect(chrmgr.EFFECT_PERCENT_DAMAGE1, "", "d:/ymir work/effect/hit/percent_damage1.mse") chrmgr.RegisterCacheEffect(chrmgr.EFFECT_PERCENT_DAMAGE2, "", "d:/ymir work/effect/hit/percent_damage2.mse") @@ -1459,90 +1456,4 @@ def SetGuildBuilding(race, name, grade): chrmgr.SetPathName("d:/ymir work/guild/building/%s/" % name) chrmgr.LoadRaceData("%s%02d.msm" % (name, grade)) chrmgr.RegisterMotionMode(chr.MOTION_MODE_GENERAL) - #chrmgr.RegisterMotionData(chr.MOTION_MODE_GENERAL, chr.MOTION_DEAD, name + "_destruction.msa") - -def OLD_SetNPC(): - SetOneNPC(9001, "arms") - SetOneNPC(9002, "defence") - SetOneNPC(9003, "goods") - SetOneNPC(9004, "bank") - SetOneNPC(9005, "hotel_grandfa") - SetOneNPC(9006, "hotel_grandma") - SetOneNPC(9007, "arms") - SetOneNPC(9008, "defence") - SetOneNPC(9009, "sailor") - - SetMovingNPC(20001, "alchemist") - SetMovingNPC(20002, "auntie") - SetMovingNPC(20003, "baby_and_mom") - SetMovingNPC(20004, "beggar") - SetMovingNPC(20005, "ceramist") - SetMovingNPC(20006, "girl_lost_elder_brother") - SetMovingNPC(20007, "hotel_grandfa") - SetMovingNPC(20008, "mr_restaurant") - SetMovingNPC(20009, "oldster") - SetMovingNPC(20010, "peddler") - SetMovingNPC(20011, "plant_researcher") - SetMovingNPC(20012, "rice_cake_seller") - SetMovingNPC(20013, "sailor") - SetMovingNPC(20014, "timid_boy") - SetMovingNPC(20015, "woodcutter") - SetMovingNPC(20016, "blacksmith") - SetMovingNPC(20017, "musician") - SetMovingNPC(20018, "doctor") - SetMovingNPC(20019, "hunter") - SetMovingNPC(20020, "old_pirate") - SetMovingNPC(20021, "widow") - SetMovingNPC(20022, "young_merchant") - SetMovingNPC(20023, "bookworm") - SetMovingNPC(20024, "yu_hwa_rang") - SetMovingNPC(20041, "beggar") - SetMovingNPC(20042, "peddler") - - SetGuard(20300, "sinsu_patrol_spear") - SetGuard(20301, "sinsu_patrol_spear") - SetGuard(20302, "sinsu_patrol_spear") - SetGuard(20303, "sinsu_patrol_spear") - SetGuard(20304, "sinsu_patrol_spear") - SetGuard(20305, "sinsu_patrol_spear") - SetGuard(20306, "sinsu_patrol_spear") - SetGuard(20307, "sinsu_patrol_spear") - - SetGuard(20320, "gangyo_patrol_spear") - SetGuard(20321, "gangyo_patrol_spear") - SetGuard(20322, "gangyo_patrol_spear") - SetGuard(20323, "gangyo_patrol_spear") - SetGuard(20324, "gangyo_patrol_spear") - SetGuard(20325, "gangyo_patrol_spear") - SetGuard(20326, "gangyo_patrol_spear") - SetGuard(20327, "gangyo_patrol_spear") - - SetGuard(20340, "jinno_patrol_spear") - SetGuard(20341, "jinno_patrol_spear") - SetGuard(20342, "jinno_patrol_spear") - SetGuard(20343, "jinno_patrol_spear") - SetGuard(20344, "jinno_patrol_spear") - SetGuard(20345, "jinno_patrol_spear") - SetGuard(20346, "jinno_patrol_spear") - SetGuard(20347, "jinno_patrol_spear") - - ## Warp - for i in xrange(18): - SetWarp(10001 + i) - - SetGuard(11000, "gangyo_patrol_spear") - SetGuard(11001, "gangyo_patrol_bow") - SetGuard(11002, "jinno_patrol_spear") - SetGuard(11003, "jinno_patrol_bow") - SetGuard(11004, "sinsu_patrol_spear") - SetGuard(11005, "sinsu_patrol_bow") - - ## Campfire (Bonfire) - chrmgr.CreateRace(12000) - chrmgr.SelectRace(12000) - chrmgr.SetPathName("d:/ymir Work/npc/campfire/") - chrmgr.LoadRaceData("campfire.msm") - - ## Door - SetDoor(13000, "wooden_door") - SetDoor(13001, "stone_door") + #chrmgr.RegisterMotionData(chr.MOTION_MODE_GENERAL, chr.MOTION_DEAD, name + "_destruction.msa") \ No newline at end of file diff --git a/assets/root/prototype.py b/assets/root/prototype.py index 442f7ffd..990b1812 100644 --- a/assets/root/prototype.py +++ b/assets/root/prototype.py @@ -47,9 +47,8 @@ def RunApp(): mainStream.Create() #mainStream.SetLoadingPhase() - mainStream.SetLogoPhase() - #mainStream.SetLoginPhase() + mainStream.SetLoginPhase() #mainStream.SetSelectCharacterPhase() #mainStream.SetCreateCharacterPhase() #mainStream.SetSelectEmpirePhase() diff --git a/assets/root/uiautoban.py b/assets/root/uiautoban.py deleted file mode 100644 index 2a95dd24..00000000 --- a/assets/root/uiautoban.py +++ /dev/null @@ -1,181 +0,0 @@ -import app -import os -import net -import mouseModule -import player -import snd -import localeInfo -import ui -import uiScriptLocale - -class AutoBanQuizWindow(ui.ScriptWindow): - def __init__(self): - ui.ScriptWindow.__init__(self) - self.answer = 0 - self.restSec = 0 - - def __del__(self): - ui.ScriptWindow.__del__(self) - - def LoadWindow(self): - try: - pyScrLoader = ui.PythonScriptLoader() - pyScrLoader.LoadScriptFile(self, uiScriptLocale.LOCALE_UISCRIPT_PATH + "AutoBanQuiz.py") - except: - import exception - exception.Abort("AutoBanQuiz.LoadDialog.LoadScript") - - try: - GetObject=self.GetChild - - self.msgTexts = [ - GetObject("msg1"), - GetObject("msg2"), - ] - self.selButtons = [ - GetObject("select1"), - GetObject("select2"), - GetObject("select3"), - ] - - self.statusText = GetObject("status") - self.answerButton = GetObject("answer") - self.refreshButton = GetObject("refresh") - except: - import exception - exception.Abort("AutoBanQuiz.LoadDialog.BindObject") - - self.selButtons[0].SAFE_SetEvent(self.__OnClickSelectButton0) - self.selButtons[1].SAFE_SetEvent(self.__OnClickSelectButton1) - self.selButtons[2].SAFE_SetEvent(self.__OnClickSelectButton2) - - self.answerButton.SAFE_SetEvent(self.__OnClickAnswerButton) - self.refreshButton.SAFE_SetEvent(self.__OnClickRefreshButton) - - def Destroy(self): - self.ClearDictionary() - - self.msgTexts = [] - self.selButtons = [] - self.statusText = None - self.answerButton = None - self.refreshButton = None - - def Open(self, open, quiz, duration): - srcLines = quiz.split("|") - - if len(srcLines) >= 5: - msgLines = srcLines[:2] - selLines = srcLines[2:] - - for msgText, msgLine in zip(self.msgTexts, msgLines): - msgText.SetText(msgLine) - - for selButton, selLine in zip(self.selButtons, selLines): - selButton.SetText(selLine) - - self.statusText.SetText("%s: %s" % (uiScriptLocale.AUTOBAN_QUIZ_REST_TIME, localeInfo.SecondToDHM(duration))) - - self.answer = 0 - self.endTime = app.GetTime() + duration - - for selectButton in self.selButtons: - selectButton.SetUp() - - self.Show() - self.Lock() - - def Close(self): - self.Unlock() - self.Hide() - - def Clear(self): - pass - - def Refresh(self): - pass - - def __OnClickSelectButton0(self): - self.__Select(0) - - def __OnClickSelectButton1(self): - self.__Select(1) - - def __OnClickSelectButton2(self): - self.__Select(2) - - def __Select(self, index): - for selectButton in self.selButtons: - selectButton.SetUp() - - self.selButtons[index].Down() - self.answer = index + 1 - - print "autoban_select: %d" % (self.answer) - - def __OnClickAnswerButton(self): - if self.answer: - print "autoban_answer: %d" % (self.answer) - net.SendChatPacket("/autoban_answer %d" % (self.answer)) - self.Close() - else: - print "autoban_noanswer" - - def __OnClickRefreshButton(self): - print "autoban_refresh" - net.SendChatPacket("/autoban_refresh") - - def OnPressEscapeKey(self): - return True - - def OnUpdate(self): - restTime = self.endTime - app.GetTime() - if restTime < 0: - restTime = 0 - - self.statusText.SetText("%s: %s" % (uiScriptLocale.AUTOBAN_QUIZ_REST_TIME, localeInfo.SecondToDHM(restTime))) - -if __name__ == "__main__": - - import app - import wndMgr - import systemSetting - import mouseModule - import grp - import ui - import uiToolTip - import localeInfo - - app.SetMouseHandler(mouseModule.mouseController) - app.SetHairColorEnable(True) - wndMgr.SetMouseHandler(mouseModule.mouseController) - wndMgr.SetScreenSize(systemSetting.GetWidth(), systemSetting.GetHeight()) - app.Create("METIN2", systemSetting.GetWidth(), systemSetting.GetHeight(), 1) - mouseModule.mouseController.Create() - - class TestGame(ui.Window): - def __init__(self): - ui.Window.__init__(self) - - localeInfo.LoadLocaleData() - - self.cubeWindow = AutoBanQuizWindow() - self.cubeWindow.LoadWindow() - self.cubeWindow.Open() - - def __del__(self): - ui.Window.__del__(self) - - def OnUpdate(self): - app.UpdateGame() - - def OnRender(self): - app.RenderGame() - grp.PopState() - grp.SetInterfaceRenderState() - - game = TestGame() - game.SetSize(systemSetting.GetWidth(), systemSetting.GetHeight()) - game.Show() - - app.Loop() diff --git a/assets/root/uigameoption.py b/assets/root/uigameoption.py index bb5d2472..38957013 100644 --- a/assets/root/uigameoption.py +++ b/assets/root/uigameoption.py @@ -14,8 +14,6 @@ import interfaceModule # blockMode = 0 viewChatMode = 0 -MOBILE = False - class OptionDialog(ui.ScriptWindow): def __init__(self): @@ -83,22 +81,11 @@ class OptionDialog(ui.ScriptWindow): self.showsalesTextButtonList.append(GetObject("salestext_on_button")) self.showsalesTextButtonList.append(GetObject("salestext_off_button")) - global MOBILE - if MOBILE: - self.inputMobileButton = GetObject("input_mobile_button") - self.deleteMobileButton = GetObject("delete_mobile_button") - - except: import exception exception.Abort("OptionDialog.__Load_BindObject") - def __Load(self): - global MOBILE - if MOBILE: - self.__Load_LoadScript("uiscript/gameoptiondialog_formobile.py") - else: - self.__Load_LoadScript("uiscript/gameoptiondialog.py") + self.__Load_LoadScript("uiscript/gameoptiondialog.py") self.__Load_BindObject() @@ -147,11 +134,6 @@ class OptionDialog(ui.ScriptWindow): self.__ClickRadioButton(self.viewTargetBoardButtonList, constInfo.GET_VIEW_OTHER_EMPIRE_PLAYER_TARGET_BOARD()) self.__SetPeacePKMode() - #global MOBILE - if MOBILE: - self.inputMobileButton.SetEvent(ui.__mem_func__(self.__OnChangeMobilePhoneNumber)) - self.deleteMobileButton.SetEvent(ui.__mem_func__(self.__OnDeleteMobilePhoneNumber)) - def __ClickRadioButton(self, buttonList, buttonIndex): try: selButton=buttonList[buttonIndex] @@ -330,67 +312,6 @@ class OptionDialog(ui.ScriptWindow): def OnChangePKMode(self): self.__RefreshPVPButtonList() - def __OnChangeMobilePhoneNumber(self): - global MOBILE - if not MOBILE: - return - - import uiCommon - inputDialog = uiCommon.InputDialog() - inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE) - inputDialog.SetMaxLength(13) - inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber)) - inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog)) - inputDialog.Open() - self.inputDialog = inputDialog - - def __OnDeleteMobilePhoneNumber(self): - global MOBILE - if not MOBILE: - return - - import uiCommon - questionDialog = uiCommon.QuestionDialog() - questionDialog.SetText(localeInfo.MESSENGER_DO_YOU_DELETE_PHONE_NUMBER) - questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnDeleteMobile)) - questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseQuestionDialog)) - questionDialog.Open() - self.questionDialog = questionDialog - - def OnInputMobilePhoneNumber(self): - global MOBILE - if not MOBILE: - return - - text = self.inputDialog.GetText() - - if not text: - return - - text.replace('-', '') - net.SendChatPacket("/mobile " + text) - self.OnCloseInputDialog() - return True - - def OnInputMobileAuthorityCode(self): - global MOBILE - if not MOBILE: - return - - text = self.inputDialog.GetText() - net.SendChatPacket("/mobile_auth " + text) - self.OnCloseInputDialog() - return True - - def OnDeleteMobile(self): - global MOBILE - if not MOBILE: - return - - net.SendChatPacket("/mobile") - self.OnCloseQuestionDialog() - return True - def OnCloseInputDialog(self): self.inputDialog.Close() self.inputDialog = None @@ -405,34 +326,6 @@ class OptionDialog(ui.ScriptWindow): self.Close() return True - def RefreshMobile(self): - global MOBILE - if not MOBILE: - return - - if player.HasMobilePhoneNumber(): - self.inputMobileButton.Hide() - self.deleteMobileButton.Show() - else: - self.inputMobileButton.Show() - self.deleteMobileButton.Hide() - - def OnMobileAuthority(self): - global MOBILE - if not MOBILE: - return - - import uiCommon - inputDialog = uiCommon.InputDialogWithDescription() - inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_TITLE) - inputDialog.SetDescription(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_DESCRIPTION) - inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileAuthorityCode)) - inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog)) - inputDialog.SetMaxLength(4) - inputDialog.SetBoardWidth(310) - inputDialog.Open() - self.inputDialog = inputDialog - def RefreshBlock(self): global blockMode for i in xrange(len(self.blockButtonList)): @@ -479,7 +372,6 @@ class OptionDialog(ui.ScriptWindow): self.RefreshBlock() def Show(self): - self.RefreshMobile() self.RefreshBlock() ui.ScriptWindow.Show(self) diff --git a/assets/root/uimessenger.py b/assets/root/uimessenger.py index c07c84a7..80806659 100644 --- a/assets/root/uimessenger.py +++ b/assets/root/uimessenger.py @@ -71,15 +71,9 @@ class MessengerItem(ui.Window): def IsOnline(self): return False - def IsMobile(self): - return False - def OnWhisper(self): pass - def OnMobileMessage(self): - pass - # Remove def CanRemove(self): return False @@ -123,17 +117,14 @@ class MessengerMemberItem(MessengerItem): STATE_OFFLINE = 0 STATE_ONLINE = 1 - STATE_MOBILE = 2 IMAGE_FILE_NAME = { "ONLINE" : "d:/ymir work/ui/game/windows/messenger_list_online.sub", - "OFFLINE" : "d:/ymir work/ui/game/windows/messenger_list_offline.sub", - "MOBILE" : "d:/ymir work/ui/game/windows/messenger_list_mobile.sub", } + "OFFLINE" : "d:/ymir work/ui/game/windows/messenger_list_offline.sub", } def __init__(self, getParentEvent): MessengerItem.__init__(self, getParentEvent) self.key = None self.state = self.STATE_OFFLINE - self.mobileFlag = False self.Offline() def GetStepWidth(self): @@ -151,30 +142,13 @@ class MessengerMemberItem(MessengerItem): return False - def IsMobile(self): - if self.STATE_MOBILE == self.state: - return True - - return False - def Online(self): self.image.LoadImage(self.IMAGE_FILE_NAME["ONLINE"]) self.state = self.STATE_ONLINE def Offline(self): - if self.mobileFlag: - self.image.LoadImage(self.IMAGE_FILE_NAME["MOBILE"]) - self.state = self.STATE_MOBILE - - else: - self.image.LoadImage(self.IMAGE_FILE_NAME["OFFLINE"]) - self.state = self.STATE_OFFLINE - - def SetMobile(self, flag): - self.mobileFlag = flag - - if not self.IsOnline(): - self.Offline() + self.image.LoadImage(self.IMAGE_FILE_NAME["OFFLINE"]) + self.state = self.STATE_OFFLINE def CanWhisper(self): if self.IsOnline(): @@ -186,15 +160,6 @@ class MessengerMemberItem(MessengerItem): if self.IsOnline(): self.getParentEvent().whisperButtonEvent(self.GetName()) - def OnMobileMessage(self): - if not uiGameOption.MOBILE: - return - - if not self.IsMobile(): - return - - self.getParentEvent().SendMobileMessage(self.GetName()) - def Select(self): MessengerItem.Select(self) @@ -370,8 +335,6 @@ class MessengerWindow(ui.ScriptWindow): self.showingPageSize = 0 self.startLine = 0 - self.hasMobilePhoneNumber = True - self.isLoaded = 0 self.__AddGroup() @@ -404,7 +367,6 @@ class MessengerWindow(ui.ScriptWindow): self.board = self.GetChild("board") self.scrollBar = self.GetChild("ScrollBar") self.whisperButton = self.GetChild("WhisperButton") - self.mobileButton = self.GetChild("MobileButton") self.removeButton = self.GetChild("RemoveButton") self.addFriendButton = self.GetChild("AddFriendButton") self.guildButton = self.GetChild("GuildButton") @@ -415,22 +377,16 @@ class MessengerWindow(ui.ScriptWindow): self.board.SetCloseEvent(ui.__mem_func__(self.Close)) self.scrollBar.SetScrollEvent(ui.__mem_func__(self.OnScroll)) self.whisperButton.SetEvent(ui.__mem_func__(self.OnPressWhisperButton)) - self.mobileButton.SetEvent(ui.__mem_func__(self.OnPressMobileButton)) self.removeButton.SetEvent(ui.__mem_func__(self.OnPressRemoveButton)) self.addFriendButton.SetEvent(ui.__mem_func__(self.OnPressAddFriendButton)) self.guildButton.SetEvent(ui.__mem_func__(self.OnPressGuildButton)) - if not uiGameOption.MOBILE: #constInfo.SEND_MOBILE_PHONE_MESSAGE_ENABLE: - self.mobileButton.Hide() - width = self.GetWidth() - height = self.GetHeight() - self.addFriendButton.SetPosition(-60, 30) - self.whisperButton.SetPosition(-20, 30) - self.removeButton.SetPosition(20, 30) - self.guildButton.SetPosition(60, 30) + self.addFriendButton.SetPosition(-60, 30) + self.whisperButton.SetPosition(-20, 30) + self.removeButton.SetPosition(20, 30) + self.guildButton.SetPosition(60, 30) self.whisperButton.Disable() - self.mobileButton.Disable() self.removeButton.Disable() resizeButton = self.ResizeButton() @@ -462,7 +418,6 @@ class MessengerWindow(ui.ScriptWindow): self.familyGroup = None self.whisperButton = None - self.mobileButton = None self.removeButton = None def OnCloseQuestionDialog(self): @@ -551,79 +506,6 @@ class MessengerWindow(ui.ScriptWindow): def SetGuildButtonEvent(self, event): self.guildButtonEvent=event - def SendMobileMessage(self, name): - if not uiGameOption.MOBILE: - return - - if not self.hasMobilePhoneNumber: - questionDialog = uiCommon.QuestionDialog2() - questionDialog.SetText1(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_1) - questionDialog.SetText2(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_2) - questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnAcceptInputMobilePhoneNumber)) - questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCancelInputMobilePhoneNumber)) - questionDialog.SetWidth(400) - questionDialog.Open() - self.questionDialog = questionDialog - return - - ## Input Sending Mobile Message - inputDialog = uiCommon.InputDialog() - inputDialog.SetTitle(localeInfo.MESSENGER_SEND_MOBILE_MESSAGE_TITLE) - inputDialog.SetMaxLength(50) - inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileMessage)) - inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog)) - inputDialog.name = name - inputDialog.Open() - self.inputDialog = inputDialog - - def OnAcceptInputMobilePhoneNumber(self): - if not uiGameOption.MOBILE: - return - - ## Input Mobile Phone Number - inputDialog = uiCommon.InputDialog() - inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE) - inputDialog.SetMaxLength(13) - inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber)) - inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog)) - inputDialog.Open() - self.inputDialog = inputDialog - self.OnCancelInputMobilePhoneNumber() - - def OnCancelInputMobilePhoneNumber(self): - if not uiGameOption.MOBILE: - return - self.questionDialog.Close() - self.questionDialog = None - return True - - def OnInputMobilePhoneNumber(self): - if not uiGameOption.MOBILE: - return - - text = self.inputDialog.GetText() - - if not text: - return - - text.replace('-', '') - net.SendChatPacket("/mobile " + text) - self.OnCloseInputDialog() - return True - - def OnInputMobileMessage(self): - if not uiGameOption.MOBILE: - return - - text = self.inputDialog.GetText() - - if not text: - return - - net.SendMobileMessagePacket(self.inputDialog.name, text) - self.OnCloseInputDialog() - return True - def OnCloseInputDialog(self): self.inputDialog.Close() self.inputDialog = None @@ -657,10 +539,6 @@ class MessengerWindow(ui.ScriptWindow): if self.selectedItem: self.selectedItem.OnWhisper() - def OnPressMobileButton(self): - if self.selectedItem: - self.selectedItem.OnMobileMessage() - def OnPressRemoveButton(self): if self.selectedItem: if self.selectedItem.CanRemove(): @@ -679,9 +557,7 @@ class MessengerWindow(ui.ScriptWindow): self.selectedItem = None self.whisperButton.Disable() - self.mobileButton.Disable() self.removeButton.Disable() - self.OnRefreshList() self.OnCloseQuestionDialog() @@ -715,11 +591,6 @@ class MessengerWindow(ui.ScriptWindow): else: self.whisperButton.Disable() - if self.selectedItem.IsMobile(): - self.mobileButton.Enable() - else: - self.mobileButton.Disable() - if self.selectedItem.CanRemove(): self.removeButton.Enable() else: @@ -733,9 +604,6 @@ class MessengerWindow(ui.ScriptWindow): if self.selectedItem.IsOnline(): self.OnPressWhisperButton() - elif self.selectedItem.IsMobile(): - self.OnPressMobileButton() - def GetSelf(self): return self @@ -795,7 +663,6 @@ class MessengerWindow(ui.ScriptWindow): # Optional: also disable buttons to mirror local delete flow self.whisperButton.Disable() - self.mobileButton.Disable() self.removeButton.Disable() member.Hide() @@ -826,14 +693,6 @@ class MessengerWindow(ui.ScriptWindow): member.Offline() self.OnRefreshList() - def OnMobile(self, groupIndex, key, mobileFlag): - group = self.groupList[groupIndex] - member = group.FindMember(key) - if not member: - return - member.SetMobile(mobileFlag) - self.OnRefreshList() - def OnAddLover(self, name, lovePoint): if not self.familyGroup: self.__AddFamilyGroup() diff --git a/assets/root/uioption.py b/assets/root/uioption.py index ec7bd8a2..6b11bb0d 100644 --- a/assets/root/uioption.py +++ b/assets/root/uioption.py @@ -9,8 +9,6 @@ import constInfo import chrmgr import player -MOBILE = False - blockMode = 0 class OptionDialog(ui.ScriptWindow): @@ -42,16 +40,10 @@ class OptionDialog(ui.ScriptWindow): print " -------------------------------------- DESTROY OPTION DIALOG" def __LoadDialog(self): - global NO_MOBILE - try: pyScriptLoader = ui.PythonScriptLoader() + pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog.py") - if MOBILE: - pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog_formobile.py") - else: - pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog.py") - except: import exception exception.Abort("OptionDialog.__LoadDialog.LoadObject") @@ -79,10 +71,6 @@ class OptionDialog(ui.ScriptWindow): self.blockButtonList.append(GetObject("block_guild_button")) self.blockButtonList.append(GetObject("block_whisper_button")) self.blockButtonList.append(GetObject("block_friend_button")) - - if MOBILE: - self.inputMobileButton = GetObject("input_mobile_button") - self.deleteMobileButton = GetObject("delete_mobile_button") except: import exception @@ -131,10 +119,6 @@ class OptionDialog(ui.ScriptWindow): self.__ClickRadioButton(self.viewTargetBoardButtonList, constInfo.GET_VIEW_OTHER_EMPIRE_PLAYER_TARGET_BOARD()) self.__SetPeacePKMode() - if MOBILE: - self.inputMobileButton.SetEvent(ui.__mem_func__(self.__OnChangeMobilePhoneNumber)) - self.deleteMobileButton.SetEvent(ui.__mem_func__(self.__OnDeleteMobilePhoneNumber)) - def __ClickRadioButton(self, buttonList, buttonIndex): try: selButton=buttonList[buttonIndex] @@ -291,48 +275,6 @@ class OptionDialog(ui.ScriptWindow): snd.SetSoundVolume(pos) systemSetting.SetSoundVolume(pos) - def __OnChangeMobilePhoneNumber(self): - - import uiCommon - inputDialog = uiCommon.InputDialog() - inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE) - inputDialog.SetMaxLength(13) - inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber)) - inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog)) - inputDialog.Open() - self.inputDialog = inputDialog - - def __OnDeleteMobilePhoneNumber(self): - import uiCommon - questionDialog = uiCommon.QuestionDialog() - questionDialog.SetText(localeInfo.MESSENGER_DO_YOU_DELETE_PHONE_NUMBER) - questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnDeleteMobile)) - questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseQuestionDialog)) - questionDialog.Open() - self.questionDialog = questionDialog - - def OnInputMobilePhoneNumber(self): - text = self.inputDialog.GetText() - - if not text: - return - - text.replace('-', '') - net.SendChatPacket("/mobile " + text) - self.OnCloseInputDialog() - return True - - def OnInputMobileAuthorityCode(self): - text = self.inputDialog.GetText() - net.SendChatPacket("/mobile_auth " + text) - self.OnCloseInputDialog() - return True - - def OnDeleteMobile(self): - net.SendChatPacket("/mobile") - self.OnCloseQuestionDialog() - return True - def OnCloseInputDialog(self): self.inputDialog.Close() self.inputDialog = None @@ -347,30 +289,6 @@ class OptionDialog(ui.ScriptWindow): self.Close() return True - def RefreshMobile(self): - global MOBILE - if not MOBILE: - return - - if player.HasMobilePhoneNumber(): - self.inputMobileButton.Hide() - self.deleteMobileButton.Show() - else: - self.inputMobileButton.Show() - self.deleteMobileButton.Hide() - - def OnMobileAuthority(self): - import uiCommon - inputDialog = uiCommon.InputDialogWithDescription() - inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_TITLE) - inputDialog.SetDescription(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_DESCRIPTION) - inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileAuthorityCode)) - inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog)) - inputDialog.SetMaxLength(4) - inputDialog.SetBoardWidth(310) - inputDialog.Open() - self.inputDialog = inputDialog - def RefreshBlock(self): global blockMode for i in xrange(len(self.blockButtonList)): @@ -385,7 +303,6 @@ class OptionDialog(ui.ScriptWindow): self.RefreshBlock() def Show(self): - self.RefreshMobile() self.RefreshBlock() ui.ScriptWindow.Show(self) diff --git a/assets/root/uisystem.py b/assets/root/uisystem.py index c1ae5c5c..2fc1b99e 100644 --- a/assets/root/uisystem.py +++ b/assets/root/uisystem.py @@ -130,16 +130,6 @@ class SystemDialog(ui.ScriptWindow): self.Hide() return True - def RefreshMobile(self): - if self.gameOptionDlg: - self.gameOptionDlg.RefreshMobile() - #self.optionDialog.RefreshMobile() - - def OnMobileAuthority(self): - if self.gameOptionDlg: - self.gameOptionDlg.OnMobileAuthority() - #self.optionDialog.OnMobileAuthority() - def OnBlockMode(self, mode): uiGameOption.blockMode = mode if self.gameOptionDlg: diff --git a/assets/season1/season1/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv b/assets/season1/season1/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv index 5f6babf6..7262b6a6 100644 --- a/assets/season1/season1/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv +++ b/assets/season1/season1/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season1/season1/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv b/assets/season1/season1/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv index 5f6babf6..7262b6a6 100644 --- a/assets/season1/season1/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv +++ b/assets/season1/season1/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season1/season1/metin2_map_spiderdungeon_02/skipia_dungeon.msenv b/assets/season1/season1/metin2_map_spiderdungeon_02/skipia_dungeon.msenv index 5f6babf6..7262b6a6 100644 --- a/assets/season1/season1/metin2_map_spiderdungeon_02/skipia_dungeon.msenv +++ b/assets/season1/season1/metin2_map_spiderdungeon_02/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season2/season2/metin2_map_empirewar01/snowm02.msenv b/assets/season2/season2/metin2_map_empirewar01/snowm02.msenv index 1b56a028..0dd03207 100644 --- a/assets/season2/season2/metin2_map_empirewar01/snowm02.msenv +++ b/assets/season2/season2/metin2_map_empirewar01/snowm02.msenv @@ -82,7 +82,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season2/season2/metin2_map_empirewar02/a1.msenv b/assets/season2/season2/metin2_map_empirewar02/a1.msenv index c931b979..50d779ef 100644 --- a/assets/season2/season2/metin2_map_empirewar02/a1.msenv +++ b/assets/season2/season2/metin2_map_empirewar02/a1.msenv @@ -79,7 +79,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season2/season2/metin2_map_empirewar03/desert_02.msenv b/assets/season2/season2/metin2_map_empirewar03/desert_02.msenv index e6ab94e2..998fda7d 100644 --- a/assets/season2/season2/metin2_map_empirewar03/desert_02.msenv +++ b/assets/season2/season2/metin2_map_empirewar03/desert_02.msenv @@ -82,7 +82,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season2/season2/metin2_map_guild_inside01/skipia_dungeon.msenv b/assets/season2/season2/metin2_map_guild_inside01/skipia_dungeon.msenv index 5f6babf6..7262b6a6 100644 --- a/assets/season2/season2/metin2_map_guild_inside01/skipia_dungeon.msenv +++ b/assets/season2/season2/metin2_map_guild_inside01/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season2/season2/metin2_map_skipia_bossdungeon/skipia_dungeon.msenv b/assets/season2/season2/metin2_map_skipia_bossdungeon/skipia_dungeon.msenv index 5f6babf6..7262b6a6 100644 --- a/assets/season2/season2/metin2_map_skipia_bossdungeon/skipia_dungeon.msenv +++ b/assets/season2/season2/metin2_map_skipia_bossdungeon/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season2/season2/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv b/assets/season2/season2/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv index 5f6babf6..7262b6a6 100644 --- a/assets/season2/season2/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv +++ b/assets/season2/season2/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season2/season2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv b/assets/season2/season2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv index 5f6babf6..7262b6a6 100644 --- a/assets/season2/season2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv +++ b/assets/season2/season2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season2/season2/metin2_map_trent02_a/trent02.msenv b/assets/season2/season2/metin2_map_trent02_a/trent02.msenv index 035e0b48..e38be8b7 100644 --- a/assets/season2/season2/metin2_map_trent02_a/trent02.msenv +++ b/assets/season2/season2/metin2_map_trent02_a/trent02.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.980392 0.980392 0.980392 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/season2/season2/metin2_map_trent_a/trent.msenv b/assets/season2/season2/metin2_map_trent_a/trent.msenv index 70cd95e4..2c285356 100644 --- a/assets/season2/season2/metin2_map_trent_a/trent.msenv +++ b/assets/season2/season2/metin2_map_trent_a/trent.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 0.976471 0.976471 0.976471 1.000000 MaxBrightness 1.000000 MainFlareEnable 0 diff --git a/assets/season3_eu/season2/metin2_map_skipia_bossdungeon/skipia_dungeon.msenv b/assets/season3_eu/season2/metin2_map_skipia_bossdungeon/skipia_dungeon.msenv index 09b52fef..f3dc95fc 100644 --- a/assets/season3_eu/season2/metin2_map_skipia_bossdungeon/skipia_dungeon.msenv +++ b/assets/season3_eu/season2/metin2_map_skipia_bossdungeon/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season3_eu/season2/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv b/assets/season3_eu/season2/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv index 09b52fef..f3dc95fc 100644 --- a/assets/season3_eu/season2/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv +++ b/assets/season3_eu/season2/metin2_map_skipia_dungeon_01/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/season3_eu/season2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv b/assets/season3_eu/season2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv index 09b52fef..f3dc95fc 100644 --- a/assets/season3_eu/season2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv +++ b/assets/season3_eu/season2/metin2_map_skipia_dungeon_02/skipia_dungeon.msenv @@ -70,7 +70,7 @@ Group SkyBox Group LensFlare { - Enable 0 + Enable 1 BrightnessColor 1.000000 0.886275 0.886275 1.000000 MaxBrightness 0.740000 MainFlareEnable 1 diff --git a/assets/uiscript/uiscript/gameoptiondialog_formobile.py b/assets/uiscript/uiscript/gameoptiondialog_formobile.py deleted file mode 100644 index 2776dcf3..00000000 --- a/assets/uiscript/uiscript/gameoptiondialog_formobile.py +++ /dev/null @@ -1,479 +0,0 @@ -import uiScriptLocale - -ROOT_PATH = "d:/ymir work/ui/public/" - -TEMPORARY_X = +13 -BUTTON_TEMPORARY_X = 5 -PVP_X = -10 - -LINE_LABEL_X = 30 -LINE_DATA_X = 90 -LINE_STEP = 0 -SMALL_BUTTON_WIDTH = 45 -MIDDLE_BUTTON_WIDTH = 65 - -window = { - "name" : "GameOptionDialog", - "style" : ("movable", "float",), - - "x" : 0, - "y" : 0, - - "width" : 300, - "height" : (258+25), - - "children" : - ( - { - "name" : "board", - "type" : "board", - - "x" : 0, - "y" : 0, - - "width" : 300, - "height" : 25*12+8, - - "children" : - ( - ## Title - { - "name" : "titlebar", - "type" : "titlebar", - "style" : ("attach",), - - "x" : 8, - "y" : 8, - - "width" : 284, - "color" : "gray", - - "children" : - ( - { "name":"titlename", "type":"text", "x":0, "y":3, - "text" : uiScriptLocale.GAMEOPTION_TITLE, - "horizontal_align":"center", "text_horizontal_align":"center" }, - ), - }, - - ## 이름색 - { - "name" : "name_color", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 40+2, - - "text" : uiScriptLocale.OPTION_NAME_COLOR, - }, - { - "name" : "name_color_normal", - "type" : "radio_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0, - "y" : 40, - - "text" : uiScriptLocale.OPTION_NAME_COLOR_NORMAL, - - "default_image" : ROOT_PATH + "Middle_Button_01.sub", - "over_image" : ROOT_PATH + "Middle_Button_02.sub", - "down_image" : ROOT_PATH + "Middle_Button_03.sub", - }, - { - "name" : "name_color_empire", - "type" : "radio_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1, - "y" : 40, - - "text" : uiScriptLocale.OPTION_NAME_COLOR_EMPIRE, - - "default_image" : ROOT_PATH + "Middle_Button_01.sub", - "over_image" : ROOT_PATH + "Middle_Button_02.sub", - "down_image" : ROOT_PATH + "Middle_Button_03.sub", - }, - - ## 타겟창 - { - "name" : "target_board", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 65+2, - - "text" : uiScriptLocale.OPTION_TARGET_BOARD, - }, - { - "name" : "target_board_no_view", - "type" : "radio_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0, - "y" : 65, - - "text" : uiScriptLocale.OPTION_TARGET_BOARD_NO_VIEW, - - "default_image" : ROOT_PATH + "Middle_Button_01.sub", - "over_image" : ROOT_PATH + "Middle_Button_02.sub", - "down_image" : ROOT_PATH + "Middle_Button_03.sub", - }, - { - "name" : "target_board_view", - "type" : "radio_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1, - "y" : 65, - - "text" : uiScriptLocale.OPTION_TARGET_BOARD_VIEW, - - "default_image" : ROOT_PATH + "Middle_Button_01.sub", - "over_image" : ROOT_PATH + "Middle_Button_02.sub", - "down_image" : ROOT_PATH + "Middle_Button_03.sub", - }, - - - ## PvP Mode - { - "name" : "pvp_mode", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 90+2, - - "text" : uiScriptLocale.OPTION_PVPMODE, - }, - { - "name" : "pvp_peace", - "type" : "radio_button", - - "x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*0, - "y" : 90, - - "text" : uiScriptLocale.OPTION_PVPMODE_PEACE, - "tooltip_text" : uiScriptLocale.OPTION_PVPMODE_PEACE_TOOLTIP, - - "default_image" : ROOT_PATH + "small_Button_01.sub", - "over_image" : ROOT_PATH + "small_Button_02.sub", - "down_image" : ROOT_PATH + "small_Button_03.sub", - }, - { - "name" : "pvp_revenge", - "type" : "radio_button", - - "x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*1, - "y" : 90, - - "text" : uiScriptLocale.OPTION_PVPMODE_REVENGE, - "tooltip_text" : uiScriptLocale.OPTION_PVPMODE_REVENGE_TOOLTIP, - - "default_image" : ROOT_PATH + "small_Button_01.sub", - "over_image" : ROOT_PATH + "small_Button_02.sub", - "down_image" : ROOT_PATH + "small_Button_03.sub", - }, - { - "name" : "pvp_guild", - "type" : "radio_button", - - "x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*2, - "y" : 90, - - "text" : uiScriptLocale.OPTION_PVPMODE_GUILD, - "tooltip_text" : uiScriptLocale.OPTION_PVPMODE_GUILD_TOOLTIP, - - "default_image" : ROOT_PATH + "small_Button_01.sub", - "over_image" : ROOT_PATH + "small_Button_02.sub", - "down_image" : ROOT_PATH + "small_Button_03.sub", - }, - { - "name" : "pvp_free", - "type" : "radio_button", - - "x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*3, - "y" : 90, - - "text" : uiScriptLocale.OPTION_PVPMODE_FREE, - "tooltip_text" : uiScriptLocale.OPTION_PVPMODE_FREE_TOOLTIP, - - "default_image" : ROOT_PATH + "small_Button_01.sub", - "over_image" : ROOT_PATH + "small_Button_02.sub", - "down_image" : ROOT_PATH + "small_Button_03.sub", - }, - - ## Block - { - "name" : "block", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 115+2, - - "text" : uiScriptLocale.OPTION_BLOCK, - }, - { - "name" : "block_exchange_button", - "type" : "toggle_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0, - "y" : 115, - - "text" : uiScriptLocale.OPTION_BLOCK_EXCHANGE, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "block_party_button", - "type" : "toggle_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1, - "y" : 115, - - "text" : uiScriptLocale.OPTION_BLOCK_PARTY, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "block_guild_button", - "type" : "toggle_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*2, - "y" : 115, - - "text" : uiScriptLocale.OPTION_BLOCK_GUILD, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "block_whisper_button", - "type" : "toggle_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0, - "y" : 140, - - "text" : uiScriptLocale.OPTION_BLOCK_WHISPER, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "block_friend_button", - "type" : "toggle_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1, - "y" : 140, - - "text" : uiScriptLocale.OPTION_BLOCK_FRIEND, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "block_party_request_button", - "type" : "toggle_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*2, - "y" : 140, - - "text" : uiScriptLocale.OPTION_BLOCK_PARTY_REQUEST, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - - ## Chat - { - "name" : "chat", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 165+2, - - "text" : uiScriptLocale.OPTION_VIEW_CHAT, - }, - { - "name" : "view_chat_on_button", - "type" : "radio_button", - - "x" : LINE_DATA_X, - "y" : 165, - - "text" : uiScriptLocale.OPTION_VIEW_CHAT_ON, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "view_chat_off_button", - "type" : "radio_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH, - "y" : 165, - - "text" : uiScriptLocale.OPTION_VIEW_CHAT_OFF, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - - ## Always Show Name - { - "name" : "always_show_name", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 190+2, - - "text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME, - }, - { - "name" : "always_show_name_on_button", - "type" : "radio_button", - - "x" : LINE_DATA_X, - "y" : 190, - - "text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME_ON, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "always_show_name_off_button", - "type" : "radio_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH, - "y" : 190, - - "text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME_OFF, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - - ## Mobile - { - "name" : "mobile", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 215+2, - - "text" : uiScriptLocale.OPTION_MOBILE, - }, - { - "name" : "input_mobile_button", - "type" : "button", - - "x" : LINE_DATA_X, - "y" : 215, - - "text" : uiScriptLocale.OPTION_INPUT_MOBILE_BUTTON, - - "default_image" : ROOT_PATH + "Large_Button_01.sub", - "over_image" : ROOT_PATH + "Large_Button_02.sub", - "down_image" : ROOT_PATH + "Large_Button_03.sub", - }, - { - "name" : "delete_mobile_button", - "type" : "button", - - "x" : 90, - "y" : 215, - - "text" : uiScriptLocale.OPTION_DELETE_MOBILE_BUTTON, - - "default_image" : ROOT_PATH + "Large_Button_01.sub", - "over_image" : ROOT_PATH + "Large_Button_02.sub", - "down_image" : ROOT_PATH + "Large_Button_03.sub", - }, - - ## Effect On/Off - { - "name" : "effect_on_off", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 240+2, - - "text" : uiScriptLocale.OPTION_EFFECT, - }, - { - "name" : "show_damage_on_button", - "type" : "radio_button", - - "x" : LINE_DATA_X, - "y" : 240, - - "text" : uiScriptLocale.OPTION_VIEW_CHAT_ON, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "show_damage_off_button", - "type" : "radio_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH, - "y" : 240, - - "text" : uiScriptLocale.OPTION_VIEW_CHAT_OFF, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - - ## 판매문구 - - { - "name" : "salestext_on_off", - "type" : "text", - - "x" : LINE_LABEL_X, - "y" : 265+2, - - "text" : uiScriptLocale.OPTION_SALESTEXT, - }, - { - "name" : "salestext_on_button", - "type" : "radio_button", - - "x" : LINE_DATA_X, - "y" : 265, - - "text" : uiScriptLocale.OPTION_SALESTEXT_VIEW_ON, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - { - "name" : "salestext_off_button", - "type" : "radio_button", - - "x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH, - "y" : 265, - - "text" : uiScriptLocale.OPTION_SALESTEXT_VIEW_OFF, - - "default_image" : ROOT_PATH + "middle_button_01.sub", - "over_image" : ROOT_PATH + "middle_button_02.sub", - "down_image" : ROOT_PATH + "middle_button_03.sub", - }, - - ), - }, - ), -} diff --git a/assets/uiscript/uiscript/messengerwindow.py b/assets/uiscript/uiscript/messengerwindow.py index ce167d22..49eeb2ba 100644 --- a/assets/uiscript/uiscript/messengerwindow.py +++ b/assets/uiscript/uiscript/messengerwindow.py @@ -56,6 +56,7 @@ window = { "down_image" : "d:/ymir work/ui/game/windows/messenger_add_friend_03.sub", "disable_image" : "d:/ymir work/ui/game/windows/messenger_add_friend_04.sub", }, + { "name" : "WhisperButton", "type" : "button", @@ -73,28 +74,12 @@ window = { "down_image" : "d:/ymir work/ui/game/windows/messenger_whisper_03.sub", "disable_image" : "d:/ymir work/ui/game/windows/messenger_whisper_04.sub", }, - { - "name" : "MobileButton", - "type" : "button", - "x" : BUTTON_START_X_POS + BUTTON_X_STEP*2, - "y" : 30, - "horizontal_align" : "center", - "vertical_align" : "bottom", - "tooltip_text" : uiScriptLocale.MESSENGER_MOBILE, - "tooltip_x" : 0, - "tooltip_y" : 35, - - "default_image" : "d:/ymir work/ui/game/windows/messenger_mobile_01.sub", - "over_image" : "d:/ymir work/ui/game/windows/messenger_mobile_02.sub", - "down_image" : "d:/ymir work/ui/game/windows/messenger_mobile_03.sub", - "disable_image" : "d:/ymir work/ui/game/windows/messenger_mobile_04.sub", - }, { "name" : "RemoveButton", "type" : "button", - "x" : BUTTON_START_X_POS + BUTTON_X_STEP*3, + "x" : BUTTON_START_X_POS + BUTTON_X_STEP*2, "y" : 30, "horizontal_align" : "center", "vertical_align" : "bottom", @@ -107,11 +92,12 @@ window = { "down_image" : "d:/ymir work/ui/game/windows/messenger_delete_03.sub", "disable_image" : "d:/ymir work/ui/game/windows/messenger_delete_04.sub", }, + { "name" : "GuildButton", "type" : "button", - "x" : BUTTON_START_X_POS + BUTTON_X_STEP*4, + "x" : BUTTON_START_X_POS + BUTTON_X_STEP*3, "y" : 30, "horizontal_align" : "center", "vertical_align" : "bottom", @@ -125,5 +111,5 @@ window = { "disable_image" : "d:/ymir work/ui/game/windows/messenger_guild_04.sub", }, - ), ## end of main window -} + ), +} \ No newline at end of file