Merge branch 'new' into hy_ios

# Conflicts:
#	UserSettings/Layouts/default-2021.dwlt

Assets/Content/Raw_Art/UI/UIActivity/pg_btn.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 68616786021134f41939d7afddc990f6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Config/ActivitiesCfg.lua

@@ -2112,6 +2112,20 @@ local ActivitiesCfg = {
 ['RuleKey']='',
 ['ExpiredActivities']=0,
 },
+[18006]={
+['Id']=18006,
+['Type']=12,
+['Name']='每日储值',
+['Order']=1,
+['BG']='ActivityImg/monthrecharge_cn',
+['ActivityBG']='ActivityImg/monthrecharge_cn',
+['PageId']=335,
+['Entrance']={159},
+['NeedShow']=true,
+['NoPay']=true,
+['RuleKey']='',
+['ExpiredActivities']=0,
+},
 [144]={
 ['Id']=144,
 ['Type']=12,

Assets/Lua/Config/ActivitiesTaskCfg.lua

@@ -8614,6 +8614,146 @@ local ActivitiesTaskCfg = {
     ['GoPageId']=117,
     ['ShowState']=1,
     ['Integral']=0,
+    },
+        [20140]={
+    ['TaskId']=20140,
+    ['TaskCondition']={{60,5}},
+    ['Reward']={{110,10},{2,200000},{54,300},{520,1}},
+    ['Title']='活動期間累計儲值4.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20141]={
+    ['TaskId']=20141,
+    ['TaskCondition']={{60,20}},
+    ['Reward']={{110,15},{2,200000},{54,500},{520,1}},
+    ['Title']='活動期間累計儲值19.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20142]={
+    ['TaskId']=20142,
+    ['TaskCondition']={{60,50}},
+    ['Reward']={{110,25},{2,800000},{54,1000},{520,1},{11202,1}},
+    ['Title']='活動期間累計儲值49.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20143]={
+    ['TaskId']=20143,
+    ['TaskCondition']={{60,100}},
+    ['Reward']={{110,35},{2,500000},{54,1000},{520,2},{846,1}},
+    ['Title']='活動期間累計儲值99.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20144]={
+    ['TaskId']=20144,
+    ['TaskCondition']={{60,150}},
+    ['Reward']={{110,25},{2,800000},{54,500},{520,2},{846,1},{12146,1}},
+    ['Title']='活動期間累計儲值149.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20145]={
+    ['TaskId']=20145,
+    ['TaskCondition']={{60,200}},
+    ['Reward']={{110,25},{2,500000},{54,500},{520,2},{846,1},{12161,1}},
+    ['Title']='活動期間累計儲值199.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20146]={
+    ['TaskId']=20146,
+    ['TaskCondition']={{60,300}},
+    ['Reward']={{110,35},{2,800000},{54,1000},{520,4},{846,1},{12172,1}},
+    ['Title']='活動期間累計儲值299.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20147]={
+    ['TaskId']=20147,
+    ['TaskCondition']={{60,400}},
+    ['Reward']={{110,35},{2,800000},{54,1000},{520,4},{846,1},{12163,1}},
+    ['Title']='活動期間累計儲值399.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20148]={
+    ['TaskId']=20148,
+    ['TaskCondition']={{60,500}},
+    ['Reward']={{110,35},{2,800000},{54,1000},{520,4},{846,1},{12196,1}},
+    ['Title']='活動期間累計儲值499.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20149]={
+    ['TaskId']=20149,
+    ['TaskCondition']={{60,600}},
+    ['Reward']={{110,35},{2,800000},{54,1000},{520,4},{846,1},{12145,1}},
+    ['Title']='活動期間累計儲值599.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20150]={
+    ['TaskId']=20150,
+    ['TaskCondition']={{60,700}},
+    ['Reward']={{110,35},{2,800000},{54,1000},{520,5},{846,1},{12159,1}},
+    ['Title']='活動期間累計儲值699.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20151]={
+    ['TaskId']=20151,
+    ['TaskCondition']={{60,800}},
+    ['Reward']={{110,35},{2,800000},{54,1000},{520,5},{846,1},{12192,1}},
+    ['Title']='活動期間累計儲值799.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20152]={
+    ['TaskId']=20152,
+    ['TaskCondition']={{60,900}},
+    ['Reward']={{110,35},{2,800000},{54,1000},{520,5},{846,1},{12197,1}},
+    ['Title']='活動期間累計儲值899.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20153]={
+    ['TaskId']=20153,
+    ['TaskCondition']={{60,1000}},
+    ['Reward']={{110,35},{2,800000},{54,1000},{520,5},{846,1},{12198,1}},
+    ['Title']='活動期間累計儲值999.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
     },
     }
     return ActivitiesTaskCfg

