ybx_Gdn 11 miesięcy temu
rodzic
commit
950e2da05b

+ 2 - 8
Assets/Editor/AssetBundle/hy_Test.asset

@@ -19,15 +19,9 @@ MonoBehaviour:
   OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/2"
   VersionFileName: Version
   mainfestFileName: mainfest
-  ResVersion: 0.2.1.84
+  ResVersion: 0.2.1.88
   IgnoreFiles:
   - font.unity3d
-  - monster_texture.unity3d
-  - hero_cloth_texture.unity3d
-  - fashion_headtop_texture.unity3d
-  - fashion_cloth_texture.unity3d
-  - fashion_bodyback_texture.unity3d
-  - uilanuch_uiprefab.unity3d
   ChangeNum: 0
-  IsIgnore: 1
+  IsIgnore: 0
   Language: 1

+ 2 - 2
Assets/Lua/Config/RuneShopLimitCfg.lua

@@ -4288,7 +4288,7 @@ local RuneShopLimitCfg = {
     ['Id']=550,
     ['Name']='仙侠时装超值禮包',
     ['Banner']='ShopIcons/xianxiaLB1',
-     ['BuyReward']={{30100,1},{498,50},{494,300},{137,3},{404,30},{405,30},{406,30}},
+     ['BuyReward']={{30100,1},{15120,5}},
     ['RMB']=49.99,
     ['RedPoint']=1,
     ['SortId']=1137,
@@ -4297,7 +4297,7 @@ local RuneShopLimitCfg = {
     ['Id']=551,
     ['Name']='占星师超值禮包',
     ['Banner']='ShopIcons/zhanxinshiLB1',
-    ['BuyReward']={{30101,1},{498,50},{494,300},{137,3},{404,30},{405,30},{406,30}},
+    ['BuyReward']={{30101,1},{15120,5}},
     ['RMB']=49.99,
     ['RedPoint']=1,
     ['SortId']=1137,

+ 8 - 0
Assets/Lua/Managers/PayMgr.lua

@@ -129,6 +129,14 @@ function PayMgr:OnGetPayInfoAck(data)
         cbUrl = strArr[1]
         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
+
     --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"
     if payType >=1  then