123 1 år sedan
förälder
incheckning
ebed10de9d

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


+ 85 - 54
Assets/Editor/Pack/Platform/PackPlatformiOSBuild.cs

@@ -150,11 +150,11 @@ namespace Pack
             //pbxProject.AddBuildProperty(targetGuid, "Library Search Path", "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)");
             //pbxProject.AddBuildProperty(targetGuid, "Library Search Path", "$(SDKROOT)/usr/lib/swift");
 
-            pbxProject.AddBuildProperty(unityFmwkGUid, "LIBRARY_SEARCH_PATHS", "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)");
+            //pbxProject.AddBuildProperty(unityFmwkGUid, "LIBRARY_SEARCH_PATHS", "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)");
             //pbxProject.AddBuildProperty(targetGuid, "LIBRARY_SEARCH_PATHS", "$(SDKROOT)/usr/lib/swift");
 
-            pbxProject.AddBuildProperty(unityFmwkGUid, "LIBRARY_SEARCH_PATHS", "$(SDKROOT)/usr/lib/swift");
-            pbxProject.AddBuildProperty(targetGuid, "Runpath Search Path", "/usr/lib/swift");
+            //pbxProject.AddBuildProperty(unityFmwkGUid, "LIBRARY_SEARCH_PATHS", "$(SDKROOT)/usr/lib/swift");
+            //pbxProject.AddBuildProperty(targetGuid, "Runpath Search Path", "/usr/lib/swift");
             //pbxProject.AddBuildProperty(targetGuid, "RUNPATH_SEARCH_PATHS", "/usr/lib/swift");
             //AdSupport.framework AuthenticationServices.framework, Accelerate.framework
 
@@ -178,26 +178,26 @@ namespace Pack
             string plistPath = Path.Combine(outPath, "Info.plist");
             PlistDocument plistDocument = new PlistDocument();
             plistDocument.ReadFromFile(plistPath);
-            if (plugins.Contains("Lebian"))
-            {
-                int appId;
-                if (!ExpressionEvaluator.Evaluate(leBian_MainChId, out appId))
-                {
-                    appId = 0;
-                }
-                plistDocument.root.SetInteger("LEBIAN_APPID", appId);
-                plistDocument.root.SetString("LEBIAN_SECID", leBian_SECID);
-                plistDocument.root.SetString("LEBIAN_META", leBian_ClientChId);
-                plistDocument.root.SetInteger("LEBIAN_VERCODE", (int)(uint)resVersionCode);
-            }
-
-            if (!string.IsNullOrEmpty(plugins.Find((x)=>x.StartsWith("YOUYI"))))
-            {
-                plistDocument.root.SetString("YouYi_GameId", "1023");
-                plistDocument.root.SetString("YouYi_AppKey", "3db62ef3789f3752a4a6d1b7ffc6f922");
-                plistDocument.root.SetString("YouYi_VestId", "");
-                plistDocument.root.SetString("NSUserTrackingUsageDescription", "获取设备信息用以精准推送您喜欢的内容");
-            }
+            //if (plugins.Contains("Lebian"))
+            //{
+            //    int appId;
+            //    if (!ExpressionEvaluator.Evaluate(leBian_MainChId, out appId))
+            //    {
+            //        appId = 0;
+            //    }
+            //    plistDocument.root.SetInteger("LEBIAN_APPID", appId);
+            //    plistDocument.root.SetString("LEBIAN_SECID", leBian_SECID);
+            //    plistDocument.root.SetString("LEBIAN_META", leBian_ClientChId);
+            //    plistDocument.root.SetInteger("LEBIAN_VERCODE", (int)(uint)resVersionCode);
+            //}
+
+            //if (!string.IsNullOrEmpty(plugins.Find((x)=>x.StartsWith("YOUYI"))))
+            //{
+            //    plistDocument.root.SetString("YouYi_GameId", "1023");
+            //    plistDocument.root.SetString("YouYi_AppKey", "3db62ef3789f3752a4a6d1b7ffc6f922");
+            //    plistDocument.root.SetString("YouYi_VestId", "");
+            //    plistDocument.root.SetString("NSUserTrackingUsageDescription", "获取设备信息用以精准推送您喜欢的内容");
+            //}
 
           //plistDocument.root.SetString("FacebookUrlSchemeSuffix", "3db62ef3789f3752a4a6d1b7ffc6f922");
             /* FacebookAppID:facebook 后台应用参数
@@ -206,21 +206,21 @@ namespace Pack
              * FacebookClientToken:在 facebook 后台应用设置->高级->客户端口令查看;
              * LSApplicationQueriesSchemes:Facebook 相关白名单。*/
 
-            plistDocument.root.SetString("FacebookAppID", "214372257886989");
+            //plistDocument.root.SetString("FacebookAppID", "214372257886989");
            
