123 1 vuosi sitten
vanhempi
sitoutus
d3df078553

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 58 - 12
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


+ 7 - 7
Assets/Content/Prefabs/UI/UIWeb/UISimpleWeb.prefab

@@ -214,8 +214,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 150, y: 0}
-  m_SizeDelta: {x: 120, y: 50}
+  m_AnchoredPosition: {x: 100, y: 0}
+  m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6452976773612557152
 CanvasRenderer:
@@ -238,7 +238,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -588,7 +588,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -80}
+  m_AnchoredPosition: {x: -162.5, y: -80}
   m_SizeDelta: {x: 480, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6643747990065555268
@@ -735,7 +735,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 120, y: 50}
+  m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1803689273520979817
 CanvasRenderer:
@@ -758,7 +758,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1097,7 +1097,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

BIN
Assets/Content/Raw_Art/UI/UILanuch/img_logo_01.png


+ 5 - 5
Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 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/',
-	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
+	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',
 }
 
 return PlatformPack

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

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

+ 42 - 0
Assets/Lua/Managers/OpenPayMgr.lua

@@ -8,6 +8,9 @@ function OpenPayMgr:ctor()
     self.roleLevel = 0
     self.sign = ""
     LogError("---------OpenPayMgr --------------")
+
+    self.getPayUrlWWW = nil
+    self.CurPayUrl = nil
 end
 
 function OpenPayMgr:Clear()
@@ -22,6 +25,14 @@ 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
+    --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()
 
 end
@@ -30,6 +41,37 @@ function OpenPayMgr:UnRegisterNetEvents()
 
 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)
+            if ok and result.status then
+             
+                self.CurPayUrl = result.data
+                ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UISimpleWeb,  self.CurPayUrl, nil, nil, nil, Enum.UISibling[Enum.UIType.Top] - 2)
+            end
+          
+        end
+
+        self.getPayUrlWWW:Dispose()
+        self.getPayUrlWWW = nil
+    end
+end
+
+function OpenPayMgr:Pay(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
+    local url = self:GetOpenPayUrl(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
+    if self.getPayUrlWWW then
+        self.getPayUrlWWW:Dispose()
+        self.getPayUrlWWW = nil
+    end
+    self.getPayUrlWWW = UnityEngine.WWW(url)
+end
+
+
 function OpenPayMgr:GetOpenPayUrl(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
     local url = "http://xxx.com/open/getPayUrl?"
     -- openId string 必传 开放平台开发者身份id,由QuickSDK分配

+ 4 - 4
ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: WentingTec
-  productName: "\u521D\u5FC3\u8005\u5927\u5192\u96AA"
+  productName: "\u5FC3\u529B\u7269\u8BED"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1.0
+  bundleVersion: 1.0.0.6
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -846,10 +846,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU
+    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
+    iPhone: USE_LUA;VUPLEX_CCU
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä