forked from cherry-game/cherry
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
ryansu
committed
Jun 15, 2021
1 parent
6b65bbf
commit 6ad04bd
Showing
26 changed files
with
282 additions
and
443 deletions.
There are no files selected for viewing
50 changes: 25 additions & 25 deletions
50
...ndler/profile/data_config/dropConfig.json → ...rofile_single/data_config/dropConfig.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| [ | ||
| { | ||
| "dropId": 1001, | ||
| "itemType": 1, | ||
| "itemId": 2, | ||
| "num": 10, | ||
| "dropType": 2, | ||
| "dropValue": 10011 | ||
| }, | ||
| { | ||
| "dropId": 1002, | ||
| "itemType": 3, | ||
| "itemId": 10001, | ||
| "num": 1, | ||
| "dropType": 1, | ||
| "dropValue": 100 | ||
| }, | ||
| { | ||
| "dropId": 1002, | ||
| "itemType": 3, | ||
| "itemId": 10002, | ||
| "num": 1, | ||
| "dropType": 1, | ||
| "dropValue": 100 | ||
| } | ||
| [ | ||
| { | ||
| "dropId": 1001, | ||
| "itemType": 1, | ||
| "itemId": 2, | ||
| "num": 10, | ||
| "dropType": 2, | ||
| "dropValue": 10011 | ||
| }, | ||
| { | ||
| "dropId": 1002, | ||
| "itemType": 3, | ||
| "itemId": 10001, | ||
| "num": 1, | ||
| "dropType": 1, | ||
| "dropValue": 100 | ||
| }, | ||
| { | ||
| "dropId": 1002, | ||
| "itemType": 3, | ||
| "itemId": 10002, | ||
| "num": 1, | ||
| "dropType": 1, | ||
| "dropValue": 100 | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 26 additions & 26 deletions
52
...t1_data_config/profile/common/logger.json → _examples/profile_split/common/logger.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,27 @@ | ||
| { | ||
| "logger": { | ||
| "game_log": { | ||
| "level": "debug", | ||
| "enable_write_file": false, | ||
| "enable_console": true, | ||
| "file_path": "logs/game.log", | ||
| "max_size": 128, | ||
| "max_age": 7, | ||
| "max_backups": 0, | ||
| "compress": false, | ||
| "time_format": "15:04:05.000", | ||
| "print_caller": true | ||
| }, | ||
| "test_handler": { | ||
| "level": "debug", | ||
| "enable_write_file": true, | ||
| "enable_console": false, | ||
| "file_path": "logs/test_handler.log", | ||
| "max_size": 128, | ||
| "max_age": 7, | ||
| "max_backups": 0, | ||
| "compress": false, | ||
| "time_format": "15:04:05.000" | ||
| } | ||
| } | ||
| { | ||
| "logger": { | ||
| "game_log": { | ||
| "level": "debug", | ||
| "enable_write_file": false, | ||
| "enable_console": true, | ||
| "file_path": "logs/game.log", | ||
| "max_size": 128, | ||
| "max_age": 7, | ||
| "max_backups": 0, | ||
| "compress": false, | ||
| "time_format": "15:04:05.000", | ||
| "print_caller": true | ||
| }, | ||
| "test_handler": { | ||
| "level": "debug", | ||
| "enable_write_file": true, | ||
| "enable_console": false, | ||
| "file_path": "logs/test_handler.log", | ||
| "max_size": 128, | ||
| "max_age": 7, | ||
| "max_backups": 0, | ||
| "compress": false, | ||
| "time_format": "15:04:05.000" | ||
| } | ||
| } | ||
| } |
52 changes: 26 additions & 26 deletions
52
...onfig/profile/data_config/dropConfig.json → ...profile_split/data_config/dropConfig.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,27 @@ | ||
| [ | ||
| { | ||
| "dropId": 1011, | ||
| "itemType": 1, | ||
| "itemId": 2, | ||
| "num": 10, | ||
| "dropType": 2, | ||
| "dropValue": 2, | ||
| "desc": "desc test1" | ||
| }, | ||
| { | ||
| "dropId": 1002, | ||
| "itemType": 3, | ||
| "itemId": 10001, | ||
| "num": 1, | ||
| "dropType": 1, | ||
| "dropValue": 10 | ||
| }, | ||
| { | ||
| "dropId": 1002, | ||
| "itemType": 3, | ||
| "itemId": 10002, | ||
| "num": 1, | ||
| "dropType": 1, | ||
| "dropValue": 100 | ||
| } | ||
| [ | ||
| { | ||
| "dropId": 1011, | ||
| "itemType": 1, | ||
| "itemId": 2, | ||
| "num": 10, | ||
| "dropType": 2, | ||
| "dropValue": 2, | ||
| "desc": "desc test1" | ||
| }, | ||
| { | ||
| "dropId": 1002, | ||
| "itemType": 3, | ||
| "itemId": 10001, | ||
| "num": 1, | ||
| "dropType": 1, | ||
| "dropValue": 10 | ||
| }, | ||
| { | ||
| "dropId": 1002, | ||
| "itemType": 3, | ||
| "itemId": 10002, | ||
| "num": 1, | ||
| "dropType": 1, | ||
| "dropValue": 100 | ||
| } | ||
| ] |
16 changes: 8 additions & 8 deletions
16
...ig/profile/data_config/dropOneConfig.json → ...file_split/data_config/dropOneConfig.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "dropId": 9011, | ||
| "itemType": 91, | ||
| "itemId": 93, | ||
| "num": 90, | ||
| "dropType": 92, | ||
| "dropValue": 9, | ||
| "desc": "desc1111222" | ||
| { | ||
| "dropId": 9011, | ||
| "itemType": 91, | ||
| "itemId": 93, | ||
| "num": 90, | ||
| "dropType": 92, | ||
| "dropValue": 9, | ||
| "desc": "desc1111222" | ||
| } |
70 changes: 35 additions & 35 deletions
70
...config/profile/profile-local-cluster.json → .../profile_split/profile-local-cluster.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,36 @@ | ||
| { | ||
| "cluster": { | ||
| "mode": "nodes", | ||
| "nodes": { | ||
| "web": [ | ||
| { | ||
| "enable": true, | ||
| "node_id": "web-1", | ||
| "address": ":10820", | ||
| "rpc_address": "127.0.0.1:20820", | ||
| "__settings__": { | ||
| "maintain_state": 2, | ||
| "@ref_logger": "game_log" | ||
| } | ||
| } | ||
| ], | ||
| "game": [ | ||
| { | ||
| "enable": true, | ||
| "node_id": "game-1", | ||
| "address": ":10860", | ||
| "rpc_address": "127.0.0.1:20860", | ||
| "__settings__": { | ||
| "maintain_state": 2, | ||
| "dbs": [ | ||
| "x_game-1" | ||
| ], | ||
| "ref_logger": "game_log" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "etcd": { | ||
| } | ||
| } | ||
| { | ||
| "cluster": { | ||
| "mode": "nodes", | ||
| "nodes": { | ||
| "web": [ | ||
| { | ||
| "enable": true, | ||
| "node_id": "web-1", | ||
| "address": ":10820", | ||
| "rpc_address": "127.0.0.1:20820", | ||
| "__settings__": { | ||
| "maintain_state": 2, | ||
| "@ref_logger": "game_log" | ||
| } | ||
| } | ||
| ], | ||
| "game": [ | ||
| { | ||
| "enable": true, | ||
| "node_id": "game-1", | ||
| "address": ":10860", | ||
| "rpc_address": "127.0.0.1:20860", | ||
| "__settings__": { | ||
| "maintain_state": 2, | ||
| "dbs": [ | ||
| "x_game-1" | ||
| ], | ||
| "ref_logger": "game_log" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "etcd": { | ||
| } | ||
| } | ||
| } |
26 changes: 13 additions & 13 deletions
26
...ig/profile/profile-local-data-config.json → ...file_split/profile-local-data-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| { | ||
| "data_config": { | ||
| "parser": "json", | ||
| "data_source": "file", | ||
| "file": { | ||
| "file_path": "data_config/", | ||
| "ext_name": ".json", | ||
| "reload_time": 3000 | ||
| }, | ||
| "redis": { | ||
| "redis_key": "config:server:xgame" | ||
| } | ||
| } | ||
| { | ||
| "data_config": { | ||
| "parser": "json", | ||
| "data_source": "file", | ||
| "file": { | ||
| "file_path": "data_config/", | ||
| "ext_name": ".json", | ||
| "reload_time": 3000 | ||
| }, | ||
| "redis": { | ||
| "redis_key": "config:server:xgame" | ||
| } | ||
| } | ||
| } |
66 changes: 33 additions & 33 deletions
66
...t1_data_config/profile/profile-local.json → _examples/profile_split/profile-local.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| { | ||
| "debug": true, | ||
| "include": [ | ||
| "common/logger.json", | ||
| "profile-local-cluster.json", | ||
| "profile-local-data-config.json" | ||
| ], | ||
| "db": [ | ||
| { | ||
| "enable": true, | ||
| "group_id": "center_db", | ||
| "id": "center_db", | ||
| "db_name": "dev_xgame_center", | ||
| "host": "192.168.1.20", | ||
| "user_name": "gameserver", | ||
| "password": "password", | ||
| "max_idle_connect": 4, | ||
| "max_open_connect": 8, | ||
| "log_mode": true | ||
| }, | ||
| { | ||
| "enable": true, | ||
| "group_id": "game_db", | ||
| "id": "game_db_1", | ||
| "db_name": "game_db_1", | ||
| "host": "192.168.1.20", | ||
| "user_name": "gameserver", | ||
| "password": "password", | ||
| "max_idle_connect": 4, | ||
| "max_open_connect": 8, | ||
| "log_mode": true | ||
| } | ||
| ] | ||
| { | ||
| "debug": true, | ||
| "include": [ | ||
| "common/logger.json", | ||
| "profile-local-cluster.json", | ||
| "profile-local-data-config.json" | ||
| ], | ||
| "db": [ | ||
| { | ||
| "enable": true, | ||
| "group_id": "center_db", | ||
| "id": "center_db", | ||
| "db_name": "dev_xgame_center", | ||
| "host": "192.168.1.20", | ||
| "user_name": "gameserver", | ||
| "password": "password", | ||
| "max_idle_connect": 4, | ||
| "max_open_connect": 8, | ||
| "log_mode": true | ||
| }, | ||
| { | ||
| "enable": true, | ||
| "group_id": "game_db", | ||
| "id": "game_db_1", | ||
| "db_name": "game_db_1", | ||
| "host": "192.168.1.20", | ||
| "user_name": "gameserver", | ||
| "password": "password", | ||
| "max_idle_connect": 4, | ||
| "max_open_connect": 8, | ||
| "log_mode": true | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.