-            plistDocument.root.SetString("FacebookDisplayNam", "初心者大冒險");
-            plistDocument.root.SetString("FacebookClientToken", "eb90a0c5b6ab59dc16d63f2e78a34f39");
-            PlistElementArray plArr = plistDocument.root.CreateArray("LSApplicationQueriesSchemes");
-            //fbapi
-            //fb-messenger-api
-            //fbauth2
-            //fbshareextension
-            //fb-messenger-share-api
-            plArr.AddString("fbapi"); 
-            plArr.AddString("fb-messenger-api"); 
-            plArr.AddString("fbauth2"); 
-            plArr.AddString("fbshareextension"); 
-            plArr.AddString("fb-messenger-share-api"); 
+            //plistDocument.root.SetString("FacebookDisplayNam", "初心者大冒險");
+            //plistDocument.root.SetString("FacebookClientToken", "eb90a0c5b6ab59dc16d63f2e78a34f39");
+            //PlistElementArray plArr = plistDocument.root.CreateArray("LSApplicationQueriesSchemes");
+            ////fbapi
+            ////fb-messenger-api
+            ////fbauth2
+            ////fbshareextension
+            ////fb-messenger-share-api
+            //plArr.AddString("fbapi"); 
+            //plArr.AddString("fb-messenger-api"); 
+            //plArr.AddString("fbauth2"); 
+            //plArr.AddString("fbshareextension"); 
+            //plArr.AddString("fb-messenger-share-api"); 
 
 
 
@@ -236,27 +236,28 @@ namespace Pack
                                         "_VendorID = AllocCString([WentingSDK GetUUID]);");
                 script.Save();
 
-                if (plugins.Contains("Lebian"))
-                {
-                    string unityAppControllerMMPath = Path.Combine(outPath, "Classes/UnityAppController.mm");
-                    script = new ObjCScript(unityAppControllerMMPath);
-                    script.AddImport("LBSDK/LBInit.h", true);
-                    int idx = script.FindLine("::printf(\"-> applicationDidFinishLaunching()\\n\");");
-                    script.InsertLine(idx, idx + 1);
-                    script.InsertLine(idx, idx + 2, "// 请务必在方法的最前面调用该接口,否则很容易出问题");
-                    script.InsertLine(idx, idx + 3, "if ([[LBInit sharedInstance] LBSDKShouldInitWithLaunchOptions:launchOptions]) {");
-                    script.InsertLine(idx, idx + 4, "\treturn YES;");
-                    script.InsertLine(idx, idx + 5, "}");
-                    script.InsertLine(idx, idx + 6);
-                    script.Save();
-                }
-
+                //if (plugins.Contains("Lebian"))
+                //{
+                //    string unityAppControllerMMPath = Path.Combine(outPath, "Classes/UnityAppController.mm");
+                //    script = new ObjCScript(unityAppControllerMMPath);
+                //    script.AddImport("LBSDK/LBInit.h", true);
+                //    int idx = script.FindLine("::printf(\"-> applicationDidFinishLaunching()\\n\");");
+                //    script.InsertLine(idx, idx + 1);
+                //    script.InsertLine(idx, idx + 2, "// 请务必在方法的最前面调用该接口,否则很容易出问题");
+                //    script.InsertLine(idx, idx + 3, "if ([[LBInit sharedInstance] LBSDKShouldInitWithLaunchOptions:launchOptions]) {");
+                //    script.InsertLine(idx, idx + 4, "\treturn YES;");
+                //    script.InsertLine(idx, idx + 5, "}");
+                //    script.InsertLine(idx, idx + 6);
+                //    script.Save();
+                //}
+                int idx = 0;
+                string unityAppControllerMMPath = "";
                 if (plugins.Contains("WentingLicense"))
                 {
-                    string unityAppControllerMMPath = Path.Combine(outPath, "Classes/UnityAppController.mm");
+                     unityAppControllerMMPath = Path.Combine(outPath, "Classes/UnityAppController.mm");
                     script = new ObjCScript(unityAppControllerMMPath);
                     script.AddImport("WentingLicense.h", false);
-                    int idx = script.FindLine("::printf(\"-> applicationDidFinishLaunching()\\n\");");
+                     idx = script.FindLine("::printf(\"-> applicationDidFinishLaunching()\\n\");");
                     script.InsertLine(idx, idx + 1);
                     script.InsertLine(idx, idx + 2, "if ([[WentingLicense sharedInstance] CheckAgreeWithLaunchOptions:launchOptions]) {");
                     script.InsertLine(idx, idx + 3, "\treturn YES;");
@@ -265,6 +266,36 @@ namespace Pack
                     script.Save();
                 }
 
