From 8c47ada192c22f9bdb1f634abe0ac5046c9a057c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 20 十月 2020 17:22:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/U3DRepository

---
 QUICK-ios打包.txt                                         |   20 ++++++++++++++++++++
 ChannelDiff/iOS/xmyjgame/The2thWorldSDK/UniversalSDK.mm |   31 +++++++++++++++++--------------
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/ChannelDiff/iOS/xmyjgame/The2thWorldSDK/UniversalSDK.mm b/ChannelDiff/iOS/xmyjgame/The2thWorldSDK/UniversalSDK.mm
index de19948..e61ab3d 100644
--- a/ChannelDiff/iOS/xmyjgame/The2thWorldSDK/UniversalSDK.mm
+++ b/ChannelDiff/iOS/xmyjgame/The2thWorldSDK/UniversalSDK.mm
@@ -212,13 +212,14 @@
     switch (errorCode) {
         case SMPC_QUICK_SDK_ERROR_NONE:
         {
-            NSLog(@"鍒濆鍖栨垚鍔� %@", sAppID);
-            NSString *_appid = [[SMPCQuickSDK defaultInstance] getConfigValue:@"zfappid"];
-            if (_appid == nil || [_appid isEqualToString:@""])
-            {
-                _appid = sAppID;
-                NSLog(@"init param _appid:%@",_appid);
-            }
+            NSLog(@"鍒濆鍖栨垚鍔�");
+//            NSString *_appid = [[SMPCQuickSDK defaultInstance] getConfigValue:@"zfappid"];
+//            if (_appid == nil || [_appid isEqualToString:@""])
+//            {
+//                _appid = sAppID;
+//            }
+            NSString *_appid = sAppID;
+            NSLog(@"init _appid:%@",_appid);
             
             NSMutableDictionary *_dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                           [NSNumber numberWithInt:S2U_SdkInitComplete], @"code",
@@ -245,7 +246,7 @@
     if (error == 0) {
         NSString *uid = [[SMPCQuickSDK defaultInstance] userId];
         NSString *gameUID = [NSString stringWithFormat:@"%@@%d", uid, [SMPCQuickSDK defaultInstance].channelType];
-        NSString *UserName = [[SMPCQuickSDK defaultInstance] userNick];
+        NSString *UserName = [[SMPCQuickSDK defaultInstance] userId];
         //鑾峰彇user_token锛岀敤浜庝粠鏈嶅姟鍣ㄥ幓楠岃瘉鐢ㄦ埛淇℃伅
         NSString *user_token = userInfo[kSmpcQuickSDKKeyUserToken];
         
@@ -344,9 +345,10 @@
     
     switch([[_dict objectForKey:@"code"] intValue]){
         case U2S_Init:
-            [self Init];
             sAppID = _dict[@"appID"];
             sGameID = _dict[@"gameID"];
+            [self Init];
+
             break;
         case U2S_CopyContent:
             [UIPasteboard generalPasteboard].string = _dict[@"content"];
@@ -450,11 +452,12 @@
             order.count = 1;  //蹇呭~ 鏁伴噺
             order.amount = [[_dict objectForKey:@"mount"] floatValue]; //蹇呭~ 鎬讳环
             
-            NSString *_appid = [[SMPCQuickSDK defaultInstance] getConfigValue:@"zfappid"];
-            if (_appid == nil || [_appid isEqualToString:@""])
-            {
-                _appid = sAppID;
-            }
+//            NSString *_appid = [[SMPCQuickSDK defaultInstance] getConfigValue:@"zfappid"];
+//            if (_appid == nil || [_appid isEqualToString:@""])
+//            {
+//                _appid = sAppID;
+//            }
+            NSString *_appid = sAppID;
             order.extrasParams = [NSString stringWithFormat:@"{\"appid\":\"%@\",\"cpinfo\":\"%@\",\"cporderid\":\"%@\"}",
                                   _appid,
                                   [_dict objectForKey:@"cpInfo"],
diff --git "a/QUICK-ios\346\211\223\345\214\205.txt" "b/QUICK-ios\346\211\223\345\214\205.txt"
new file mode 100644
index 0000000..8ef9b57
--- /dev/null
+++ "b/QUICK-ios\346\211\223\345\214\205.txt"
@@ -0,0 +1,20 @@
+1. 清理lua 重新生成(非必须)
+2. Build All Assets 打包资源-- 在\AssetBundles\iOS(对应平台下),可参看最后文件AssetsVersion.txt的修改时间为最新即完成
+3. 关闭xcode,后续操作会覆盖,需重开
+4. 点击 IPA_Replace 
+	a).拷贝 \Assets\StreamingAssets(对应平台下)资源,注意拷贝的是StreamingAssets 非平台资源可删除
+	b).xcode会被重置,需手动拷贝iossdk下\ChannelDiff\iOS\UnityAppController.mm 文件到IOS_BUILD\Clsses对应文件,从坊达文件里覆盖,不要直接从XCODE覆盖(可能会生成额外的导入信息,未确认)
+	c).删除xcode项目里的闪屏和对应配置,删除 LaunchScreen-iPad.xib LaunchScreen-iPhone.xib,到info.plist,删除对应的键值,保存option+s 不是ctrl+s
+	
+5.点击xcode项目的 general 设置包名,版本号,签名(有的描述文件需关闭推送和充值);ctrl+B解析,未报错则正常
+	a) xcode上选中项目(最上),设置版本号,去掉勾选自动签名 Auto。。。。
+	b) 选择对应描述文件 若有报错 点击上面 Capabilities标签 关闭对应开关,如商店和推送
+	c) 点击 Product-Analyze 执行,未报错即通过 或者使用快捷键 option+B, 没有报错即可使用quick打包工具(unity\quicktool)
+	意外报错情况1:苹果自动生成了.DStore文件,删除即可
+ 
+	
+
+越狱包需越狱手机测试
+uncover cydia AF2
+
+{"branch":999}
\ No newline at end of file

--
Gitblit v1.8.0