Skip to content

Commit

Permalink
Sync.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lead0b110010100 authored and Lead0b110010100 committed Jan 25, 2021
1 parent 8d1121a commit 19fb195
Show file tree
Hide file tree
Showing 39 changed files with 4,259 additions and 3,329 deletions.
2 changes: 1 addition & 1 deletion main/gen_settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class PORT:
("DB_ADDR: %s", (v_dbHostname)),
("COMMON_SQL: %s %s %d", (v_serverData, M2SD["common"], v_mysqlport)),
("LOG_SQL: %s %s %d", (v_serverData, M2SD["log"], v_mysqlport)),
("TEST_SERVER: %d", (False)),
("TEST_SERVER: %d", (True)),
# ("PK_SERVER: %d", (True)),
("ADMINPAGE_IP1: %s", (v_adminPageLocalIP)),
("ADMINPAGE_PASSWORD: %s", (v_adminPagePassword)),
Expand Down
14 changes: 7 additions & 7 deletions main/srv1/share/locale/germany/common_drop_item.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
--MinLv|MaxLv|Chance|Item| K.P. MinLv|MaxLv|Chance|Item| K.P. MinLv|MaxLv|Chance|Item| K.P. MinLv|MaxLv|Chance|Item| K.P.
50 130 0.11 25040 10000 50 130 0.12 25040 10000 50 130 0.13 25040 10000 50 130 0.15 25040 10000 --Segensschriftrolle
30 130 0.11 27987 10000 30 130 0.12 27987 10000 30 130 0.13 27987 10000 30 130 0.15 27987 10000 --Muschel
50 100 0.11 70102 10000 50 100 0.12 70102 10000 50 100 0.13 70102 10000 50 100 0.15 70102 10000 --Zen-Bohne
50 130 0.11 70102 10000 50 130 0.12 70102 10000 50 130 0.13 70102 10000 50 130 0.15 70102 10000 --Zen-Bohne
30 130 0.04 50600 10000 30 130 0.05 50600 10000 30 130 0.06 50600 10000 30 130 0.09 50600 10000 --Bergbau-Buch
50 75 0.11 50060 10000 50 75 0.12 50060 10000 50 75 0.13 50060 10000 50 75 0.15 50060 10000 --Buch-Der-Reitkunst
1 75 0.11 50061 10000 1 75 0.12 50061 10000 1 75 0.13 50061 10000 1 75 0.15 50061 10000 --Handbuch-Pferdezeahmen

1 25 0.05 50301 10000 1 25 0.06 50301 10000 1 25 0.07 50301 10000 1 25 0.10 50301 10000 --Sun-Zi
1 50 0.05 50302 10000 1 50 0.06 50302 10000 1 50 0.07 50302 10000 1 50 0.10 50302 10000 --Wuzi
1 75 0.05 50303 10000 1 75 0.06 50303 10000 1 75 0.07 50303 10000 1 75 0.10 50303 10000 --Wei-Liao-Zi
1 130 0.05 50301 10000 1 130 0.06 50301 10000 1 130 0.07 50301 10000 1 130 0.10 50301 10000 --Sun-Zi
1 130 0.05 50302 10000 1 130 0.06 50302 10000 1 130 0.07 50302 10000 1 130 0.10 50302 10000 --Wuzi
1 130 0.05 50303 10000 1 130 0.06 50303 10000 1 130 0.07 50303 10000 1 130 0.10 50303 10000 --Wei-Liao-Zi

30 50 0.02 50304 10000 30 50 0.03 50304 10000 30 50 0.04 50304 10000 30 50 0.07 50304 10000 --Combobeherrschung
30 50 0.02 50305 10000 30 50 0.03 50305 10000 30 50 0.04 50305 10000 30 50 0.07 50305 10000 --Combomeisterbuch
Expand All @@ -19,9 +19,9 @@
1 75 0.05 50312 10000 1 75 0.06 50312 10000 1 75 0.07 50312 10000 1 75 0.10 50312 10000 --Chunjo-Sprachen
1 75 0.05 50313 10000 1 75 0.06 50313 10000 1 75 0.07 50313 10000 1 75 0.10 50313 10000 --Jinno-Sprachen

