Merge branch 'sskin' of ssh://192.168.0.8:29418/XianJing into hy_test

# Conflicts:
#	Assets/Lua/Managers/PayMgr.lua

Assets/Lua/Core/PlatformPack.lua

@@ -1,7 +1,7 @@
 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/',
+	NOTIFY_URL = 'http://110.40.223.119:88/res/NoticeNew/',
 	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
 	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
 }

Assets/Lua/Managers/OpenPayMgr.lua

@@ -17,6 +17,8 @@ function OpenPayMgr:ctor()
  --62071860216202428267772989490827
     self:RegisterNetEvents()
    
+    self.IsInitVersionInfo = false
+    self.VersionCfgWWw = nil
 end
 
 
@@ -56,7 +58,7 @@ function OpenPayMgr:SetOpenData(userId,roleName,roleLevel,serverName)
         -- self.productCode = "25053842546594917787640743618071"
         -- self.openKey = "oxlQZ8zN7QfrC6mMJ9P0pnvPjx8JutlS"    
     end    
-
+    self:GetVersionCfg()
     --LogError("---------OpenPayMgr -------------uid = "..userId.."   roleName = "..roleName.."    roleLevel = "..roleLevel.."   serverName = "..serverName)
 end
 --ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UISimpleWeb, "https://www.baidu.com", nil, nil, nil, Enum.UISibling[Enum.UIType.Top] - 2)
@@ -220,4 +222,63 @@ function OpenPayMgr:OnGetMD5InfoAck(data)
     self.getPayUrlWWW = UnityEngine.WWW(self.baseUrl,self.postData)
 end
 
+
+
+function OpenPayMgr:GetVersionCfg()
+    local url = PlatformPack.NOTIFY_URL .. "VersionCfg.json"
+    ManagerContainer.LuaGameMgr:RequestHttpServer(url,function (text)
+        self:OnGetVersionCfg(text)
+    end)
+
+
+end
+
+
+function OpenPayMgr:OnGetVersionCfg(text)
+    local cfgsJson
+
+	self.versionCfgs = {}
+	local ok, errors = RO_XPCALL(function()  cfgsJson = JSON:decode(text) end, debug.traceback)
+    if  ok then
+        for k,p in pairs(cfgsJson) do
+           self.versionCfgs[p.Version] = p
+           LogError(Inspect(p))
+        end			  
+    else
+       
+        LogError("[Notice].."..errors)
+    end
+
+end
+
+
+function OpenPayMgr:GetCurVersionCfg(version)
+    local cfg 
+    if self.versionCfgs[version] == nil then
+        cfg = 
+        {
+            Version = version,
+            AndroidPayMode = -1,
+            IOSPayMode = -1
+        }
+    else
+        cfg =  self.versionCfgs[version] 
+    end
+    LogError(Inspect(cfg))
+    return cfg
+end
+
+function OpenPayMgr:GetCurPayMode()
+    local vs =  UnityEngine.Application.Version
+    local vcfg = self:GetCurVersionCfg(vs)
+    if self.platform == "SDKHwQuick" then
+        return vcfg.AndroidPayMode + 0
+    elseif self.platform  ==  "SDKYOUYI_IOS" then   
+        return vcfg.IOSPayMode + 0
+    else
+        return vcfg.AndroidPayMode + 0
+    end    
+end
+
+
 return OpenPayMgr

Assets/Lua/Managers/PayMgr.lua

@@ -130,12 +130,7 @@ function PayMgr:OnGetPayInfoAck(data)
         payType = strArr[2] + 0
     end
 
-    --1.0.0.25
-    local version = UnityEngine.Application.version
-
-    if version == "1.0.0.24" and ManagerContainer.OpenPayMgr.platform == "SDKHwQuick"  then
-        payType = -1
-    end
+    payType = ManagerContainer.OpenPayMgr:GetCurPayMode()
 
     --ManagerContainer.OpenPayMgr:Pay(data.goods_id, data.goods_name, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), cbUrl,"ex")
     -- and ManagerContainer.OpenPayMgr.platform == "SDKYOUYI_IOS"