修改热更+openUrl

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/Core/PlatformPack.lua

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

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

@@ -1,65 +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()
+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 选传游戏订单号
-
-    -- orderSubjectstring必传订单标题
-
+    url = url .. "&cpOrderNostring=" .. cpOrderId
+    -- orderSubject string 必传 订单标题
+    url = url .. "&orderSubject=" .. goodsDesc
     -- roleName string必传 用户角色名
-
-    -- serverNamestring必传游戏服务器名
-
+    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需满足后台勾选已经支持的第三方支付方式，否则无法显示指定支付方式渠道
 
-    -- callbackUrlstring 选传订单回调地址,就是通知cp服务器发货的通知地址 
-
-    -- 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
+return OpenPayMgr

Assets/Lua/Managers/OpenPayMgr.lua.meta

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

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);

ProjectSettings/ProjectSettings.asset

@@ -846,7 +846,7 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
+    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;GAME_DEBUG
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
     iPhone: USE_LUA;VUPLEX_CCU