Assets/Lua/Core/LuaMain.lua

@@ -137,6 +137,7 @@ function LuaMain:Update()
         if SDKMgr.Instance:CheckHasModul(SDKModulType.EXIT_VIEW) then
             SDKMgr.Instance:OpenModul(SDKModulType.EXIT_VIEW)
         end
+        --ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UISimpleWeb, "https://www.baidu.com", nil, nil, nil, Enum.UISibling[Enum.UIType.Top] - 2)
     end
 end
 

Assets/Lua/Enum/ProtoMsgId.lua

@@ -710,6 +710,8 @@
 	SC_MAP_LEVEL_TYPE_CHANGE_ACK	 = 1753,		--	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
 	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ = 6057,		--	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
 	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK = 6058,		--	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
+	CS_MD5_GET_REQ     				= 1754,   -- CSMd5GetReq **CSMd5GetReq **login.proto ** [CSMd5GetReq]
+	SC_MD5_GET_ACK     				= 1755,   -- SCMd5GetAck **SCMd5GetAck **login.proto ** [SCMd5GetAck]
 
     }
     return ProtoMsgId

Assets/Lua/Logic/UserData.lua

@@ -2272,6 +2272,7 @@ function UserData:SyncRoleDataToSDK()
     if self.serverStartTime then
         gameRoleInfo.openServerTime = self.serverStartTime / 1000
     end
+    ManagerContainer.OpenPayMgr:SetOpenData(gameRoleInfo.openId,gameRoleInfo.roleName , gameRoleInfo.roleLv, gameRoleInfo.serverName)
     return gameRoleInfo
 end
 

Assets/Lua/Managers/LoginMgr.lua

@@ -510,6 +510,7 @@ function LoginMgr:CheckServerSuccess()
         return
     end
     if self.checkWWW.error and self.checkWWW.error ~= '' then
+        LogError("[wboy] CheckServer error = " .. tostring(self.checkWWW.error))
         self:CheckServerFail()
         return
     end

Assets/Lua/Managers/ManagerContainer.lua

@@ -52,6 +52,7 @@ end
 function ManagerContainer:Update()
     self.FSMMgr:Update()
     self.LuaTimerMgr:Update()
+    self.OpenPayMgr:Update()
 end
 
 function ManagerContainer:Reset()

Assets/Lua/Managers/OpenPayMgr.lua

@@ -1,13 +1,22 @@
 local OpenPayMgr = class('OpenPayMgr')
 function OpenPayMgr:ctor()
-    self.openID = ""
-    self.productCode = ""
+    self.openID = "1oijtI"
+    self.productCode = "62071860216202428267772989490827"
+    --62071860216202428267772989490827
+    self.openKey = "f7jMJSjCOYRX2kx7UQ4Ox5zZdAowUSe9"
     self.userId = ""
     self.roleName = ""
     self.serverName = ""
     self.roleLevel = 0
     self.sign = ""
+    self.baseUrl = "http://mia.hkhappygame.com/open/getPayUrl"
     LogError("---------OpenPayMgr --------------")
+
+    self.getPayUrlWWW = nil
+    self.CurPayUrl = nil
+    self.postData = ""
+
+    self:RegisterNetEvents()
 end
 
 function OpenPayMgr:Clear()
@@ -22,55 +31,166 @@ function OpenPayMgr:Destroy()
     self:UnRegisterNetEvents()
 end
 
+function OpenPayMgr:SetOpenData(userId,roleName,roleLevel,serverName)
+    self.userId = userId
+    self.roleName = roleName
+    self.serverName = serverName
+    self.roleLevel = roleLevel
+    self.platform = ManagerContainer.LuaGameMgr.platform
+    --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)
 function OpenPayMgr:RegisterNetEvents()
-
+    ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_MD5_GET_ACK, self.OnGetMD5InfoAck, self)
 end
 
 function OpenPayMgr:UnRegisterNetEvents()