+                unityAppControllerMMPath = Path.Combine(outPath, "Classes/UnityAppController.mm");
+                script = new ObjCScript(unityAppControllerMMPath);
+                //SMPCQuickSDK/SMPCQuickSDK.h
+                //"QuickSDK_ios.h"
+                script.AddImport("SMPCQuickSDK/SMPCQuickSDK.h", true);
+                script.AddImport("QuickSDK_ios.h", false);
+                //                / 注骨事件监听[[QuickSok ios shareInstance] addNotifications];
+                /// 初始化
+                //SMPCQuickSDKInitConfigure* cfg m[[sMpcQuicksDKInitconfigure alloc] init];
+                //                cfg.productkey e e"09633196";
+                //                cfg.productCode 50840817638746911281319234382938":
+                //int error m ismpcouicksok defaultInstance] initwithconfia: cf application:application didFinishLaunchinaWithoptions:launchoptions
+                //if (error!8){
+                //                    NSLog(@"不能启动初始化:hd", error);
+
+                idx = script.FindLine("::printf(\"-> applicationDidFinishLaunching()\\n\");");
+                script.InsertLine(idx, idx + 1);
+                script.InsertLine(idx, idx + 2,"//注册事件监听");
+                script.InsertLine(idx, idx + 3, "[[QuickSDK_ios shareInstance] addNotifications];");
+                script.InsertLine(idx, idx + 4, "//初始化");
+                script.InsertLine(idx, idx + 5, "SMPCQuickSDKInitConfigure *cfg = [[SMPCQuickSDKInitConfigure alloc] init];");
+                script.InsertLine(idx, idx + 6, "cfg.productKey = @\"60700384\";");
+                script.InsertLine(idx, idx + 7, "cfg.productCode = @\"84854058398037796099970471354112\"; ");
+                script.InsertLine(idx, idx + 8, "int error = [[SMPCQuickSDK defaultInstance] intWithConfig:cfg application:application didFinishLaunchingWithOptions:launchOptions];");
+                script.InsertLine(idx, idx + 9,"if (error != 0){");
+                script.InsertLine(idx, idx + 10,"NsLog(@\"不能启动初始化:%d\",error);");
+                script.InsertLine(idx, idx + 11,"}");
+                script.Save();
+
+
                 //if (!string.IsNullOrEmpty(plugins.Find((x) => x.StartsWith("YOUYI"))))
                 //{
                 //    string unityAppControllerMMPath = Path.Combine(outPath, "Classes/UnityAppController.mm");

+ 5 - 0
Assets/Lua/Managers/LuaGameMgr.lua

@@ -11,6 +11,7 @@ function LuaGameMgr:ctor()
     self:SdkPayFunc(self.SdkPayResult)
     self:SdkQuestionFunc(self.UrlQuestionRewardResult)
     self:SdkCanEnterServerJudgeFunc(self.SdkCanEnterServerJudgeResult)
+    self:SetmOnClickReturnBtnCb(self.OnClickReturnBtnCb)
     self.newbieActors = nil
     self.IsCreateRole = false
     self.loadingPageOk = false
@@ -540,4 +541,8 @@ function LuaGameMgr:SdkCanEnterServerJudgeResult(value)
     self.canEnterServerState = (value == '1' and Enum.ParamState.Success or Enum.ParamState.Fail)
 end
 
+function LuaGameMgr:OnClickReturnBtnCb()
+    LogError("点击返回")
+end
+
 return LuaGameMgr

+ 15 - 1
Assets/Src/GameLogic/GameMgr.cs

@@ -326,6 +326,7 @@ public class GameMgr : SingletonMono<GameMgr>
         TimerManager.Instance.Update();
         NetworkMgr.Instance.Update();
         UpdateFPS();
+        CheckIsReturnBtn();
 #if UNITY_EDITOR || OPENGM
         if (Input.GetMouseButtonDown(0))
         {
@@ -437,6 +438,14 @@ public class GameMgr : SingletonMono<GameMgr>
         }
     }
 
