Jelajahi Sumber

Merge branch 'hy_dny_rgres' of ssh://192.168.0.8:29418/xianjing into hy_dny_16

gdl_123 1 bulan lalu
induk
melakukan
af2ce21819

+ 6 - 0
Assets/Editor/AssetBundle/Hy_Dny-Android.asset

@@ -29,6 +29,12 @@ MonoBehaviour:
     IsIgnore: 1
     IsIgnore: 1
   - Field: uiprefab
   - Field: uiprefab
     IsIgnore: 1
     IsIgnore: 1
+  - Field: _cn
+    IsIgnore: 1
+  - Field: _vi
+    IsIgnore: 1
+  - Field: _th
+    IsIgnore: 1
   Rg_Essential_Infos:
   Rg_Essential_Infos:
   - Field: payselect_uiprefab
   - Field: payselect_uiprefab
     IsIgnore: 0
     IsIgnore: 0

+ 1 - 1
Assets/Lua/UI/UIMain/UIMainView.lua

@@ -674,7 +674,7 @@ end
 
 
 function UIMainView:OnClickRuneShopBtn()
 function UIMainView:OnClickRuneShopBtn()
 	local curUIId = ManagerContainer.LuaUIMgr:GetCurUIId()
 	local curUIId = ManagerContainer.LuaUIMgr:GetCurUIId()
-	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopBT, nil, curUIId)
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopBT, {Enum.RuneShopType.LimitTime}, curUIId)
 end
 end
 
 
 function UIMainView:OnClickWalletShopBtn()
 function UIMainView:OnClickWalletShopBtn()