+    ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_MD5_GET_ACK)
+end
+
 
+function OpenPayMgr:Update()
+    if self.getPayUrlWWW ~= nil and self.getPayUrlWWW.isDone then
+        if self.getPayUrlWWW.error and self.getPayUrlWWW.error ~= '' then
+            LogError("获取支付页面失败！！！！")
+        else   
+            LogError(self.getPayUrlWWW.text)
+            local ok, result = RO_XPCALL(JSON.decode, debug.traceback, JSON, self.getPayUrlWWW.text)
+            LogError("result = "..Inspect(result))
+            if ok and result.status then
+                
+                self.CurPayUrl ="http://" ..result.data.payUrl
+                LogError("PayUrl = [[[["..self.CurPayUrl.."]]]]")
+                ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UISimpleWeb,  self.CurPayUrl, nil, nil, nil, Enum.UISibling[Enum.UIType.Top] - 2)
+            else             
+                LogError("获取支付页面失败！！！！")               
+            end
+          
+        end
+
+        self.getPayUrlWWW:Dispose()
+        self.getPayUrlWWW = nil
+    end
 end
 
+function OpenPayMgr:Pay(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
+    local goodsNameNew = amount.."_商品"
+       local goodsIdNew = ""
+    if self.platform == "SDKHwQuick" or  self.platform  == "PC" then
+        goodsIdNew = "product_"..amount.."_ro"
+    else
+        goodsIdNew = "intention"..amount      
+    end 
+
+
+ 
+    local exstr = "{\"platform\"="..self.platform.."}"
+    local url,params = self:GetOpenPayUrl(goodsIdNew, goodsNameNew, goodsDesc, count, amount, cpOrderId, cbUrl, exstr)
+
+    local sortParams= {}
+
+    for kv in pairs(params) do
+        if kv ~= nil then
+            table.insert(sortParams,kv)
+        end
+    end
+
+    table.sort(sortParams,function (a,b)
+        return a < b
+    end)
+    local paaramsStr = ""
+    for _, k in pairs(sortParams) do
+        --LogError("["..k.."] = "..params[k])
+        paaramsStr = paaramsStr..k.."="..params[k].."&"
+    end
+    paaramsStr= paaramsStr.. self.openKey
+    --LogError("url = "..url)
+    LogError("paaramsStr =     "..paaramsStr)
+    self.postData = url
+    ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_MD5_GET_REQ, {md5 = paaramsStr})
+end
+
+
 function OpenPayMgr:GetOpenPayUrl(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
-    local url = "http://xxx.com/open/getPayUrl?"
+
+    local params= {}
+    local url ="" --"https://mia.hkhappygame.com/open/getPayUrl?"
     -- openId string 必传 开放平台开发者身份id，由QuickSDK分配
     url = url .. "openId=" .. self.openID
+    params['openId'] = self.openID
     -- productCode string 必传 产品CODE，在QuickSDK后台获取
     url = url .. "&productCode=" .. self.productCode
+    params['productCode'] = self.productCode
     -- userId  string 必传 SDK用户的账号ID
     url = url .. "&userId=" .. self.userId
+    params['userId'] = self.userId
     -- goodsId string 必传 游戏商品id
     url = url .. "&goodsId=" .. goodsId
+    params['goodsId'] = goodsId
     -- cpOrderNostring 选传游戏订单号
     url = url .. "&cpOrderNostring=" .. cpOrderId
+    params['cpOrderNostring'] = cpOrderId
     -- orderSubject string 必传 订单标题
     url = url .. "&orderSubject=" .. goodsDesc
+    params['orderSubject'] = goodsDesc
     -- roleName string必传 用户角色名
     url = url .. "&roleName=" .. self.roleName
+    params['roleName'] = self.roleName
     -- serverName string必传游戏服务器名
     url = url .. "&serverName=" .. self.serverName
+    params['serverName'] = self.serverName
     -- goodsName string必传 商品名称
     url = url .. "&goodsName=" .. goodsName
+    params['goodsName'] = goodsName
     -- roleLevel int 必传 用户角色等级
     url = url .. "&roleLevel=" .. self.roleLevel
+    params['roleLevel'] = self.roleLevel
     -- extrasParams string必传 订单保留参数，原样返回给cp
     url = url .. "&extrasParams=" .. extrasParams
+    params['extrasParams'] = extrasParams
     -- callbackUrl string 选传订单回调地址,就是通知cp服务器发货的通知地址 
     url = url .. "&callbackUrl=" .. cbUrl
+    params['callbackUrl'] = cbUrl
     -- payTypestring 选传 支付方式ID，ID获取请参照SDK后台“平台管理”>“支付对照表”。支持多种支付方式，多个支付方式以“|”隔开，比如：12|13|23注意：支付方式ID需满足后台勾选已经支持的第三方支付方式，否则无法显示指定支付方式渠道
 
-    -- countryCode string 选传国家代码，如CHN。获取请参照SDK后台“平台管理”>“地区管理”注意：国家代码需满足后台勾选已经支持的第三方支付方式，否则无法显示指定国家的支付
-
-    -- clientLang string 必传支付中心语言包，填写地区语言代码，如en-US。默认为中文繁体
+    -- countryCode string 选传 国家代码，如CHN。获取请参照SDK后台“平台管理”>“地区管理”注意：国家代码需满足后台勾选已经支持的第三方支付方式，否则无法显示指定国家的支付
 
+    -- clientLang string 必传 支付中心语言包，填写地区语言代码，如en-US。默认为中文繁体
+    url = url .. "&clientLang=" .. "zh-cn"--"en-US"
+    params['clientLang'] = "zh-cn"--"en-US"
     -- payVersion int 选传 第三方支付版本，默认不填写为SDK常规版本。取固定值为：2. 表示平台单独处理版本，此版本平台需传金额和币种进行支付并且SDK不参与商品金额的转换由平台自身处理，平台根据自身情况酌情考虑使用。
 
     -- amount float 选传 订单金额。如果payVersion的值为2，则必传amount字段
     url = url .. "&amount=" .. amount
+    params['amount'] = amount
     -- currency string 选传 选传 订单支付的币种代码。如果payVersion的值为2，则必传currency字段注意：支付币种代码必须为SDK后台货币管理里面所支持的货币代码
 
     -- sign string 必传 签名串，算法详见第三章签名算法描述
-    url = url .. "&sign=" .. self.sign
-    return url
+    url = url .. "&sign="
+    return url,params
+end
+
+
+function OpenPayMgr:OnGetMD5InfoAck(data)
+    if ManagerContainer.NetManager:IsErrorData(data) then
+        return
+    end
+
+    if data.md5 then
+        self.postData= self.postData..data.md5
+    else
+        return     
+    end
+    LogError("md5 = "..data.md5)
+
+    if self.getPayUrlWWW then
+        self.getPayUrlWWW:Dispose()
+        self.getPayUrlWWW = nil
+    end
+
+    LogError("Url = [[["..self.baseUrl.."]]]")
+    LogError("postData = [[["..self.postData.."]]]")
+    self.getPayUrlWWW = UnityEngine.WWW(self.baseUrl,self.postData)
 end
 
 return OpenPayMgr

Assets/Lua/Managers/PayMgr.lua

@@ -119,7 +119,16 @@ function PayMgr:OnGetPayInfoAck(data)
     self:StartWaiting(3)
     self:SdkPayResult(false)
     -- 启动支付SDK
-    
+
+    -- local strArr = string.split(data.goods_name,",")
+
+    -- local strArrCount = #strArr
+    -- local cbUrl = data.goods_name
+    -- if strArrCount  >= 2 then 
+    --     cbUrl = strArr[1]
+    -- end
+
+    --ManagerContainer.OpenPayMgr:Pay(data.goods_id, data.goods_name, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), data.goods_name,"ex")
     ManagerContainer.LuaGameMgr:SdkPay(data.goods_id, data.goods_name, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), nil)
 end
 

