resolve confilct

.gitignore

@@ -75,3 +75,36 @@ fastlane/screenshots
 
 iOSInjectionProject/
 .DS_Store
+
+# Unity
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/Assets/AssetStoreTools*
+
+# Autogenerated VS/MD solution and project files
+ExportedObj/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+
+
+# Unity3D generated meta files
+*.pidb.meta
+
+# Unity3D Generated File On Crash Reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.unitypackage
+game-server/logs/

Client_iOS/Client/ViewController.m

@@ -13,6 +13,9 @@ @interface ViewController ()
 @property (nonatomic, copy) NSString *connectorIP;
 @property (nonatomic, copy) NSString *connectorPort;
 
+@property (nonatomic, copy) NSString *token;
+@property (nonatomic, strong) NSString *userid;
+
 @end
 
 @implementation ViewController
@@ -83,10 +86,12 @@ - (void)viewDidLoad
 
 //1、连接gate服务器，返回connector服务器地址
 - (void)connectGate{
-    [client connectToHost:@"39.108.83.192" onPort:@"3101" params:nil withCallback:^(id arg) {
-        [client requestWithRoute:@"gate.gateHandler.queryEntry" andParams:@{@"userid" : @"ligun123"} andCallback:^(id arg) {
-            self.connectorIP = arg[@"host"];
-            self.connectorPort = [arg[@"port"] stringValue];
+    [client connectToHost:@"127.0.0.1" onPort:@"3101" params:nil withCallback:^(id arg) {
+        [client requestWithRoute:@"gate.gateHandler.guestLogin" andParams:@{@"userid" : @"ligun123"} andCallback:^(id arg) {
+            self.connectorIP = arg[@"data"][@"connector"][@"host"];
+            self.connectorPort = [arg[@"data"][@"connector"][@"port"] stringValue];
+            self.token = arg[@"data"][@"token"];
+            self.userid = arg[@"data"][@"userinfo"][@"userid"];
             [client disconnect];
         }];
     }];
@@ -101,14 +106,22 @@ - (void)enterConnector{
 
 //3、request——> connector.entryHandler.enter进入房间
 - (void)enterRoom{
-    [client requestWithRoute:@"connector.entryHandler.enter" andParams:@{@"userid" : @"ligun",
-                                                                         @"rid" : @"111"} andCallback:^(id arg) {
+    [client requestWithRoute:@"connector.entryHandler.enterRoom" andParams:@{@"token" : self.token,
+                                                                         @"rtype" : @"brnn"} andCallback:^(id arg) {
                                                                              NSLog(@"%s -> %@", __FUNCTION__, arg);
                                                                          }];
 }
 
-//废弃的方法
+//chipin
 - (void)sendProto{
+    //pkindex,gold,userid
+    [client requestWithRoute:@"brnn.brnnHandler.chipIn"
+                   andParams:@{@"pkindex" : @(1),
+                               @"userid" : self.userid,
+                               @"gold" : @(1000)}
+                 andCallback:^(id arg) {
+                       NSLog(@"%s -> %@", __FUNCTION__, arg);
+                   }];
 }
 
 

client_cocos/.gitignore

@@ -0,0 +1,67 @@
+#/////////////////////////////////////////////////////////////////////////////
+# Fireball Projects
+#/////////////////////////////////////////////////////////////////////////////
+
+library/
+temp/
+local/
+build/
+
+#/////////////////////////////////////////////////////////////////////////////
+# Logs and databases
+#/////////////////////////////////////////////////////////////////////////////
+
+*.log
+*.sql
+*.sqlite
+
+#/////////////////////////////////////////////////////////////////////////////
+# files for debugger
+#/////////////////////////////////////////////////////////////////////////////
+
+*.sln
+*.csproj
+*.pidb
+*.unityproj
+*.suo
+
+#/////////////////////////////////////////////////////////////////////////////
+# OS generated files
+#/////////////////////////////////////////////////////////////////////////////
+
+.DS_Store
+ehthumbs.db
+Thumbs.db
+
+#/////////////////////////////////////////////////////////////////////////////
+# exvim files
+#/////////////////////////////////////////////////////////////////////////////
+
+*UnityVS.meta
+*.err
+*.err.meta
+*.exvim
+*.exvim.meta
+*.vimentry
+*.vimentry.meta
+*.vimproject
+*.vimproject.meta
+.vimfiles.*/
+.exvim.*/
+quick_gen_project_*_autogen.bat
+quick_gen_project_*_autogen.bat.meta
+quick_gen_project_*_autogen.sh
+quick_gen_project_*_autogen.sh.meta
+.exvim.app
+
+#/////////////////////////////////////////////////////////////////////////////
+# webstorm files
+#/////////////////////////////////////////////////////////////////////////////
+
+.idea/
+
+#//////////////////////////
+# VS Code
+#//////////////////////////
+
+.vscode/

client_cocos/README.md

@@ -0,0 +1,2 @@
+# hello-world
+Hello world new project template.

client_cocos/assets/Scene.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.1",
+  "uuid": "29f52784-2fca-467b-92e7-8fd9ef8c57b7",
+  "isGroup": false,
+  "subMetas": {}
+}