+    private void CheckIsReturnBtn()
+    {
+        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            mOnClickReturnBtn.Call(this);
+        }
+    }
+
     void EnterLuaLogin(bool relogin)
     {
         if (mCharacterInfo == null)
@@ -1005,7 +1014,7 @@ public class GameMgr : SingletonMono<GameMgr>
     private LuaFunction mSdkPayLuaCB = null;
     private LuaFunction msdkQuestionLuaCB = null;
     private LuaFunction mSdkCanEnterServerJudgeCB = null;
-
+    private LuaFunction mOnClickReturnBtn = null;
     public void SdkInitFunc(LuaFunction func)
     {
 
@@ -1038,6 +1047,11 @@ public class GameMgr : SingletonMono<GameMgr>
         mSdkCanEnterServerJudgeCB = func;
     }
 
+    public void SetmOnClickReturnBtnCb(LuaFunction cb)
+    {
+        mOnClickReturnBtn = cb;
+    }
+
     public void SdkInit()
     {
         SDKMgr.Instance.Init();

+ 22 - 2
Assets/ToLua/Source/Generate/GameMgrWrap.cs

@@ -1,4 +1,4 @@
-//this source code was auto-generated by tolua#, do not modify it
+//this source code was auto-generated by tolua#, do not modify it
 using System;
 using LuaInterface;
 
@@ -54,6 +54,7 @@ public class GameMgrWrap
 		L.RegFunction("SdkPayFunc", SdkPayFunc);
 		L.RegFunction("SdkQuestionFunc", SdkQuestionFunc);
 		L.RegFunction("SdkCanEnterServerJudgeFunc", SdkCanEnterServerJudgeFunc);
+		L.RegFunction("SetmOnClickReturnBtnCb", SetmOnClickReturnBtnCb);
 		L.RegFunction("SdkInit", SdkInit);
 		L.RegFunction("SdkLogin", SdkLogin);
 		L.RegFunction("SdkPay", SdkPay);
@@ -964,7 +965,26 @@ public class GameMgrWrap
 		}
 	}
 
-	[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+    //SetmOnClickReturnBtnCb
+
+    [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+    static int SetmOnClickReturnBtnCb(IntPtr L)
+    {
+        try
+        {
+            ToLua.CheckArgsCount(L, 2);
+            GameMgr obj = (GameMgr)ToLua.CheckObject<GameMgr>(L, 1);
+            LuaFunction arg0 = ToLua.CheckLuaFunction(L, 2);
+            obj.SetmOnClickReturnBtnCb(arg0);
+            return 0;
+        }
+        catch (Exception e)
+        {
+            return LuaDLL.toluaL_exception(L, e);
+        }
+    }
+
+    [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
 	static int SdkInit(IntPtr L)
 	{
 		try

+ 19 - 19
ProjectSettings/ProjectSettings.asset

@@ -137,7 +137,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.0.6
+  bundleVersion: 0.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -390,49 +390,49 @@ PlayerSettings:
   - m_BuildTarget: iPhone
     m_Icons:
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: a1700d1903faf4807b0ba9e184c2d6a3, type: 3}
       m_Width: 180
       m_Height: 180
       m_Kind: 0
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 94d5dfc7c637a473e9887d7f06f940c2, type: 3}
       m_Width: 120
       m_Height: 120
       m_Kind: 0
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: c559ff4126f5d4950834d409fca25ccc, type: 3}
       m_Width: 167
       m_Height: 167
       m_Kind: 0
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: e7c049a1569cc42fea55811fb4cdbcb8, type: 3}
       m_Width: 152
       m_Height: 152
       m_Kind: 0
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 4ec4058331e444ef790ec88acf9faf3d, type: 3}
       m_Width: 76
       m_Height: 76
       m_Kind: 0
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 94d5dfc7c637a473e9887d7f06f940c2, type: 3}
       m_Width: 120
       m_Height: 120
       m_Kind: 3
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: a3258c6e121d04f30b2765d0cb75d8b7, type: 3}
       m_Width: 80
       m_Height: 80
       m_Kind: 3
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: a3258c6e121d04f30b2765d0cb75d8b7, type: 3}
       m_Width: 80
       m_Height: 80
       m_Kind: 3
@@ -443,37 +443,37 @@ PlayerSettings:
       m_Kind: 3
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 9492644cb23c6442387e83de3143f753, type: 3}
       m_Width: 87
       m_Height: 87
       m_Kind: 1
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 38d9ad06b176244f4be60f3c4e9851bb, type: 3}
       m_Width: 58
       m_Height: 58
       m_Kind: 1
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 14322bd1d21154803a7435f241b06d4c, type: 3}
       m_Width: 29
       m_Height: 29
       m_Kind: 1
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 38d9ad06b176244f4be60f3c4e9851bb, type: 3}
       m_Width: 58
       m_Height: 58
       m_Kind: 1
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 14322bd1d21154803a7435f241b06d4c, type: 3}
       m_Width: 29
       m_Height: 29
       m_Kind: 1
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 4835a47a3815a421fa419dd58190dce9, type: 3}
       m_Width: 60
       m_Height: 60
       m_Kind: 2
@@ -489,13 +489,13 @@ PlayerSettings:
       m_Kind: 2
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: b64ea29ac28134d1f85905262f138780, type: 3}
       m_Width: 20
       m_Height: 20
       m_Kind: 2
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 0}
+      - {fileID: 2800000, guid: 6374958e8ea2d4b298139be0e9f3ed31, type: 3}
       m_Width: 1024
       m_Height: 1024
       m_Kind: 4
@@ -845,10 +845,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;CN_I7GAME_0_1
+    Android: USE_LUA;VUPLEX_CCU
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU
+    iPhone: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;CN_I7GAME_0_1
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1