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

Разница между файлами не показана из-за своего большого размера
+ 926 - 22
Assets/Content/Prefabs/UI/UIWeb/UISimpleWeb.prefab


+ 1 - 0
Assets/Lua/Core/LuaMain.lua

@@ -135,6 +135,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
 

+ 5 - 5
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//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',
+	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

+ 1 - 0
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

+ 16 - 1
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
 

+ 90 - 0
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

Некоторые файлы не были показаны из-за большого количества измененных файлов