ybx_Gdn 1 год назад
Родитель
Сommit
0d3f10090b

+ 12 - 0
Assets/Content/Config/IOSShopProductIDCfg.csv

@@ -0,0 +1,12 @@
+id,商品ID,商品名字
+Id,productID,productName
+int,string,string
+1,intention0.99,0.99禮包
+2,intention1.99,1.99禮包
+3,intention2.99,2.99禮包
+4,intention4.99,4.99禮包
+5,intention9.99,9.99禮包
+6,intention14.99,14.99禮包
+7,intention19.99,19.99禮包
+8,intention49.99,49.99禮包
+9,intention099.99,99.99禮包

+ 7 - 0
Assets/Content/Config/IOSShopProductIDCfg.csv.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2ba94505e32e447498f90cff1dfb2e65
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Content/Raw_Art/UI/UILanuch/img_logo_01.png


+ 3 - 3
Assets/Editor/Pack/Platform/PackPlatformiOSBuild.cs

@@ -206,10 +206,10 @@ namespace Pack
              * FacebookClientToken:在 facebook 后台应用设置->高级->客户端口令查看;
              * LSApplicationQueriesSchemes:Facebook 相关白名单。*/
 
-            plistDocument.root.SetString("FacebookAppID", "214372257886989");
+            plistDocument.root.SetString("FacebookAppID", "1077479097601980");
            
-            plistDocument.root.SetString("FacebookDisplayNam", "初心者大冒險");
-            plistDocument.root.SetString("FacebookClientToken", "eb90a0c5b6ab59dc16d63f2e78a34f39");
+            plistDocument.root.SetString("FacebookDisplayNam", "Rookie Rising");
+            plistDocument.root.SetString("FacebookClientToken", "5ea6f167ca36f83722360ba792e65d59");
             PlistElementArray plArr = plistDocument.root.CreateArray("LSApplicationQueriesSchemes");
             //fbapi
             //fb-messenger-api

+ 6 - 5
Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,10 @@
 local PlatformPack = {
-	URL_KEY = 'http://110.40.223.119:81//',
-	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
-	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/TestServerNotice/',
-	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
+	URL_KEY = 'http://165.154.29.92:81//',
+	SERVERLIST_URL = 'http://165.154.29.92:81//serverlist2',
+	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://165.154.29.92:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.29.92:81//vipService',
+	SpecialFuncShield = true,
 }
 
 return PlatformPack

Разница между файлами не показана из-за своего большого размера
+ 573 - 77
Assets/OPS/Obfuscator/Log/iOS.txt


+ 39 - 9
Assets/Plugins/QuickSDK/QKGame.cs

@@ -19,6 +19,7 @@ namespace quicksdk
     {
         public string ID;
         public string Name;
+        public string CID;
     }
 
     public class QKGame
@@ -28,17 +29,39 @@ namespace quicksdk
 
         public Dictionary<string, ProductInfo> ProductInfos = new Dictionary<string, ProductInfo>()
     {
-        { "0.99",new ProductInfo(){ ID = "intention0.99",Name = "0.99禮包"} },
-        { "1.99",new ProductInfo(){ ID = "intention1.99",Name = "1.99禮包"} },
-        { "2.99",new ProductInfo(){ ID = "intention2.99",Name = "2.99禮包"} },
-        { "4.99",new ProductInfo(){ ID = "intention4.99",Name = "4.99禮包"} },
-        { "9.99",new ProductInfo(){ ID = "intention9.99",Name = "9.99禮包"} },
-        { "14.99",new ProductInfo(){ ID = "intention14.99",Name = "14.99禮包"} },
-        { "19.99",new ProductInfo(){ ID = "intention19.99",Name = "19.99禮包"} },
-        { "49.99",new ProductInfo(){ ID = "intention49.99",Name = "49.99禮包"} },
-        { "99.99",new ProductInfo(){ ID = "intention99.99",Name = "99.99禮包"} },
+        { "0.99",new ProductInfo(){ CID = "1",Name = "0.99禮包"} },
+        { "1.99",new ProductInfo(){ CID = "2",Name = "1.99禮包"} },
+        { "2.99",new ProductInfo(){ CID = "3",Name = "2.99禮包"} },
+        { "4.99",new ProductInfo(){ CID = "4",Name = "4.99禮包"} },
+        { "9.99",new ProductInfo(){ CID = "5",Name = "9.99禮包"} },
+        { "14.99",new ProductInfo(){ CID = "6",Name = "14.99禮包"} },
+        { "19.99",new ProductInfo(){ CID = "7",Name = "19.99禮包"} },
+        { "49.99",new ProductInfo(){ CID = "8",Name = "49.99禮包"} },
+        { "99.99",new ProductInfo(){ CID = "9",Name = "99.99禮包"} },
     };
 