Assets/Lua/Pb/login.txt

@@ -1,5 +1,5 @@
 
-ŠÑ
+âÑ
 login.protoserverproto
 user.proto"0
 
@@ -2665,4 +2665,9 @@ reward_idx 
(R	rewardIdx"
 &CSCrossYuanHangTrialBuyChallengeNumReq"T
 &SCCrossYuanHangTrialBuyChallengeNumAck
 error
 
(Rerror
-count 
(Rcountbproto3
+count 
(Rcount"
+CSMd5GetReq
+md5
 
(	Rmd5"5
+SCMd5GetAck
+error
 
(Rerror
+md5 
(	Rmd5bproto3

Assets/Lua/Pb/protocal.txt

@@ -1,7 +1,7 @@
 
-¬�
+¬Ž
 protocal.protoserverprotocommon.protoerror_code.protologin.proto
-user.proto"Íå

+user.proto"�æ

 Request7
 CS_PING_REQè 
(2.serverproto.CSPingReqR	CSPINGREQ:
 CS_LOGIN_REQê 
(2.serverproto.CSLoginReqR
@@ -367,7 +367,8 @@ $CS_RUNE_SPECIAL_PRIVILEGE_REWARD_REQ
 CS_BT_FIRST_RECHARGE_REWARD_REQÓ
 
(2'.serverproto.CSBTFirstRechargeRewardReqRCSBTFIRSTRECHARGEREWARDREQf
 CS_BT_RECHARGE100_REWARD_REQÖ
 
(2%.serverproto.CSBTRecharge100RewardReqRCSBTRECHARGE100REWARDREQd
 CS_MAP_LEVEL_TYPE_CHANGE_REQØ
 
(2$.serverproto.CSMapLevelTypeChangeReqRCSMAPLEVELTYPECHANGEREQ”

-.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ©/ 
(23.serverproto.CSCrossYuanHangTrialBuyChallengeNumReqR&CSCROSSYUANHANGTRIALBUYCHALLENGENUMREQ"ù¦
+.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ©/ 
(23.serverproto.CSCrossYuanHangTrialBuyChallengeNumReqR&CSCROSSYUANHANGTRIALBUYCHALLENGENUMREQ>
+CS_MD5_GET_REQÚ
 
(2.serverproto.CSMd5GetReqRCSMD5GETREQ"¹§
 Response7
 SC_PING_ACKé 
(2.serverproto.SCPingAckR	SCPINGACK:
 SC_LOGIN_ACKë 
(2.serverproto.SCLoginAckR
@@ -845,4 +846,5 @@ $SC_RUNE_SPECIAL_PRIVILEGE_REWARD_ACK
 SC_BT_RECHARGE100_NTFÕ
 
(2.serverproto.SCBTRecharge100NtfRSCBTRECHARGE100NTFf
 SC_BT_RECHARGE100_REWARD_ACK×
 
(2%.serverproto.SCBTRecharge100RewardAckRSCBTRECHARGE100REWARDACKd
 SC_MAP_LEVEL_TYPE_CHANGE_ACKÙ
 
(2$.serverproto.SCMapLevelTypeChangeAckRSCMAPLEVELTYPECHANGEACK”

-.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACKª/ 
(23.serverproto.SCCrossYuanHangTrialBuyChallengeNumAckR&SCCROSSYUANHANGTRIALBUYCHALLENGENUMACKbproto3
+.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACKª/ 
(23.serverproto.SCCrossYuanHangTrialBuyChallengeNumAckR&SCCROSSYUANHANGTRIALBUYCHALLENGENUMACK>
+SC_MD5_GET_ACKÛ
 
(2.serverproto.SCMd5GetAckRSCMD5GETACKbproto3

Assets/Lua/UI/UIWeb/UISimpleWebView.lua

@@ -73,7 +73,7 @@ function UISimpleWebView:Init()
 	if not resolution then
 		resolution = 1
 	end
-
+	self.webBtns:SetActive(true)
 	self.webView:SetActive(false)
 	local wentingCanvasWebVewPrefab = self.webView.wentingCanvasWebVewPrefab
 	if wentingCanvasWebVewPrefab.WebView then
@@ -102,6 +102,9 @@ end
 
 function UISimpleWebView:AddUIEventListener()
 	self.uiBase:AddButtonUniqueEventListener(self.btnClose.button, self, self.OnClickCloseBtn)
+	self.uiBase:AddButtonUniqueEventListener(self.goBackBtn.button, self, self.OnGoBackBtnClick)
+	self.uiBase:AddButtonUniqueEventListener(self.goForwardBtn.button, self, self.OnGoForwardBtnClick)
+	self.uiBase:AddButtonUniqueEventListener(self.reloadBtn.button, self, self.OnReloadBtnClick)
 end
 
 function UISimpleWebView:OnHide()
@@ -142,5 +145,17 @@ function UISimpleWebView:OnWebProgress()
 	end
 end
 
+
+function UISimpleWebView:OnGoBackBtnClick()
+	self.webView.wentingCanvasWebVewPrefab.WebView:GoBack()
+end
+
+function UISimpleWebView:OnGoForwardBtnClick()
+	self.webView.wentingCanvasWebVewPrefab.WebView:GoForward()
+end
+
+function UISimpleWebView:OnReloadBtnClick()
+	self.webView.wentingCanvasWebVewPrefab.WebView:Reload()
+end
 return UISimpleWebView
 

Assets/Lua/UI/UIWeb/UISimpleWebView_Generate.lua

@@ -1,3 +1,15 @@
+---@class UISimpleWeb__Generate_reloadBtn
+---@field public gameObject UnityEngine.GameObject
+---@field public button UnityEngine.UI.Button
+
+---@class UISimpleWeb__Generate_goForwardBtn
+---@field public gameObject UnityEngine.GameObject
+---@field public button UnityEngine.UI.Button
+
+---@class UISimpleWeb__Generate_goBackBtn
+---@field public gameObject UnityEngine.GameObject
+---@field public button UnityEngine.UI.Button
+
 ---@class UISimpleWeb__Generate_btnClose
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
@@ -16,6 +28,10 @@
 ---@field private AnyBtn UISimpleWeb__Generate_AnyBtn
 ---@field private webView UISimpleWeb__Generate_webView
 ---@field private btnClose UISimpleWeb__Generate_btnClose
+---@field private webBtns UnityEngine.GameObject
+---@field private goBackBtn UISimpleWeb__Generate_goBackBtn
+---@field private goForwardBtn UISimpleWeb__Generate_goForwardBtn
+---@field private reloadBtn UISimpleWeb__Generate_reloadBtn
 local UISimpleWebView = class("UISimpleWebView", require("UIViewBase"))
 
 function UISimpleWebView:ctor()
@@ -39,6 +55,10 @@ function UISimpleWebView:InitGenerate(Root, data)
 	self:InitGenerate__2(Root,data)
 	self:InitGenerate__3(Root,data)
 	self:InitGenerate__4(Root,data)
+	self:InitGenerate__5(Root,data)
+	self:InitGenerate__6(Root,data)
+	self:InitGenerate__7(Root,data)
+	self:InitGenerate__8(Root,data)
 
 
 end
@@ -92,6 +112,60 @@ function UISimpleWebView:InitGenerate__4(Root, data)
 	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
 end
 
+---@private
+function UISimpleWebView:InitGenerate__5(Root, data)
+--[[
+	Window/WebBtns
+--]]
+	local tmp = Root:Find("Window/WebBtns").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.webBtns = tmp
+end
+
+---@private
+function UISimpleWebView:InitGenerate__6(Root, data)
+--[[
+	Window/WebBtns/GoBackBtn
+--]]
+	local tmp = Root:Find("Window/WebBtns/GoBackBtn").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.goBackBtn = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
+---@private
+function UISimpleWebView:InitGenerate__7(Root, data)
+--[[
+	Window/WebBtns/GoForwardBtn
+--]]
+	local tmp = Root:Find("Window/WebBtns/GoForwardBtn").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.goForwardBtn = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
+---@private
+function UISimpleWebView:InitGenerate__8(Root, data)
+--[[
+	Window/WebBtns/ReloadBtn
+--]]
+	local tmp = Root:Find("Window/WebBtns/ReloadBtn").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.reloadBtn = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
 ---@private
 function UISimpleWebView:GenerateDestroy()
 	if tolua.getpeer(self.AnyBtn) ~= nil then
@@ -106,6 +180,22 @@ function UISimpleWebView:GenerateDestroy()
 		tolua.setpeer(self.btnClose, nil)
 	end
 	self.btnClose = nil
+	if tolua.getpeer(self.webBtns) ~= nil then
+		tolua.setpeer(self.webBtns, nil)
+	end
+	self.webBtns = nil
+	if tolua.getpeer(self.goBackBtn) ~= nil then
+		tolua.setpeer(self.goBackBtn, nil)
+	end
+	self.goBackBtn = nil
+	if tolua.getpeer(self.goForwardBtn) ~= nil then
+		tolua.setpeer(self.goForwardBtn, nil)
+	end
+	self.goForwardBtn = nil
+	if tolua.getpeer(self.reloadBtn) ~= nil then
+		tolua.setpeer(self.reloadBtn, nil)
+	end
+	self.reloadBtn = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

Assets/Plugins/SDK/Base/SDKBase.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -144,7 +144,7 @@ public abstract class SDKBase
     public virtual bool EnvReviewName(string name) { return true; }
     public virtual bool EnvReviewLan(string level, string channel, string lan) { return true; }
 
-    public virtual void OpenWebview(string url) { }
+    public virtual void OpenWebview(string url) { Application.OpenURL(url); }
 
 	public virtual void OpenGM()
 	{

ProtocolGen/proto/ProtoMsgId.lua

@@ -710,6 +710,8 @@
 	SC_MAP_LEVEL_TYPE_CHANGE_ACK	 = 1753,		--	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
 	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ = 6057,		--	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
 	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK = 6058,		--	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
+	CS_MD5_GET_REQ     				= 1754,   -- CSMd5GetReq **CSMd5GetReq **login.proto ** [CSMd5GetReq]
+	SC_MD5_GET_ACK     				= 1755,   -- SCMd5GetAck **SCMd5GetAck **login.proto ** [SCMd5GetAck]
 
     }
     return ProtoMsgId

ProtocolGen/proto/login.proto

@@ -3758,4 +3758,13 @@ message CSCrossYuanHangTrialBuyChallengeNumReq {  //project game   //RouteRule g
 message SCCrossYuanHangTrialBuyChallengeNumAck {
     int32 error                                     = 1; //错误码
     uint64 count                            = 2;//可购买次数
+}
+
+message CSMd5GetReq{
+    string      md5         = 1;
+}
+
+message SCMd5GetAck{
+    int32       error                   = 1; //错误码，OK表示重连成功
+    string   md5 =2;
 }

ProtocolGen/proto/messagedefclient.proto

@@ -713,5 +713,6 @@ enum protoMsgId{
 	SC_MAP_LEVEL_TYPE_CHANGE_ACK	 = 1753;		//	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
 	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ = 6057;		//	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
 	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK = 6058;		//	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
-
+	CS_MD5_GET_REQ     				= 1754;   // CSMd5GetReq **CSMd5GetReq **login.proto ** [CSMd5GetReq]
+	SC_MD5_GET_ACK     				= 1755;   // SCMd5GetAck **SCMd5GetAck **login.proto ** [SCMd5GetAck]
 }

ProtocolGen/proto/protocal.proto

@@ -316,6 +316,7 @@ message Request {
      CSBTRecharge100RewardReq         	CS_BT_RECHARGE100_REWARD_REQ         =  1750;         //	CSBTRecharge100RewardReq **CSBTRecharge100RewardReq **login.proto **game [CSBTRecharge100RewardReq]
      CSMapLevelTypeChangeReq         	CS_MAP_LEVEL_TYPE_CHANGE_REQ         =  1752;         //	CSMapLevelTypeChangeReq **CSMapLevelTypeChangeReq **login.proto **game [CSMapLevelTypeChangeReq]
      CSCrossYuanHangTrialBuyChallengeNumReq         	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ     =  6057;         //	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
+     CSMd5GetReq         	CS_MD5_GET_REQ     				    =  1754;         // CSMd5GetReq **CSMd5GetReq **login.proto ** [CSMd5GetReq]
 }
 message Response {
      SCPingAck           	SC_PING_ACK                          =  1001;         //	SCPingAck **SCPingAck **login.proto ** [SCPingAck]
@@ -720,4 +721,5 @@ message Response {
      SCBTRecharge100RewardAck           	SC_BT_RECHARGE100_REWARD_ACK         =  1751;         //	SCBTRecharge100RewardAck **SCBTRecharge100RewardAck **login.proto ** [SCBTRecharge100RewardAck]
      SCMapLevelTypeChangeAck           	SC_MAP_LEVEL_TYPE_CHANGE_ACK	     =  1753;         //	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
      SCCrossYuanHangTrialBuyChallengeNumAck           	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK     =  6058;         //	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
+     SCMd5GetAck           	SC_MD5_GET_ACK     				    =  1755;         // SCMd5GetAck **SCMd5GetAck **login.proto ** [SCMd5GetAck]
 }