|
@@ -1,9 +1,39 @@
|
|
|
-
|
|
|
+diff --git a/Gameserver/Amfphp/configs/config_and.php b/Gameserver/Amfphp/configs/config_and.php
|
|
|
+index ae066db3..f935aea5 100644
|
|
|
+--- a/Gameserver/Amfphp/configs/config_and.php
|
|
|
++++ b/Gameserver/Amfphp/configs/config_and.php
|
|
|
+@@ -30,7 +30,7 @@ class config_and extends config {
|
|
|
+ protected function _InitOuterNetPaydb() {
|
|
|
+ $this->paydb->host = '172.17.16.5';
|
|
|
+ $this->paydb->port = '3306';
|
|
|
+- $this->paydb->name = 'ylsj2019_pay_t2';
|
|
|
++ $this->paydb->name = 'ylsj2019_pay_TTT';
|
|
|
+ $this->paydb->user = 'ylsjMTY0LjkyLjE5NC4x';
|
|
|
+ $this->paydb->password = 'wanggang1985';
|
|
|
+ }
|
|
|
+@@ -42,7 +42,7 @@ class config_and extends config {
|
|
|
+ $this->nosql->host = "172.17.16.5"; # host/ip
|
|
|
+ $this->nosql->port = 6379; # 端口
|
|
|
+ $this->nosql->pwd = 'wanggang1985'; # 密钥
|
|
|
+- $this->nosql->db = 2; # db索引
|
|
|
++ $this->nosql->db = 1; # db索引
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+@@ -50,7 +50,7 @@ class config_and extends config {
|
|
|
+ */
|
|
|
+ protected function _InitOuterMongoDB() {
|
|
|
+ $this->mongodb = "mongodb://ylsjMTY0LjkyLjE5NC4x:wanggang1985@172.17.16.5:23333/?authSource=ylsj2019";
|
|
|
+- $this->mongo->db = "ylsj2019_t2";
|
|
|
++ $this->mongo->db = "ylsj2019_TTT";
|
|
|
+ $this->mongo->conn = "mongodb://gwang:wanggang1985@localhost:27017/?authSource=admin";
|
|
|
+ }
|
|
|
+
|
|
|
diff --git a/Gameserver/globals.php b/Gameserver/globals.php
|
|
|
-index 63b43b86..a785d647 100644
|
|
|
+index a785d647..5d8172d8 100644
|
|
|
--- a/Gameserver/globals.php
|
|
|
+++ b/Gameserver/globals.php
|
|
|
-@@ -19,7 +19,7 @@ define("PLAT", 'and'); # and, ios, web
|
|
|
+@@ -19,11 +19,11 @@ define("PLAT", 'and'); # and, ios, web
|
|
|
/**
|
|
|
* 游戏是否上线
|
|
|
*/
|
|
@@ -12,22 +42,46 @@ index 63b43b86..a785d647 100644
|
|
|
|
|
|
/**
|
|
|
* 控制debug黑框调试输出
|
|
|
---
|
|
|
-
|
|
|
-
|
|
|
-diff --git a/Gameserver/Amfphp/util/CRedisUtil.php b/Gameserver/Amfphp/util/CRedisUtil.php
|
|
|
-index 6ceb1794..d1f7ba15 100644
|
|
|
---- a/Gameserver/Amfphp/util/CRedisUtil.php
|
|
|
-+++ b/Gameserver/Amfphp/util/CRedisUtil.php
|
|
|
-@@ -164,7 +164,7 @@ class CRedisUtil {
|
|
|
- * @param string $db 数据库, 不建议输入参数, 如果是购买云实例只有一个db.
|
|
|
- * @return \CRedisUtil
|
|
|
- */
|
|
|
-- public function conn($host, $port, $pwd = "", $db = 0) {
|
|
|
-+ public function conn($host, $port, $pwd = "", $db = 1) {
|
|
|
- // DebugHelper::print_stack_trace();
|
|
|
- $this->redis = new \Predis\Client(array(
|
|
|
- 'scheme' => 'tcp',
|
|
|
---
|
|
|
-
|
|
|
-
|
|
|
+ */
|
|
|
+ define("DEBUGING", true);
|
|
|
+
|
|
|
+-define("SDK_GAME_ONLINE", false);
|
|
|
++define("SDK_GAME_ONLINE", true);
|
|
|
+diff --git a/patchTTT.diff b/patchTTT.diff
|
|
|
+index 86940b0e..e69de29b 100644
|
|
|
+--- a/patchTTT.diff
|
|
|
++++ b/patchTTT.diff
|
|
|
+@@ -1,33 +0,0 @@
|
|
|
+-
|
|
|
+-diff --git a/Gameserver/globals.php b/Gameserver/globals.php
|
|
|
+-index 63b43b86..a785d647 100644
|
|
|
+---- a/Gameserver/globals.php
|
|
|
+-+++ b/Gameserver/globals.php
|
|
|
+-@@ -19,7 +19,7 @@ define("PLAT", 'and'); # and, ios, web
|
|
|
+- /**
|
|
|
+- * 游戏是否上线
|
|
|
+- */
|
|
|
+--define("GAME_ONLINE", false);
|
|
|
+-+define("GAME_ONLINE", true);
|
|
|
+-
|
|
|
+- /**
|
|
|
+- * 控制debug黑框调试输出
|
|
|
+---
|
|
|
+-
|
|
|
+-
|
|
|
+-diff --git a/Gameserver/Amfphp/util/CRedisUtil.php b/Gameserver/Amfphp/util/CRedisUtil.php
|
|
|
+-index 6ceb1794..d1f7ba15 100644
|
|
|
+---- a/Gameserver/Amfphp/util/CRedisUtil.php
|
|
|
+-+++ b/Gameserver/Amfphp/util/CRedisUtil.php
|
|
|
+-@@ -164,7 +164,7 @@ class CRedisUtil {
|
|
|
+- * @param string $db 数据库, 不建议输入参数, 如果是购买云实例只有一个db.
|
|
|
+- * @return \CRedisUtil
|
|
|
+- */
|
|
|
+-- public function conn($host, $port, $pwd = "", $db = 0) {
|
|
|
+-+ public function conn($host, $port, $pwd = "", $db = 1) {
|
|
|
+- // DebugHelper::print_stack_trace();
|
|
|
+- $this->redis = new \Predis\Client(array(
|
|
|
+- 'scheme' => 'tcp',
|
|
|
+---
|
|
|
+-
|
|
|
+-
|