+
+        public void InitProductCfg(Dictionary<string, Dictionary<string, string>> cfg)
+        {
+
+            foreach (var item in ProductInfos)
+            {
+                Dictionary<string, string> keyValues;
+
+                if (cfg.ContainsKey(item.Value.CID))
+                {
+                    keyValues = cfg[item.Value.CID];
+
+                    item.Value.ID = keyValues["productID"];
+                    item.Value.Name = keyValues["productName"];
+
+                }
+
+            }
+
+
+        }
+
         [DllImport("__Internal")]
         private static extern void LuluSetListener(string gameObjectName);
         public void loginKitSetListener(LoginKitListener listener)
@@ -52,7 +75,9 @@ namespace quicksdk
             if (Application.platform != RuntimePlatform.OSXEditor)
             {
                 string gameObjectName = listener.gameObject.name;
+#if !UNITY_EDITOR
                 LuluSetListener(gameObjectName);
+#endif
             }
         }
         [DllImport("__Internal")]
@@ -63,7 +88,12 @@ namespace quicksdk
             if (Application.platform != RuntimePlatform.OSXEditor || InitState == QKSDKInitState.None || InitState == QKSDKInitState.Fail)
             {
                 InitState = QKSDKInitState.Initing;
+
+#if !UNITY_EDITOR
                 luLuInit();
+#endif
+
+
             }
         }
         [DllImport("__Internal")]

+ 2 - 1
Assets/Plugins/SDK/SDKMgr.cs

@@ -66,7 +66,7 @@ public partial class SDKMgr : MonoBehaviour
         {
 #if UNITY_EDITOR || NULLSDK
             //listener = new NULLSDKCBListener();
-            sdk = new NULLSDKAndroid();
+            sdk = new YouYiSDKiOS();
             //sdk.Init(listener, "");
             //#elif UNITY_ANDROID && NBSDK
             //        listener = new NBSDKCBListener();
@@ -120,6 +120,7 @@ public partial class SDKMgr : MonoBehaviour
         else
         {
             sdk.Init();
+
         }
     }
 

+ 1 - 1
Assets/Src/Core/Config/GlobalConfig.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
 

+ 8 - 0
Assets/Src/GameLogic/GameMgr.cs

@@ -1049,6 +1049,14 @@ public class GameMgr : SingletonMono<GameMgr>
     public void SdkInit()
     {
         SDKMgr.Instance.Init();
+#if UNITY_IOS
+        YouYiSDKiOS youYiSDKiOS = SDKMgr.Instance.sdk as YouYiSDKiOS;
+        if (youYiSDKiOS != null)
+        {
+            youYiSDKiOS.qKGamesdk.InitProductCfg(ConfigMgr.Instance.getTable("IOSShopProductIDCfg"));
+        }
+#endif
+     
     }
 
     public void SdkLogin()

+ 8 - 0
Assets/ToLua/Source/Generate/SDKMgrWrap.cs

@@ -93,6 +93,14 @@ public class SDKMgrWrap
 			ToLua.CheckArgsCount(L, 1);
 			SDKMgr obj = (SDKMgr)ToLua.CheckObject<SDKMgr>(L, 1);
 			obj.Init();
+#if UNITY_IOS
+			YouYiSDKiOS youYiSDKiOS = SDKMgr.Instance.sdk as YouYiSDKiOS;
+            if (youYiSDKiOS != null)
+            {
+                youYiSDKiOS.qKGamesdk.InitProductCfg(ConfigMgr.Instance.getTable("IOSShopProductIDCfg"));
+            }
+#endif
+			
 			return 0;
 		}
 		catch (Exception e)

Некоторые файлы не были показаны из-за большого количества измененных файлов