patchTTT.diff 3.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687
  1. diff --git a/Gameserver/Amfphp/configs/config_and.php b/Gameserver/Amfphp/configs/config_and.php
  2. index ae066db3..f935aea5 100644
  3. --- a/Gameserver/Amfphp/configs/config_and.php
  4. +++ b/Gameserver/Amfphp/configs/config_and.php
  5. @@ -30,7 +30,7 @@ class config_and extends config {
  6. protected function _InitOuterNetPaydb() {
  7. $this->paydb->host = '172.17.16.5';
  8. $this->paydb->port = '3306';
  9. - $this->paydb->name = 'ylsj2019_pay_t2';
  10. + $this->paydb->name = 'ylsj2019_pay_TTT';
  11. $this->paydb->user = 'ylsjMTY0LjkyLjE5NC4x';
  12. $this->paydb->password = 'wanggang1985';
  13. }
  14. @@ -42,7 +42,7 @@ class config_and extends config {
  15. $this->nosql->host = "172.17.16.5"; # host/ip
  16. $this->nosql->port = 6379; # 端口
  17. $this->nosql->pwd = 'wanggang1985'; # 密钥
  18. - $this->nosql->db = 2; # db索引
  19. + $this->nosql->db = 1; # db索引
  20. }
  21. /**
  22. @@ -50,7 +50,7 @@ class config_and extends config {
  23. */
  24. protected function _InitOuterMongoDB() {
  25. $this->mongodb = "mongodb://ylsjMTY0LjkyLjE5NC4x:wanggang1985@172.17.16.5:23333/?authSource=ylsj2019";
  26. - $this->mongo->db = "ylsj2019_t2";
  27. + $this->mongo->db = "ylsj2019_TTT";
  28. $this->mongo->conn = "mongodb://gwang:wanggang1985@localhost:27017/?authSource=admin";
  29. }
  30. diff --git a/Gameserver/globals.php b/Gameserver/globals.php
  31. index a785d647..5d8172d8 100644
  32. --- a/Gameserver/globals.php
  33. +++ b/Gameserver/globals.php
  34. @@ -19,11 +19,11 @@ define("PLAT", 'and'); # and, ios, web
  35. /**
  36. * 游戏是否上线
  37. */
  38. -define("GAME_ONLINE", false);
  39. +define("GAME_ONLINE", true);
  40. /**
  41. * 控制debug黑框调试输出
  42. */
  43. define("DEBUGING", true);
  44. -define("SDK_GAME_ONLINE", false);
  45. +define("SDK_GAME_ONLINE", true);
  46. diff --git a/patchTTT.diff b/patchTTT.diff
  47. index 86940b0e..e69de29b 100644
  48. --- a/patchTTT.diff
  49. +++ b/patchTTT.diff
  50. @@ -1,33 +0,0 @@
  51. -
  52. -diff --git a/Gameserver/globals.php b/Gameserver/globals.php
  53. -index 63b43b86..a785d647 100644
  54. ---- a/Gameserver/globals.php
  55. -+++ b/Gameserver/globals.php
  56. -@@ -19,7 +19,7 @@ define("PLAT", 'and'); # and, ios, web
  57. - /**
  58. - * 游戏是否上线
  59. - */
  60. --define("GAME_ONLINE", false);
  61. -+define("GAME_ONLINE", true);
  62. -
  63. - /**
  64. - * 控制debug黑框调试输出
  65. ---
  66. -
  67. -
  68. -diff --git a/Gameserver/Amfphp/util/CRedisUtil.php b/Gameserver/Amfphp/util/CRedisUtil.php
  69. -index 6ceb1794..d1f7ba15 100644
  70. ---- a/Gameserver/Amfphp/util/CRedisUtil.php
  71. -+++ b/Gameserver/Amfphp/util/CRedisUtil.php
  72. -@@ -164,7 +164,7 @@ class CRedisUtil {
  73. - * @param string $db 数据库, 不建议输入参数, 如果是购买云实例只有一个db.
  74. - * @return \CRedisUtil
  75. - */
  76. -- public function conn($host, $port, $pwd = "", $db = 0) {
  77. -+ public function conn($host, $port, $pwd = "", $db = 1) {
  78. - // DebugHelper::print_stack_trace();
  79. - $this->redis = new \Predis\Client(array(
  80. - 'scheme' => 'tcp',
  81. ---
  82. -
  83. -