1 25 0.05 50314 10000 1 25 0.06 50314 10000 1 25 0.07 50314 10000 1 25 0.10 50314 10000 --Buch-der-Verwandlung
1 50 0.05 50315 10000 1 50 0.06 50315 10000 1 50 0.07 50315 10000 1 50 0.10 50315 10000 --Buch-fort-Verwandlung
1 75 0.05 50316 10000 1 75 0.06 50316 10000 1 75 0.07 50316 10000 1 75 0.10 50316 10000 --Buch-exp-Verwandlung
1 130 0.05 50314 10000 1 130 0.06 50314 10000 1 130 0.07 50314 10000 1 130 0.10 50314 10000 --Buch-der-Verwandlung
25 130 0.05 50315 10000 25 130 0.06 50315 10000 25 130 0.07 50315 10000 25 130 0.10 50315 10000 --Buch-fort-Verwandlung
35 130 0.05 50316 10000 35 130 0.06 50316 10000 35 130 0.07 50316 10000 35 130 0.10 50316 10000 --Buch-exp-Verwandlung

1 25 0.12 50307 10000 1 25 0.13 50307 10000 1 25 0.14 50307 10000 1 25 0.17 50307 10000 --Missionsbuch(leicht)
25 50 0.12 50308 10000 25 50 0.13 50308 10000 25 50 0.14 50308 10000 25 50 0.17 50308 10000 --Missionsbuch(mittel)
Expand Down
75 changes: 73 additions & 2 deletions main/srv1/share/locale/germany/locale_de.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@
"Der Krieg zwischen %s und %s wurde abgebrochen. ";

"Close";
"Schliessen ";
"Schlie�en ";

"Cancelled. The Battle did not begin.";
"Abgebrochen. Der Kampf hat nicht begonnen. ";
Expand Down Expand Up @@ -2885,7 +2885,7 @@
"Der Krieg zwischen %s und %s wurde abgebrochen. ";

"Close";
"Schliessen ";
"Schlie�en ";

"Cancelled. The Battle did not begin.";
"Abgebrochen. Der Kampf hat nicht begonnen. ";
Expand Down Expand Up @@ -6619,3 +6619,74 @@
"Change channel canceled.";
"Channel wechsel wurde abgebrochen.";

"SHOP_SUCCESS_CLOSE";
"Dein Laden wurde geschlossen, Items und das verdiente Yang wird den Geschenken hinzugef�gt.";

"SHOP_SUCCESS_TOO_FAST";
"Shop cannot be closed right now, please try later.";

"SHOP_MAX_ERR";
"Du kannst nicht mehr L�den er�ffnen.";

"INVENTORY_FULL_ERROR";
"Es ist nicht genug Platz im Inventar.";

"UNKNOW_ERROR";
"Ein unbekannter Fehler ist aufgetreten.";

"SHOP_YANG_ADD";
"Das Yang wurde erfolgreich im Inventar hinzugef�gt.";

"SHOP_CASH_ADD";
"Das Yang wurde erfolgreich deinem Account hinzugef�gt.";

"SHOP_TIMEOUT";
"Bitte warte %d Sekunden bevor du deinen Laden er�ffnest.";

"GIFT_NOT_EXISTS";
"Das Geschenk existiert nicht.";

"GIFT_ADD_SUCCESS";
"Das Geschenk wurde erfolgreich im Inventar hinzugef�gt.";

"GIFT_ADD_ALL_SUCCESS";
"Deine Geschenke wurden erfolgreich im Inventar hinzugef�gt.";

"SHOP_REASON";
": dein Laden wurde geschlossen";

"SHOP_NAME";
"#PLAYER_NAME# Laden";

"SHOP_PRIV_ERROR";
"Du hast nicht die Berechtigung einen Laden zu er�ffnen.";

"SHOP_OX_ERROR";
"Du kannst hier keinen Laden er�ffnen";

"SHOP_MAP_MAX";
"Du kannst keinen weiteren L�den auf dieser Map er�ffnen.";

