Merge branch 'new' into hy_ios

Assets/Content/Config/LanguagePackage_cn.csv

@@ -9293,7 +9293,7 @@ CashReward02,本關勝利可獲得
 CashReward03,<color=#078DF5>{0}</color>後自動關閉
 CashText,紅包
 CurrencyText,$
-CashShopExplain,1.新玩家創建角色後30天內，挑戰關卡領先的玩家即可獲得現金獎勵，現金可用於現金商店中購買儲值卡。\n2.購買儲值卡後可直接獲得對應數量金幣。
+CashShopExplain,1.玩家創建角色起14天內通關關卡可獲得紅包，紅包可在紅包兌換商店換取金幣獎勵。
 PetScore,得分
 PetScoreTotal,總分
 SkillLvTotal,技能總等級

Assets/Lua/Config/RuneShopExploreRewardCfg.lua

@@ -304,7 +304,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=1,
 ['Exp']=0,
 ['Reward']={{1,50000}},
-['CashReward']={{517,2}},
+['CashReward']={{523,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -314,7 +314,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=2,
 ['Exp']=20000,
 ['Reward']={{511,3}},
-['CashReward']={{110,1}},
+['CashReward']={{110,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -324,7 +324,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=3,
 ['Exp']=50000,
 ['Reward']={{531,1}},
-['CashReward']={{607,1}},
+['CashReward']={{608,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -334,7 +334,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=4,
 ['Exp']=100000,
 ['Reward']={{20,50}},
-['CashReward']={{131,1}},
+['CashReward']={{136,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -354,7 +354,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=6,
 ['Exp']=300000,
 ['Reward']={{115,5}},
-['CashReward']={{130,1}},
+['CashReward']={{138,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -364,7 +364,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=7,
 ['Exp']=400000,
 ['Reward']={{100,5}},
-['CashReward']={{110,2}},
+['CashReward']={{110,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -374,7 +374,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=8,
 ['Exp']=500000,
 ['Reward']={{512,2}},
-['CashReward']={{517,3}},
+['CashReward']={{523,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -384,7 +384,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=9,
 ['Exp']=600000,
 ['Reward']={{20,100}},
-['CashReward']={{131,1}},
+['CashReward']={{139,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -404,7 +404,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=11,
 ['Exp']=800000,
 ['Reward']={{1,100000}},
-['CashReward']={{130,1}},
+['CashReward']={{137,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -414,7 +414,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=12,
 ['Exp']=900000,
 ['Reward']={{512,3}},
-['CashReward']={{110,2}},
+['CashReward']={{110,10}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -424,7 +424,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=13,
 ['Exp']=1000000,
 ['Reward']={{531,2}},
-['CashReward']={{607,1}},
+['CashReward']={{610,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -434,7 +434,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=14,
 ['Exp']=1100000,
 ['Reward']={{115,5}},
-['CashReward']={{131,1}},
+['CashReward']={{136,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -454,7 +454,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=16,
 ['Exp']=1300000,
 ['Reward']={{20,200}},
-['CashReward']={{130,1}},
+['CashReward']={{138,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -464,7 +464,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=17,
 ['Exp']=1400000,
 ['Reward']={{100,5}},
-['CashReward']={{110,3}},
+['CashReward']={{110,10}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -474,7 +474,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=18,
 ['Exp']=1500000,
 ['Reward']={{607,1}},
-['CashReward']={{517,4}},
+['CashReward']={{520,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -484,7 +484,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=19,
 ['Exp']=1600000,
 ['Reward']={{115,5}},
-['CashReward']={{131,1}},
+['CashReward']={{139,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -504,7 +504,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=21,
 ['Exp']=1800000,
 ['Reward']={{1,100000}},
-['CashReward']={{134,1}},
+['CashReward']={{136,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -514,7 +514,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=22,
 ['Exp']=2000000,
 ['Reward']={{511,5}},
-['CashReward']={{110,3}},
+['CashReward']={{110,10}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -524,7 +524,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=23,
 ['Exp']=2200000,
 ['Reward']={{531,3}},
-['CashReward']={{607,1}},
+['CashReward']={{610,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -534,7 +534,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=24,
 ['Exp']=2400000,
 ['Reward']={{494,50}},
-['CashReward']={{135,1}},
+['CashReward']={{137,3}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -554,7 +554,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=26,
 ['Exp']=3000000,
 ['Reward']={{20,300}},
-['CashReward']={{134,1}},
+['CashReward']={{138,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -574,7 +574,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=28,
 ['Exp']=4000000,
 ['Reward']={{607,1}},
-['CashReward']={{517,5}},
+['CashReward']={{520,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,
@@ -584,7 +584,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=29,
 ['Exp']=4500000,
 ['Reward']={{110,3}},
-['CashReward']={{135,1}},
+['CashReward']={{139,2}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=2,

Assets/Lua/Config/RuneShopGiftsCfg.lua

@@ -396,6 +396,114 @@ local RuneShopGiftsCfg = {
     ['SortId']=11,
     ['RmbTotalPay']=99,
     },
+[41]={
+['Id']=41,
+['Name']='日直购武器精炼包(惠)',
+['Pic']='ShopIcons/market_weekbox1',
+['Type']=1,
+['RMB']=9.99,
+['Reward']={{102,999},{1,5000000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[42]={
+['Id']=42,
+['Name']='日直购防具精炼包(惠)',
+['Pic']='ShopIcons/market_weekbox1',
+['Type']=1,
+['RMB']=9.99,
+['Reward']={{101,1999},{1,5000000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[43]={
+['Id']=43,
+['Name']='每日禮包(惠)',
+['Pic']='ShopIcons/market_weekbox1',
+['Type']=1,
+['RMB']=0.99,
+['Reward']={{102,200},{1,50000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[44]={
+['Id']=44,
+['Name']='每日禮包(惠)',
+['Pic']='ShopIcons/market_weekbox1',
+['Type']=1,
+['RMB']=0.99,
+['Reward']={{101,300},{1,50000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[45]={
+['Id']=45,
+['Name']='日購RO禮包',
+['Pic']='ShopIcons/market_weekbox1',
+['Type']=1,
+['RMB']=0.99,
+['Reward']={{54,500},{2,100000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[46]={
+['Id']=46,
+['Name']='周直购武器精炼包(惠)',
+['Pic']='ShopIcons/market_weekbox1',
+['Type']=2,
+['RMB']=49.99,
+['Reward']={{102,6666},{2,1000000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[47]={
+['Id']=47,
+['Name']='周直购防具精炼包(惠)',
+['Pic']='ShopIcons/market_weekbox1',
+['Type']=2,
+['RMB']=49.99,
+['Reward']={{101,12888},{2,1000000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[48]={
+['Id']=48,
+['Name']='周購RO禮包',
+['Pic']='ShopIcons/market_weekbox1',
+['Type']=2,
+['RMB']=19.99,
+['Reward']={{54,6666},{2,666600}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[49]={
+['Id']=49,
+['Name']='周直購禮包(惠)',
+['Pic']='ShopIcons/bt_market_giftbox7',
+['Type']=2,
+['RMB']=4.99,
+['Reward']={{529,5},{531,5},{514,10}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=2,
+['RmbTotalPay']=0,
+},
 [50]={
 ['Id']=50,
 ['Name']='月直購禮包1',

Assets/Lua/Config/RuneShopLimitCfg.lua

@@ -75,7 +75,7 @@ local RuneShopLimitCfg = {
     ['Id']=18,
     ['Name']='精煉禮包-神之金屬',
     ['Banner']='ShopIcons/img_club_limited_Banner09',
-    ['BuyReward']={{2,30000},{137,2},{687,1},{102,120}},
+    ['BuyReward']={{2,300000},{137,2},{687,1},{102,388}},
     ['RMB']=14.99,
     ['RedPoint']=1,
     ['SortId']=3630,
@@ -84,7 +84,7 @@ local RuneShopLimitCfg = {
     ['Id']=19,
     ['Name']='精煉禮包-鋁',
     ['Banner']='ShopIcons/img_club_limited_Banner10',
-    ['BuyReward']={{2,30000},{137,2},{701,1},{101,150}},
+    ['BuyReward']={{2,300000},{137,2},{701,1},{101,388}},
     ['RMB']=14.99,
     ['RedPoint']=1,
     ['SortId']=3620,
@@ -480,8 +480,8 @@ local RuneShopLimitCfg = {
     ['Id']=66,
     ['Name']='武士時裝禮包',
     ['Banner']='ShopIcons/img_club_limited_banner17',
-    ['BuyReward']={{15037,1},{498,50},{494,300},{137,3},{404,90},{405,90},{406,90}},
-    ['RMB']=49.99,
+    ['BuyReward']={{15037,1},{498,20},{494,300},{137,3},{404,90},{405,90},{406,90}},
+    ['RMB']=19.99,
     ['RedPoint']=1,
     ['SortId']=3150,
     },
@@ -2326,7 +2326,7 @@ local RuneShopLimitCfg = {
     ['Name']='夢想水手時裝禮包',
     ['Banner']='ShopIcons/img_club_limited_banner47',
     ['BuyReward']={{11104,1},{498,50},{494,500},{420,20},{422,20},{440,20},{404,20},{405,20},{406,20},{2,66600}},
-    ['RMB']=99.99,
+    ['RMB']=19.99,
     ['RedPoint']=0,
     ['SortId']=3651,
     },
@@ -2353,7 +2353,7 @@ local RuneShopLimitCfg = {
     ['Name']='甜蜜誓約時裝禮包',
     ['Banner']='ShopIcons/img_club_limited_banner48',
     ['BuyReward']={{11103,1},{420,30},{422,30},{440,30},{404,30},{405,30},{406,30},{498,50},{494,500},{2,131400}},
-    ['RMB']=99.99,
+    ['RMB']=19.99,
     ['RedPoint']=1,
     ['SortId']=1003,
     },
@@ -2416,7 +2416,7 @@ local RuneShopLimitCfg = {
     ['Name']='粉紅派對',
     ['Banner']='ShopIcons/img_club_limited_banner58',
     ['BuyReward']={{15058,1},{498,50},{529,2},{2,52000},{420,30},{422,30},{440,30},{404,30},{405,30},{406,30}},
-    ['RMB']=49.99,
+    ['RMB']=19.99,
     ['RedPoint']=1,
     ['SortId']=1026,
     },
@@ -2443,7 +2443,7 @@ local RuneShopLimitCfg = {
     ['Name']='奶嘴限時禮包',
     ['Banner']='ShopIcons/img_club_limited_banner61',
     ['BuyReward']={{13097,1},{498,20},{494,100}},
-    ['RMB']=19.99,
+    ['RMB']=4.99,
     ['RedPoint']=1,
     ['SortId']=1029,
     },
@@ -2452,7 +2452,7 @@ local RuneShopLimitCfg = {
     ['Name']='限時頭飾自選禮包二',
     ['Banner']='ShopIcons/img_club_limited_banner63',
     ['BuyReward']={{15060,1},{497,15},{494,100},{137,3}},
-    ['RMB']=19.99,
+    ['RMB']=9.99,
     ['RedPoint']=1,
     ['SortId']=1034,
     },
@@ -3640,7 +3640,7 @@ local RuneShopLimitCfg = {
     ['Name']='校園偶像時裝禮盒',
     ['Banner']='ShopIcons/img_club_limited_banner80',
     ['BuyReward']={{15097,1},{529,2},{2,188800},{420,30},{422,30},{440,30},{404,30},{405,30},{406,30}},
-    ['RMB']=49.99,
+    ['RMB']=19.99,
     ['RedPoint']=1,
     ['SortId']=1302,
     },
@@ -3676,7 +3676,7 @@ local RuneShopLimitCfg = {
     ['Name']='神器助力包',
     ['Banner']='ShopIcons/img_club_limited_banner89',
     ['BuyReward']={{237,1},{255,20},{48,200}},
-    ['RMB']=4.99,
+    ['RMB']=49.99,
     ['RedPoint']=1,
     ['SortId']=1131,
     },
@@ -3685,7 +3685,7 @@ local RuneShopLimitCfg = {
     ['Name']='冰之翼時裝禮包',
     ['Banner']='ShopIcons/img_club_limited_banner84',
     ['BuyReward']={{13183,1},{136,2},{137,5},{2,500000},{404,30},{405,30},{406,30}},
-    ['RMB']=99.99,
+    ['RMB']=49.99,
     ['RedPoint']=1,
     ['SortId']=898,
     },
@@ -3829,7 +3829,7 @@ local RuneShopLimitCfg = {
     ['Name']='兔侍時裝禮包',
     ['Banner']='ShopIcons/img_club_limited_banner102',
     ['BuyReward']={{15107,1},{13185,1},{498,20},{494,500},{2,188800},{420,30},{422,30},{440,30},{404,30},{405,30},{406,30}},
-    ['RMB']=99.99,
+    ['RMB']=19.99,
     ['RedPoint']=1,
     ['SortId']=488,
     },
@@ -3838,7 +3838,7 @@ local RuneShopLimitCfg = {
     ['Name']='絢麗煙花時裝禮包',
     ['Banner']='ShopIcons/img_club_limited_banner101',
     ['BuyReward']={{13189,1},{115,20},{2,99900},{404,30},{405,30},{406,30}},
-    ['RMB']=19.99,
+    ['RMB']=9.99,
     ['RedPoint']=1,
     ['SortId']=489,
     },
@@ -3847,7 +3847,7 @@ local RuneShopLimitCfg = {
     ['Name']='火之翼禮盒',
     ['Banner']='ShopIcons/img_club_limited_banner105',
     ['BuyReward']={{13184,1},{115,30},{116,30},{2,1000000},{404,30},{405,30},{406,30}},
-    ['RMB']=99.99,
+    ['RMB']=49.99,
     ['RedPoint']=1,
     ['SortId']=490,
     },
@@ -4125,7 +4125,7 @@ local RuneShopLimitCfg = {
     ['Id']=532,
     ['Name']='潛能禮包',
     ['Banner']='ShopIcons/img_club_limited_banner121',
-    ['BuyReward']={{520,2},{529,15},{2,1888000}},
+    ['BuyReward']={{520,2},{529,30},{2,1888000}},
     ['RMB']=99.99,
     ['RedPoint']=1,
     ['SortId']=444,
@@ -4188,8 +4188,8 @@ local RuneShopLimitCfg = {
     ['Id']=539,
     ['Name']='雙倍金幣-128',
     ['Banner']='ShopIcons/img_club_limited_banner12',
-    ['BuyReward']={{2,256000}},
-    ['RMB']=4.99,
+    ['BuyReward']={{2,2560000}},
+    ['RMB']=19.99,
     ['RedPoint']=1,
     ['SortId']=1032,
     },
@@ -4197,8 +4197,8 @@ local RuneShopLimitCfg = {
     ['Id']=540,
     ['Name']='雙倍金幣-648',
     ['Banner']='ShopIcons/img_club_limited_banner11',
-    ['BuyReward']={{2,1296000}},
-    ['RMB']=14.99,
+    ['BuyReward']={{2,12960000}},
+    ['RMB']=99.99,
     ['RedPoint']=1,
     ['SortId']=1031,
     },
@@ -4225,7 +4225,7 @@ local RuneShopLimitCfg = {
     ['Name']='時裝飛昇禮包',
     ['Banner']='ShopIcons/img_club_limited_banner130',
     ['BuyReward']={{499,12},{498,66},{497,121},{493,212},{2,121200}},
-    ['RMB']=19.99,
+    ['RMB']=49.99,
     ['RedPoint']=1,
     ['SortId']=1133,
     },

Assets/Lua/Core/PlatformPack.lua

@@ -1,6 +1,6 @@
 local PlatformPack = {
 	URL_KEY = 'http://165.154.29.92:81//',
-	SERVERLIST_URL = 'http://165.154.29.92:81//serverlist',
+	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',

Assets/Lua/Managers/ManagerContainer.lua

@@ -46,6 +46,7 @@ function ManagerContainer:InitMgr()
     self.VipChangeMgr = require('VipChangeMgr'):new()
     self.PayMgr = require('PayMgr'):new()
     self.LoginMgr = require('LoginMgr'):new()
+    self.OpenPayMgr = require('OpenPayMgr'):new()
 end
 
 function ManagerContainer:Update()
@@ -81,6 +82,9 @@ function ManagerContainer:Reset()
     if self.LuaActorAttributeMgr then
         self.LuaActorAttributeMgr:Clear()
     end
+    if self.OpenPayMgr then
+        self.OpenPayMgr:Clear()
+    end
 end
 
 function ManagerContainer:FieldDestroy(field)

Assets/Lua/Managers/OpenPayMgr.lua

@@ -0,0 +1,76 @@
+local OpenPayMgr = class('OpenPayMgr')
+function OpenPayMgr:ctor()
+    self.openID = ""
+    self.productCode = ""
+    self.userId = ""
+    self.roleName = ""
+    self.serverName = ""
+    self.roleLevel = 0
+    self.sign = ""
+    LogError("---------OpenPayMgr --------------")
+end
+
+function OpenPayMgr:Clear()
+    self.userId = ""
+    self.roleName = ""
+    self.serverName = ""
+    self.roleLevel = 0
+end
+
+function OpenPayMgr:Destroy()
+
+    self:UnRegisterNetEvents()
+end
+
+function OpenPayMgr:RegisterNetEvents()
+
+end
+
+function OpenPayMgr:UnRegisterNetEvents()
+
+end
+
+function OpenPayMgr:GetOpenPayUrl(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
+    local url = "http://xxx.com/open/getPayUrl?"
+    -- openId string 必传 开放平台开发者身份id，由QuickSDK分配
+    url = url .. "openId=" .. self.openID
+    -- productCode string 必传 产品CODE，在QuickSDK后台获取
+    url = url .. "&productCode=" .. self.productCode
+    -- userId  string 必传 SDK用户的账号ID
+    url = url .. "&userId=" .. self.userId
+    -- goodsId string 必传 游戏商品id
+    url = url .. "&goodsId=" .. goodsId
+    -- cpOrderNostring 选传游戏订单号
+    url = url .. "&cpOrderNostring=" .. cpOrderId
+    -- orderSubject string 必传 订单标题
+    url = url .. "&orderSubject=" .. goodsDesc
+    -- roleName string必传 用户角色名
+    url = url .. "&roleName=" .. self.roleName
+    -- serverName string必传游戏服务器名
+    url = url .. "&serverName=" .. self.serverName
+    -- goodsName string必传 商品名称
+    url = url .. "&goodsName=" .. goodsName
+    -- roleLevel int 必传 用户角色等级
+    url = url .. "&roleLevel=" .. self.roleLevel
+    -- extrasParams string必传 订单保留参数，原样返回给cp
+    url = url .. "&extrasParams=" .. extrasParams
+    -- callbackUrl string 选传订单回调地址,就是通知cp服务器发货的通知地址 
+    url = url .. "&callbackUrl=" .. cbUrl
+    -- payTypestring 选传 支付方式ID，ID获取请参照SDK后台“平台管理”>“支付对照表”。支持多种支付方式，多个支付方式以“|”隔开，比如：12|13|23注意：支付方式ID需满足后台勾选已经支持的第三方支付方式，否则无法显示指定支付方式渠道
+
+    -- countryCode string 选传国家代码，如CHN。获取请参照SDK后台“平台管理”>“地区管理”注意：国家代码需满足后台勾选已经支持的第三方支付方式，否则无法显示指定国家的支付
+
+    -- clientLang string 必传支付中心语言包，填写地区语言代码，如en-US。默认为中文繁体
+
+    -- payVersion int 选传 第三方支付版本，默认不填写为SDK常规版本。取固定值为：2. 表示平台单独处理版本，此版本平台需传金额和币种进行支付并且SDK不参与商品金额的转换由平台自身处理，平台根据自身情况酌情考虑使用。
+
+    -- amount float 选传 订单金额。如果payVersion的值为2，则必传amount字段
+    url = url .. "&amount=" .. amount
+    -- currency string 选传 选传 订单支付的币种代码。如果payVersion的值为2，则必传currency字段注意：支付币种代码必须为SDK后台货币管理里面所支持的货币代码
+
+    -- sign string 必传 签名串，算法详见第三章签名算法描述
+    url = url .. "&sign=" .. self.sign
+    return url
+end
+
+return OpenPayMgr

Assets/Lua/Managers/OpenPayMgr.lua.meta

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

Assets/Lua/UI/UIVoyage/UIVoyageView.lua

@@ -129,7 +129,7 @@ end
 
 function UIVoyageView:OnClickAddBtn()
 	--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {costNum, nil, self.SureBuyChallengeNumBtn, self})
-	
+	--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UISimpleWeb, "https://www.baidu.com", nil, nil, nil, Enum.UISibling[Enum.UIType.Top] - 2)
 	local buyNum = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyNum()
 	
 	local buyNumLimit = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyNumLimit()

Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -269,15 +269,17 @@ public class DownloadMgr : Singleton<DownloadMgr>
     }
     private void DownloadedCallback(DownloadTask task)
     {
-        if (task == null)
+        if (task == null || downloadSucessList == null)
         {
             DowmloadError = true;
             AssetDownloader.Instance.CancelDownLoad = true;
             return;
         }
 
-        DownloadDataEntity entity = downloadSucessList.FindFirst(it => it.FullName == task.CurDownloadEntity.FullName);
 
+        DownloadDataEntity entity = null;
+  
+        entity = downloadSucessList.FindFirst(it => it.FullName == task.CurDownloadEntity.FullName);
         if (entity != null)
         {
             entity.MD5 = task.CurDownloadEntity.MD5;

Assets/Src/GameLogic/LaunchLoadMgr.cs

@@ -168,7 +168,7 @@ public class LaunchLoadMgr
                     return isFinish;
             });
         }
-
+        yield return new WaitForSeconds(1);
         DownloadMgr.Instance.Free();
         //m_LoadingRootGo.SetActive(false);
         //SetLoadEffectShowState(false);