123 1 год назад
Родитель
Сommit
8b07a44111

+ 22 - 4
Assets/Editor/Pack/Platform/PackPlatformiOSBuild.cs

@@ -133,6 +133,9 @@ namespace Pack
             string targetGuid = pbxProject.GetUnityMainTargetGuid();//pbxProject.TargetGuidByName("Unity-iPhone");
             string unityFmwkGUid = pbxProject.GetUnityFrameworkTargetGuid();
             Debug.Log($"=================== targetGuid = {targetGuid} ===============");
+
+           
+
             pbxProject.SetBuildProperty(targetGuid, "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym");
             pbxProject.SetBuildProperty(targetGuid, "GCC_GENERATE_DEBUGGING_SYMBOLS", "YES");
             pbxProject.SetBuildProperty(targetGuid, "COPY_PHASE_STRIP", "NO");
@@ -144,13 +147,15 @@ namespace Pack
             pbxProject.AddBuildProperty(unityFmwkGUid, "OTHER_LDFLAGS", "-ObjC");
 
              pbxProject.SetBuildProperty(targetGuid, "SWIFT_VERSION", "5.0");
-            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(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(targetGuid, "LIBRARY_SEARCH_PATHS", "$(SDKROOT)/usr/lib/swift");
+            //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(targetGuid, "RUNPATH_SEARCH_PATHS", "/usr/lib/swift");
+            //pbxProject.AddBuildProperty(targetGuid, "RUNPATH_SEARCH_PATHS", "/usr/lib/swift");
             //AdSupport.framework AuthenticationServices.framework, Accelerate.framework
 
             AddFrameworkToProject(pbxProject, targetGuid,new string[] { "libz.dylib" , "libc++.dylib" , "AdSupport.framework" , "AuthenticationServices.framework", "Accelerate.framework" },false);
@@ -204,6 +209,19 @@ namespace Pack
             //plistDocument.root.SetString("FacebookUrlSchemeSuffix", "3db62ef3789f3752a4a6d1b7ffc6f922");
             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.WriteToFile(plistPath);
             EditorUtility.DisplayProgressBar("修改XCodeProject", "修改info.list完成", 0.5f);

+ 35 - 35
Assets/Lua/Config/ActivitiesTaskCfg.lua

@@ -6958,7 +6958,7 @@ local ActivitiesTaskCfg = {
     [632]={
     ['TaskId']=632,
     ['TaskCondition']={{60,9.99}},
-    ['Reward']={{607,1},{2,100}},
+    ['Reward']={{702,1},{110,20},{100,30}},
     ['Title']='活動期間累計儲值9.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -6968,7 +6968,7 @@ local ActivitiesTaskCfg = {
     [633]={
     ['TaskId']=633,
     ['TaskCondition']={{60,19.99}},
-    ['Reward']={{607,1},{2,200}},
+    ['Reward']={{688,1},{264,1},{268,5}},
     ['Title']='活動期間累計儲值19.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -6978,7 +6978,7 @@ local ActivitiesTaskCfg = {
     [634]={
     ['TaskId']=634,
     ['TaskCondition']={{60,69.99}},
-    ['Reward']={{701,2},{2,600}},
+    ['Reward']={{12196,1},{15045,2},{268,10}},
     ['Title']='活動期間累計儲值69.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -6988,7 +6988,7 @@ local ActivitiesTaskCfg = {
     [635]={
     ['TaskId']=635,
     ['TaskCondition']={{60,119.99}},
-    ['Reward']={{701,2},{2,1200}},
+    ['Reward']={{12180,1},{12168,1},{15044,2},{268,10}},
     ['Title']='活動期間累計儲值119.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -6998,7 +6998,7 @@ local ActivitiesTaskCfg = {
     [636]={
     ['TaskId']=636,
     ['TaskCondition']={{60,199.99}},
-    ['Reward']={{701,2},{2,1800}},
+    ['Reward']={{12187,1},{12286,1},{15046,2},{268,15}},
     ['Title']='活動期間累計儲值199.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7008,7 +7008,7 @@ local ActivitiesTaskCfg = {
     [637]={
     ['TaskId']=637,
     ['TaskCondition']={{60,279.99}},
-    ['Reward']={{701,3},{2,2500}},
+    ['Reward']={{12359,1},{12363,1},{15043,3},{268,20}},
     ['Title']='活動期間累計儲值279.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7018,7 +7018,7 @@ local ActivitiesTaskCfg = {
     [638]={
     ['TaskId']=638,
     ['TaskCondition']={{60,359.99}},
-    ['Reward']={{701,3},{2,3500}},
+    ['Reward']={{12397,1},{12452,1},{15047,4},{268,20}},
     ['Title']='活動期間累計儲值359.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7028,7 +7028,7 @@ local ActivitiesTaskCfg = {
     [639]={
     ['TaskId']=639,
     ['TaskCondition']={{60,499.99}},
-    ['Reward']={{701,3},{2,5000}},
+    ['Reward']={{12498,1},{12572,1},{15042,5},{268,30}},
     ['Title']='活動期間累計儲值499.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7038,7 +7038,7 @@ local ActivitiesTaskCfg = {
     [640]={
     ['TaskId']=640,
     ['TaskCondition']={{60,0.99}},
-    ['Reward']={{100,10}},
+    ['Reward']={{54,1000},{2,200000},{47,50000}},
     ['Title']='活動期間累計儲值0.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7048,7 +7048,7 @@ local ActivitiesTaskCfg = {
     [641]={
     ['TaskId']=641,
     ['TaskCondition']={{60,9.99}},
-    ['Reward']={{100,10},{2,100}},
+    ['Reward']={{54,2000},{2,500000},{47,100000}},
     ['Title']='活動期間累計儲值9.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7058,7 +7058,7 @@ local ActivitiesTaskCfg = {
     [642]={
     ['TaskId']=642,
     ['TaskCondition']={{60,19.99}},
-    ['Reward']={{100,20},{110,10},{2,200}},
+    ['Reward']={{54,2500},{2,800000},{47,150000}},
     ['Title']='活動期間累計儲值19.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7068,7 +7068,7 @@ local ActivitiesTaskCfg = {
     [643]={
     ['TaskId']=643,
     ['TaskCondition']={{60,69.99}},
-    ['Reward']={{100,30},{110,20},{607,1},{2,600}},
+    ['Reward']={{54,4000},{2,1200000},{47,200000}},
     ['Title']='活動期間累計儲值69.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7078,7 +7078,7 @@ local ActivitiesTaskCfg = {
     [644]={
     ['TaskId']=644,
     ['TaskCondition']={{60,119.99}},
-    ['Reward']={{100,30},{110,20},{607,2},{2,1200}},
+    ['Reward']={{54,6000},{2,2000000},{47,250000}},
     ['Title']='活動期間累計儲值119.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7088,7 +7088,7 @@ local ActivitiesTaskCfg = {
     [645]={
     ['TaskId']=645,
     ['TaskCondition']={{60,199.99}},
-    ['Reward']={{100,30},{110,20},{607,3},{2,1800}},
+    ['Reward']={{54,8000},{2,2500000},{47,300000}},
     ['Title']='活動期間累計儲值199.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7098,7 +7098,7 @@ local ActivitiesTaskCfg = {
     [646]={
     ['TaskId']=646,
     ['TaskCondition']={{60,279.99}},
-    ['Reward']={{100,50},{110,30},{607,4},{2,2500}},
+    ['Reward']={{54,8000},{2,2500000},{47,350000}},
     ['Title']='活動期間累計儲值279.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7108,7 +7108,7 @@ local ActivitiesTaskCfg = {
     [647]={
     ['TaskId']=647,
     ['TaskCondition']={{60,359.99}},
-    ['Reward']={{100,50},{110,30},{607,5},{2,3500}},
+    ['Reward']={{54,8000},{2,3000000},{47,400000}},
     ['Title']='活動期間累計儲值359.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7118,7 +7118,7 @@ local ActivitiesTaskCfg = {
     [648]={
     ['TaskId']=648,
     ['TaskCondition']={{60,499.99}},
-    ['Reward']={{100,50},{110,30},{607,6},{2,5000}},
+    ['Reward']={{54,10000},{2,4000000},{47,500000}},
     ['Title']='活動期間累計儲值499.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7128,7 +7128,7 @@ local ActivitiesTaskCfg = {
     [649]={
     ['TaskId']=649,
     ['TaskCondition']={{60,799.99}},
-    ['Reward']={{704,1},{2,7500}},
+    ['Reward']={{54,20000},{2,7000000},{47,1000000}},
     ['Title']='活動期間累計儲值799.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7138,7 +7138,7 @@ local ActivitiesTaskCfg = {
     [650]={
     ['TaskId']=650,
     ['TaskCondition']={{60,1199.99}},
-    ['Reward']={{707,1},{2,10000}},
+    ['Reward']={{54,50000},{2,12000000},{47,2000000}},
     ['Title']='活動期間累計儲值1199.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7148,7 +7148,7 @@ local ActivitiesTaskCfg = {
     [651]={
     ['TaskId']=651,
     ['TaskCondition']={{60,9.99}},
-    ['Reward']={{607,1},{2,100}},
+    ['Reward']={{687,1},{701,1},{513,1},{1,1000000}},
     ['Title']='活動期間累計儲值9.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7158,7 +7158,7 @@ local ActivitiesTaskCfg = {
     [652]={
     ['TaskId']=652,
     ['TaskCondition']={{60,19.99}},
-    ['Reward']={{607,1},{2,200}},
+    ['Reward']={{688,1},{702,1},{513,2},{1,2000000}},
     ['Title']='活動期間累計儲值19.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7168,7 +7168,7 @@ local ActivitiesTaskCfg = {
     [653]={
     ['TaskId']=653,
     ['TaskCondition']={{60,69.99}},
-    ['Reward']={{701,2},{100,20},{110,10},{2,600}},
+    ['Reward']={{689,1},{703,1},{513,4},{1,3000000}},
     ['Title']='活動期間累計儲值69.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7178,7 +7178,7 @@ local ActivitiesTaskCfg = {
     [654]={
     ['TaskId']=654,
     ['TaskCondition']={{60,119.99}},
-    ['Reward']={{701,2},{100,20},{110,10},{2,1200}},
+    ['Reward']={{690,1},{704,1},{513,5},{1,3000000}},
     ['Title']='活動期間累計儲值119.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7188,7 +7188,7 @@ local ActivitiesTaskCfg = {
     [655]={
     ['TaskId']=655,
     ['TaskCondition']={{60,199.99}},
-    ['Reward']={{701,2},{100,20},{110,10},{2,1800}},
+    ['Reward']={{691,1},{705,1},{513,5},{1,4000000}},
     ['Title']='活動期間累計儲值199.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7198,7 +7198,7 @@ local ActivitiesTaskCfg = {
     [656]={
     ['TaskId']=656,
     ['TaskCondition']={{60,279.99}},
-    ['Reward']={{701,3},{100,20},{110,10},{2,2500}},
+    ['Reward']={{692,1},{706,1},{513,6},{1,4000000}},
     ['Title']='活動期間累計儲值279.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7208,7 +7208,7 @@ local ActivitiesTaskCfg = {
     [657]={
     ['TaskId']=657,
     ['TaskCondition']={{60,359.99}},
-    ['Reward']={{701,3},{100,30},{110,20},{2,3500}},
+    ['Reward']={{693,1},{707,1},{513,7},{1,4000000}},
     ['Title']='活動期間累計儲值359.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7218,7 +7218,7 @@ local ActivitiesTaskCfg = {
     [658]={
     ['TaskId']=658,
     ['TaskCondition']={{60,499.99}},
-    ['Reward']={{701,3},{100,30},{110,20},{2,5000}},
+    ['Reward']={{694,1},{708,1},{513,8},{1,5000000}},
     ['Title']='活動期間累計儲值499.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7228,7 +7228,7 @@ local ActivitiesTaskCfg = {
     [659]={
     ['TaskId']=659,
     ['TaskCondition']={{60,9.99}},
-    ['Reward']={{100,1},{2,100}},
+    ['Reward']={{523,1},{192,10},{19,300000},{264,1}},
     ['Title']='活動期間累計儲值9.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7238,7 +7238,7 @@ local ActivitiesTaskCfg = {
     [660]={
     ['TaskId']=660,
     ['TaskCondition']={{60,19.99}},
-    ['Reward']={{100,1},{2,200}},
+    ['Reward']={{523,1},{192,10},{19,300000}},
     ['Title']='活動期間累計儲值19.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7248,7 +7248,7 @@ local ActivitiesTaskCfg = {
     [661]={
     ['TaskId']=661,
     ['TaskCondition']={{60,69.99}},
-    ['Reward']={{100,2},{2,600}},
+    ['Reward']={{523,1},{192,20},{19,500000}},
     ['Title']='活動期間累計儲值69.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7258,7 +7258,7 @@ local ActivitiesTaskCfg = {
     [662]={
     ['TaskId']=662,
     ['TaskCondition']={{60,119.99}},
-    ['Reward']={{607,1},{2,1200}},
+    ['Reward']={{523,1},{193,20},{19,500000}},
     ['Title']='活動期間累計儲值119.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7268,7 +7268,7 @@ local ActivitiesTaskCfg = {
     [663]={
     ['TaskId']=663,
     ['TaskCondition']={{60,199.99}},
-    ['Reward']={{607,1},{2,1800}},
+    ['Reward']={{523,1},{193,20},{19,500000},{595,1}},
     ['Title']='活動期間累計儲值199.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7278,7 +7278,7 @@ local ActivitiesTaskCfg = {
     [664]={
     ['TaskId']=664,
     ['TaskCondition']={{60,279.99}},
-    ['Reward']={{607,2},{2,2500}},
+    ['Reward']={{523,1},{193,20},{19,300000},{855,1}},
     ['Title']='活動期間累計儲值279.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7288,7 +7288,7 @@ local ActivitiesTaskCfg = {
     [665]={
     ['TaskId']=665,
     ['TaskCondition']={{60,359.99}},
-    ['Reward']={{607,2},{2,3500}},
+    ['Reward']={{523,1},{194,20},{19,800000},{855,1},{851,1}},
     ['Title']='活動期間累計儲值359.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -7298,7 +7298,7 @@ local ActivitiesTaskCfg = {
     [666]={
     ['TaskId']=666,
     ['TaskCondition']={{60,499.99}},
-    ['Reward']={{607,3},{2,5000}},
+    ['Reward']={{523,1},{195,20},{19,1000000},{855,2},{851,2}},
     ['Title']='活動期間累計儲值499.99$',
     ['Desc']='',
     ['GoPageId']=117,

+ 252 - 252
Assets/Lua/Config/MissionCfg.lua

@@ -1,253 +1,253 @@
 local MissionCfg = {
-[101]={
-['MissionID']=101,
-['MissionCondition']={{16,1}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='挑戰BOSS1次',
-['SkipInterface']=1,
-['RenovateTime']=24,
-},
-[102]={
-['MissionID']=102,
-['MissionCondition']={{5,1}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='任意夥伴升級1次',
-['SkipInterface']=3,
-['RenovateTime']=24,
-},
-[103]={
-['MissionID']=103,
-['MissionCondition']={{25,1}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='領取寶箱獎勵1次',
-['SkipInterface']=2,
-['RenovateTime']=24,
-},
-[104]={
-['MissionID']=104,
-['MissionCondition']={{10,1}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='裝備合成1次',
-['SkipInterface']=4,
-['RenovateTime']=24,
-},
-[105]={
-['MissionID']=105,
-['MissionCondition']={{20,1}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='使用時光之力1次',
-['SkipInterface']=5,
-['RenovateTime']=24,
-},
-[106]={
-['MissionID']=106,
-['MissionCondition']={{33,1}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='試煉之塔戰鬥1次',
-['SkipInterface']=6,
-['RenovateTime']=24,
-},
-[107]={
-['MissionID']=107,
-['MissionCondition']={{26,5}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='英靈殿戰鬥5次',
-['SkipInterface']=7,
-['RenovateTime']=24,
-},
-[108]={
-['MissionID']=108,
-['MissionCondition']={{28,3}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='惡魔協會挑戰3次',
-['SkipInterface']=8,
-['RenovateTime']=24,
-},
-[109]={
-['MissionID']=109,
-['MissionCondition']={{30,20000}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='消耗銀幣20000',
-['SkipInterface']=0,
-['RenovateTime']=24,
-},
-[110]={
-['MissionID']=110,
-['MissionCondition']={{31,50}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='消耗金幣50',
-['SkipInterface']=0,
-['RenovateTime']=24,
-},
-[111]={
-['MissionID']=111,
-['MissionCondition']={{35,1}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='合成卡片1次',
-['SkipInterface']=9,
-['RenovateTime']=24,
-},
-[112]={
-['MissionID']=112,
-['MissionCondition']={{61,1}},
-['MissionType']=1,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='世界聊天發言1次',
-['SkipInterface']=1,
-['RenovateTime']=24,
-},
-[201]={
-['MissionID']=201,
-['MissionCondition']={{32,10}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='英靈殿勝利10次',
-['SkipInterface']=7,
-['RenovateTime']=168,
-},
-[202]={
-['MissionID']=202,
-['MissionCondition']={{32,20}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='英靈殿勝利20次',
-['SkipInterface']=7,
-['RenovateTime']=168,
-},
-[203]={
-['MissionID']=203,
-['MissionCondition']={{35,7}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='合成卡片7次',
-['SkipInterface']=9,
-['RenovateTime']=168,
-},
-[204]={
-['MissionID']=204,
-['MissionCondition']={{9,7}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='裝備位精煉7次',
-['SkipInterface']=11,
-['RenovateTime']=168,
-},
-[205]={
-['MissionID']=205,
-['MissionCondition']={{36,5}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='卡片重鑄5次',
-['SkipInterface']=10,
-['RenovateTime']=168,
-},
-[206]={
-['MissionID']=206,
-['MissionCondition']={{36,20}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='卡片重鑄20次',
-['SkipInterface']=10,
-['RenovateTime']=168,
-},
-[207]={
-['MissionID']=207,
-['MissionCondition']={{64,5}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='參與遠征之門5次',
-['SkipInterface']=0,
-['RenovateTime']=168,
-},
-[208]={
-['MissionID']=208,
-['MissionCondition']={{28,50}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='惡魔協會挑戰50次',
-['SkipInterface']=8,
-['RenovateTime']=168,
-},
-[209]={
-['MissionID']=209,
-['MissionCondition']={{65,10}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='參與公會狩獵挑戰巴風特10次',
-['SkipInterface']=0,
-['RenovateTime']=168,
-},
-[210]={
-['MissionID']=210,
-['MissionCondition']={{10,20}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='合成任意裝備20次',
-['SkipInterface']=0,
-['RenovateTime']=168,
-},
-[211]={
-['MissionID']=211,
-['MissionCondition']={{10,50}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='合成任意裝備50次',
-['SkipInterface']=0,
-['RenovateTime']=168,
-},
-[212]={
-['MissionID']=212,
-['MissionCondition']={{66,5}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='參與挑戰者大廳5次',
-['SkipInterface']=0,
-['RenovateTime']=168,
-},
-[213]={
-['MissionID']=213,
-['MissionCondition']={{66,15}},
-['MissionType']=2,
-['Active']=10,
-['GuildActive']=10,
-['TargetTaskDescribe']='參與挑戰者大廳15次',
-['SkipInterface']=0,
-['RenovateTime']=168,
-},
-}
-return MissionCfg
+    [101]={
+    ['MissionID']=101,
+    ['MissionCondition']={{16,1}},
+    ['MissionType']=1,
+    ['Active']=20,
+    ['GuildActive']=20,
+    ['TargetTaskDescribe']='挑戰BOSS1次',
+    ['SkipInterface']=1,
+    ['RenovateTime']=24,
+    },
+    [102]={
+    ['MissionID']=102,
+    ['MissionCondition']={{5,1}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='任意夥伴升級1次',
+    ['SkipInterface']=3,
+    ['RenovateTime']=24,
+    },
+    [103]={
+    ['MissionID']=103,
+    ['MissionCondition']={{25,1}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='領取寶箱獎勵1次',
+    ['SkipInterface']=2,
+    ['RenovateTime']=24,
+    },
+    [104]={
+    ['MissionID']=104,
+    ['MissionCondition']={{10,1}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='裝備合成1次',
+    ['SkipInterface']=4,
+    ['RenovateTime']=24,
+    },
+    [105]={
+    ['MissionID']=105,
+    ['MissionCondition']={{20,1}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='使用時光之力1次',
+    ['SkipInterface']=5,
+    ['RenovateTime']=24,
+    },
+    [106]={
+    ['MissionID']=106,
+    ['MissionCondition']={{33,1}},
+    ['MissionType']=1,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='試煉之塔戰鬥1次',
+    ['SkipInterface']=6,
+    ['RenovateTime']=24,
+    },
+    [107]={
+    ['MissionID']=107,
+    ['MissionCondition']={{26,5}},
+    ['MissionType']=1,
+    ['Active']=20,
+    ['GuildActive']=20,
+    ['TargetTaskDescribe']='英靈殿戰鬥5次',
+    ['SkipInterface']=7,
+    ['RenovateTime']=24,
+    },
+    [108]={
+    ['MissionID']=108,
+    ['MissionCondition']={{28,3}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='惡魔協會挑戰3次',
+    ['SkipInterface']=8,
+    ['RenovateTime']=24,
+    },
+    [109]={
+    ['MissionID']=109,
+    ['MissionCondition']={{30,20000}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='消耗銀幣20000',
+    ['SkipInterface']=0,
+    ['RenovateTime']=24,
+    },
+    [110]={
+    ['MissionID']=110,
+    ['MissionCondition']={{31,50}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='消耗金幣50',
+    ['SkipInterface']=0,
+    ['RenovateTime']=24,
+    },
+    [111]={
+    ['MissionID']=111,
+    ['MissionCondition']={{35,1}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='合成卡片1次',
+    ['SkipInterface']=9,
+    ['RenovateTime']=24,
+    },
+    [112]={
+    ['MissionID']=112,
+    ['MissionCondition']={{61,1}},
+    ['MissionType']=1,
+    ['Active']=15,
+    ['GuildActive']=15,
+    ['TargetTaskDescribe']='世界聊天發言1次',
+    ['SkipInterface']=1,
+    ['RenovateTime']=24,
+    },
+    [201]={
+    ['MissionID']=201,
+    ['MissionCondition']={{32,10}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='英靈殿勝利10次',
+    ['SkipInterface']=7,
+    ['RenovateTime']=168,
+    },
+    [202]={
+    ['MissionID']=202,
+    ['MissionCondition']={{32,20}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='英靈殿勝利20次',
+    ['SkipInterface']=7,
+    ['RenovateTime']=168,
+    },
+    [203]={
+    ['MissionID']=203,
+    ['MissionCondition']={{35,7}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='合成卡片7次',
+    ['SkipInterface']=9,
+    ['RenovateTime']=168,
+    },
+    [204]={
+    ['MissionID']=204,
+    ['MissionCondition']={{9,7}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='裝備位精煉7次',
+    ['SkipInterface']=11,
+    ['RenovateTime']=168,
+    },
+    [205]={
+    ['MissionID']=205,
+    ['MissionCondition']={{36,5}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='卡片重鑄5次',
+    ['SkipInterface']=10,
+    ['RenovateTime']=168,
+    },
+    [206]={
+    ['MissionID']=206,
+    ['MissionCondition']={{36,20}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='卡片重鑄20次',
+    ['SkipInterface']=10,
+    ['RenovateTime']=168,
+    },
+    [207]={
+    ['MissionID']=207,
+    ['MissionCondition']={{64,5}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='參與遠征之門5次',
+    ['SkipInterface']=0,
+    ['RenovateTime']=168,
+    },
+    [208]={
+    ['MissionID']=208,
+    ['MissionCondition']={{28,50}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='惡魔協會挑戰50次',
+    ['SkipInterface']=8,
+    ['RenovateTime']=168,
+    },
+    [209]={
+    ['MissionID']=209,
+    ['MissionCondition']={{65,10}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='參與公會狩獵挑戰巴風特10次',
+    ['SkipInterface']=0,
+    ['RenovateTime']=168,
+    },
+    [210]={
+    ['MissionID']=210,
+    ['MissionCondition']={{10,20}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='合成任意裝備20次',
+    ['SkipInterface']=0,
+    ['RenovateTime']=168,
+    },
+    [211]={
+    ['MissionID']=211,
+    ['MissionCondition']={{10,50}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='合成任意裝備50次',
+    ['SkipInterface']=0,
+    ['RenovateTime']=168,
+    },
+    [212]={
+    ['MissionID']=212,
+    ['MissionCondition']={{66,5}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='參與挑戰者大廳5次',
+    ['SkipInterface']=0,
+    ['RenovateTime']=168,
+    },
+    [213]={
+    ['MissionID']=213,
+    ['MissionCondition']={{66,15}},
+    ['MissionType']=2,
+    ['Active']=10,
+    ['GuildActive']=10,
+    ['TargetTaskDescribe']='參與挑戰者大廳15次',
+    ['SkipInterface']=0,
+    ['RenovateTime']=168,
+    },
+    }
+    return MissionCfg

+ 1 - 1
Assets/Lua/Managers/LoginMgr.lua

@@ -341,7 +341,7 @@ function LoginMgr:StartSdkInit()
         SDKMgr.Instance:SetHttpCheckUrl(PlatformPack.URL_KEY)
         self.preLoginStatus = self.loginStatus
         self.loginStatus = LoginStatus.SdkInit
-        self.stayTime = 5
+        self.stayTime = 35
         ManagerContainer.LuaGameMgr.sdkInited = Enum.ParamState.None
         ManagerContainer.LuaGameMgr:SdkInit()
     end

+ 3 - 2
Assets/Lua/UI/UILanuch/UILanuchView.lua

@@ -36,6 +36,7 @@ function UILanuchView:Init()
 	else
 		self.loginAnim.animator:Play('LoginKeep')
 	end
+	self.btnCADPA:SetActive(false)
 	self.loginRoot:SetActive(false)
 	self.loadingRoot:SetActive(false)
 	self.logo:SetActive(true)
@@ -63,12 +64,12 @@ function UILanuchView:AddUIEventListener()
 end
 
 function UILanuchView:OnHide()
-
+	
 end
 
 function UILanuchView:OnShow(data)
 	self.controller:SetData(data)
-
+	self.btnCADPA:SetActive(false)
 end
 
 function UILanuchView:OnClose()

+ 5 - 0
Assets/Plugins/QuickSDK/LoginKitListener.cs

@@ -34,10 +34,12 @@ namespace quicksdk
             if (msg == "Fail")
             {
                 Debug.Log("QKSDK初始化失败");
+                QKGame.InitState = QKSDKInitState.Fail;
                 m_YouYiListener.OnInitFailed();
             }
             else
             {
+                QKGame.InitState = QKSDKInitState.Success;
                 Debug.Log("QKSDK初始化成功");
                 m_YouYiListener.OnInitSuccess();
             }
@@ -54,6 +56,7 @@ namespace quicksdk
             //string isNewUser = data[@"isNewUser"].Value;
             //string isGuest = data[@"isGuest"].Value;
             //执行登录成功操作
+            m_YouYiListener.UID = data["uid"].Value;
             m_YouYiListener.OnLoginSuccess(token);
         }
 
@@ -123,10 +126,12 @@ namespace quicksdk
             //string total = data["total"].Value;
             //string extras_params = data["extras_params"].Value;
             //从苹果服务器获取商品信息成功回调
+            Debug.Log("====================" + products);
         }
         public void findProductInfoFail(string msg)
         {
             //从苹果服务器获取商品信息失败回调
+            Debug.Log("====================从苹果服务器获取商品信息失败回调");
         }
     }
 }

+ 50 - 19
Assets/Plugins/QuickSDK/QKGame.cs

@@ -2,13 +2,42 @@ using UnityEngine;
 using System.Collections;
 using System.Runtime.InteropServices;
 //using Newtonsoft.Json;
-#if UNITY_IPHONE
+#if UNITY_IOS
 using quicksdk;
 using System.Collections.Generic;
 
 
+public enum QKSDKInitState
+{
+    None,
+    Initing,
+    Success,
+    Fail,
+}
+
+public class ProductInfo
+{
+    public string ID;
+    public string Name;
+}
 
 public class QKGame {
+
+    public static QKSDKInitState InitState = QKSDKInitState.None;
+
+    public Dictionary<string, ProductInfo> ProductInfos = new Dictionary<string, ProductInfo>()
+    {
+        { "0.99",new ProductInfo(){ ID = "product_ticket_0.99_ro",Name = "商品1"} },
+        { "1.99",new ProductInfo(){ ID = "product_ticket_1.99_ro",Name = "商品2"} },
+        { "2.99",new ProductInfo(){ ID = "product_ticket_2.99_ro",Name = "商品3"} },
+        { "4.99",new ProductInfo(){ ID = "product_ticket_4.99_ro",Name = "商品4"} },
+        { "9.99",new ProductInfo(){ ID = "product_ticket_9.99_ro",Name = "商品5"} },
+        { "14.99",new ProductInfo(){ ID = "product_ticket_14.99_ro",Name = "商品6"} },
+        { "19.99",new ProductInfo(){ ID = "product_ticket_19.99_ro",Name = "商品7"} },
+        { "49.99",new ProductInfo(){ ID = "product_ticket_49.99_ro",Name = "商品8"} },
+        { "99.99",new ProductInfo(){ ID = "product_ticket_99.99_ro",Name = "商品9"} },
+    };
+
     [DllImport("__Internal")]
     private static extern void LuluSetListener(string gameObjectName);
     public void loginKitSetListener(LoginKitListener listener)
@@ -25,22 +54,23 @@ public class QKGame {
             LuluSetListener(gameObjectName);
         }
     }
-	 [DllImport("__Internal")]  
-     private static extern void luLuInit();
-	//init
-	public static void txQKInit()
-	{
-		if (Application.platform != RuntimePlatform.OSXEditor)   
-        {  
-			luLuInit();
-        }  
-	}
-	 [DllImport("__Internal")]  
-     private static extern void luLuLogin(bool isShowMenu);
-	 //Login
-     public static void txQKLogin (bool isShowMenu)
-     {  
-        if (Application.platform != RuntimePlatform.OSXEditor)
+    [DllImport("__Internal")]
+    private static extern void luLuInit();
+    //init
+    public static void txQKInit()
+    {     
+        if (Application.platform != RuntimePlatform.OSXEditor || InitState == QKSDKInitState.None || InitState == QKSDKInitState.Fail)
+        {
+            InitState = QKSDKInitState.Initing;
+            luLuInit();
+        }
+    }
+    [DllImport("__Internal")]
+    private static extern void luLuLogin(bool isShowMenu);
+    //Login
+    public static void txQKLogin(bool isShowMenu)
+    {
+        if (Application.platform != RuntimePlatform.OSXEditor )
         {  
 			luLuLogin(isShowMenu); 
         }  
@@ -170,8 +200,9 @@ public class QKGame {
 	private static extern void luLuCongzi(string productId,string productName,string amount,string orderNo,string callBackUrl,string extrasParams);
 	//Pay RMB,参数 苹果商品ID 商品名称 价格 游戏订单号 游戏收单服务器地址 透传参数
 	public static void txQKCongzi(string productId,string productName,string amount,string orderNo,string callBackUrl,string extrasParams)
-	{  
-		if (Application.platform != RuntimePlatform.OSXEditor)   
+	{      
+
+        if (Application.platform != RuntimePlatform.OSXEditor)   
 		{  
 			luLuCongzi(productId,productName,amount,orderNo,callBackUrl,extrasParams);
 		}