"SHOP_CANNOT_OPEN_HERE";
"Du kannst auf dieser Map keinen Laden er�ffnen.";

"SHOP_NEED_MONEY";
"Du brauchst %lld Yang um deinen Laden zu er�ffnen.";

"SHOP_TEMP_OFF";
"Das Offline Shop System ist tempor�r deaktiviert.";

"SHOP_EDIT_SUCCESS";
"Deine Items wurden erfolgreich geupdatet. Shop will be unlocked after 5 seconds.";

"SHOP_LOCKED";
"Shop is locked, please try later.";

"SHOP_ITEM_REASON";
": gel�schtes Item";

"SHOP_YANG_IN_GIFT";
"You can get money from shop in Gift Window.";

"SHOP_NO_EDIT_MODE";
"Please open edit window again.";
72 changes: 72 additions & 0 deletions main/srv1/share/locale/germany/locale_en.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2235,3 +2235,75 @@

"Change channel canceled.";
"Channel wechsel wurde abgebrochen.";

"SHOP_SUCCESS_CLOSE";
"Shop has been closed, items and earned yang from yout shop is have been added to gifts";

"SHOP_SUCCESS_TOO_FAST";
"Shop cannot be closed right now, please try later.";

"SHOP_MAX_ERR";
"You can't create more own shops";

"INVENTORY_FULL_ERROR";
"You don't have enough space in inventory";

"UNKNOW_ERROR";
"An unknown error has occurred";

"SHOP_YANG_ADD";
"Gold has been addeted your inventory sucessful";

"SHOP_CASH_ADD";
"Cash has been addeted your account sucessful";

"SHOP_TIMEOUT";
"Please wait %d s before open shop";

"GIFT_NOT_EXISTS";
"Gift not exists";

"GIFT_ADD_SUCCESS";
"Gift has been addeted your inventory sucessful";

"GIFT_ADD_ALL_SUCCESS";
"Gift's has been addeted your inventory sucessful";

"SHOP_REASON";
"Closing Shop";

"SHOP_NAME";
"#PLAYER_NAME# Shop";

"SHOP_PRIV_ERROR";
"You don't have privileges to open private shop.";

"SHOP_OX_ERROR";
"You can't open private shop here.";

"SHOP_MAP_MAX";
"You can't open new private shop on this map";

"SHOP_CANNOT_OPEN_HERE";
"You can't open private shop on this map";

"SHOP_NEED_MONEY";
"You need %lld Yang for this open shops";

"SHOP_TEMP_OFF ";
"Offline shop system is temporary offline";

"SHOP_EDIT_SUCCESS";
"Shop item's has been sucessful updated and will be unlocked after 5 seconds.";

"SHOP_LOCKED";
"Shop is locked, please try later.";

"SHOP_ITEM_REASON";
"Deleted item";

"SHOP_YANG_IN_GIFT";
"You can get money from shop in Gift Window.";

"SHOP_NO_EDIT_MODE";
"Please open edit window again.";
3 changes: 2 additions & 1 deletion main/srv1/share/locale/germany/quest/game_option.quest
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
quest game_option begin
state start begin
when login begin
local val=0
local val = 0
local msg = gameforge.game_option._100_say .. " "

if pc.getqf("block_exchange") == 1 then
msg = msg..gameforge.game_option._110_say
val = val + 1
Expand Down
6 changes: 4 additions & 2 deletions main/srv1/share/locale/germany/quest/quest_announcements/first_login.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
quest first_login begin
state start begin
when login with pc.getqf("done") == 0 begin
when login begin
pc.set_skill_level(126, 20)
pc.set_skill_level(127, 20)
pc.set_skill_level(128, 20)
Expand All @@ -11,7 +11,9 @@ quest first_login begin

text = string.format("|cffa7ffd4Wir begrüßen|r %s |cffa7ffd4als neuen %s in %s. Herzlich Willkommen!|r", name, job, empire)
notice_all(tag(SERVER_COLOR, "[Server]") .. " " .. text)
pc.setqf("done", 1)
complete_quest()
end
end
state __COMPLETE__ begin
end
end
Loading

0 comments on commit 19fb195

Please sign in to comment.