11

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//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',
 }
 
 return PlatformPack

Assets/Lua/Managers/OpenPayMgr.lua

@@ -74,9 +74,18 @@ function OpenPayMgr:Update()
 end
 
 function OpenPayMgr:Pay(goodsId, goodsName, goodsDesc, count, amount, cpOrderId, cbUrl, extrasParams)
-    local goodsNameNew = amount.."-商品"
+    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(goodsId, goodsNameNew, goodsDesc, count, amount, cpOrderId, cbUrl, exstr)
+    local url,params = self:GetOpenPayUrl(goodsIdNew, goodsNameNew, goodsDesc, count, amount, cpOrderId, cbUrl, exstr)
 
     local sortParams= {}
 

Assets/Lua/Managers/PayMgr.lua

@@ -119,8 +119,17 @@ function PayMgr:OnGetPayInfoAck(data)
     self:StartWaiting(3)
     self:SdkPayResult(false)
     -- 启动支付SDK
-    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)
+
+    -- 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
 
 function PayMgr:OnPayCompleteNtf(data)

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: WentingTec
-  productName: "\u5FC3\u529B\u7269\u8BED"
+  productName: "\u521D\u5FC3\u8005\u5927\u5192\u96AA"
   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: 1.0.0.6
+  bundleVersion: 0.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -846,10 +846,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;GAME_DEBUG
+    Android: USE_LUA;VUPLEX_CCU
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU
+    iPhone: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1

UserSettings/Layouts/default-2021.dwlt

@@ -17,7 +17,7 @@ MonoBehaviour:
     x: 28
     y: 40
     width: 546
-    height: 887
+    height: 963
   m_ShowMode: 0
   m_Title: Game
   m_RootView: {fileID: 4}
@@ -66,9 +66,9 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 546
-    height: 887
-  m_MinSize: {x: 200, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
+    height: 963
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -93,7 +93,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 546
-    height: 887
+    height: 963
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
@@ -193,7 +193,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 88
+  controlID: 62
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -213,12 +213,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 858
+    width: 1093
     height: 853
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 89
+  controlID: 43
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -238,12 +238,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 858
+    width: 1093
     height: 442
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 68
+  controlID: 44
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -261,7 +261,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 353
+    width: 449
     height: 442
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
@@ -285,12 +285,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 353
+    x: 449
     y: 0
-    width: 505
+    width: 644
     height: 442
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -314,10 +314,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 442
-    width: 858
+    width: 1093
     height: 411
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 19}
@@ -339,9 +339,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 858
+    x: 1093
     y: 0
-    width: 446
+    width: 211
     height: 853
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
@@ -442,7 +442,7 @@ MonoBehaviour:
     x: 28
     y: 40
     width: 546
-    height: 866
+    height: 942
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -491,22 +491,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 546
-      height: 845
-    m_Scale: {x: 0.4401042, y: 0.44010416}
-    m_Translation: {x: 273, y: 422.5}
+      height: 921
+    m_Scale: {x: 0.47968754, y: 0.4796875}
+    m_Translation: {x: 273, y: 460.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -620.3077
+      x: -569.1205
       y: -960
-      width: 1240.6154
+      width: 1138.241
       height: 1920
     m_MinimalGUI: 1
-  m_defaultScale: 0.44010416
-  m_LastWindowPixelSize: {x: 546, y: 866}
+  m_defaultScale: 0.4796875
+  m_LastWindowPixelSize: {x: 546, y: 942}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000101000000000000
@@ -535,7 +535,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 599
     y: 129
-    width: 352
+    width: 448
     height: 421
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -547,7 +547,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 1249ffff6249ffffa64cffffb44cffffa6a3fffff8a3ffffaaa7ffffb8a7ffffe4faffff
+      m_ExpandedIDs: 741de9ffc41de9ff7621e9ff8421e9ffd67be9ff267ce9ffd87fe9ffe67fe9ffa41efaff861ffaff901ffaff9829faffac29faffd82bfaffe02cfaffe42cfaffea2cfafffe2cfaff022dfaff1c2dfaff2a2dfaff3a2dfaff7e67ffffd067ffff846bffff926bffffe4fafffff4ffffff86870800
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -592,9 +592,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 952
+    x: 1048
     y: 129
-    width: 503
+    width: 642
     height: 421
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -967,7 +967,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 599
     y: 571
-    width: 857
+    width: 1092
     height: 390
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -985,23 +985,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/StreamingAssets
+    - Assets/Editor/AssetBundle
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/StreamingAssets
+  - Assets/Editor/AssetBundle
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\Project\Unity\bt_client_2022_S
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 62}
-    m_SelectedIDs: 36610000
-    m_LastClickedID: 24886
-    m_ExpandedIDs: 00000000f25e0000f45e0000f65e0000f85e0000fa5e0000fc5e0000fe5e0000005f0000025f0000045f0000065f0000085f00000a5f0000
+    scrollPos: {x: 0, y: 74}
+    m_SelectedIDs: 7cfb0900
+    m_LastClickedID: 654204
+    m_ExpandedIDs: 00000000c25e0000c45e0000c65e0000c85e0000ca5e0000cc5e0000ce5e0000d05e0000d25e0000d45e0000d65e0000d85e00005084080000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1029,7 +1029,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000f25e0000f45e0000f65e0000f85e0000fa5e0000fc5e0000fe5e0000005f0000025f0000045f0000065f0000085f00000a5f0000
+    m_ExpandedIDs: 00000000c05e0000c25e0000c45e0000c65e0000c85e0000ca5e0000cc5e0000ce5e0000d05e0000d25e0000d45e0000d65e0000d85e0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1108,7 +1108,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 599
     y: 571
-    width: 857
+    width: 1092
     height: 390
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -1136,9 +1136,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1457
+    x: 1692
     y: 129
-    width: 445
+    width: 210
     height: 832
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas: