root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

森罗回春散星星、升级礼包调整

dev_chengFeng
ZhangBiao 2020-08-25 18:35:04 +08:00
parent e6946944b0
commit 617cb53270
4 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
View File

@ -22368,7 +22368,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 46.8, y: -57}
m_AnchoredPosition: {x: -69, y: -69}
m_SizeDelta: {x: 239.96, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4536685851633023705

2
Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab
View File

@ -43764,7 +43764,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u4EF7\u503C\uFF1A1140\u5143"
m_Text: "\u4EF7\u503C\uFF1A$1140"
LanguageIndex: 11732
--- !u!1 &5974049692653517533
GameObject:

34
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
View File

@ -2909,6 +2909,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 0
resAbNameIndex: 0
- resName: l_yueka_haohuayueka
extension: .png
resPathIndex: 0
resAbNameIndex: 0
- resName: l_yueka_putongyueka
extension: .png
resPathIndex: 0
resAbNameIndex: 0
- resName: q_qinlongmibao_anniu
extension: .png
resPathIndex: 0
@ -3277,6 +3285,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- resName: r_mrcz_zi_33
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- resName: r_mrcz_zi_4
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- resName: r_qrkh_lq
extension: .png
resPathIndex: 1
@ -5205,10 +5221,18 @@ MonoBehaviour:
extension: .png
resPathIndex: 32
resAbNameIndex: 15
- resName: s_shouchong_$1
extension: .png
resPathIndex: 32
resAbNameIndex: 15
- resName: s_shouchong_100
extension: .png
resPathIndex: 32
resAbNameIndex: 15
- resName: s_shouchong_15
extension: .png
resPathIndex: 32
resAbNameIndex: 15
- resName: s_shouchong_6
extension: .png
resPathIndex: 32
@ -15465,6 +15489,10 @@ MonoBehaviour:
extension: .jpg
resPathIndex: 95
resAbNameIndex: 793
- resName: l_yueka_beijin2
extension: .jpg
resPathIndex: 95
resAbNameIndex: 793
- resName: l_yueka_beijindi
extension: .jpg
resPathIndex: 95
@ -34421,6 +34449,10 @@ MonoBehaviour:
extension: .mat
resPathIndex: 251
resAbNameIndex: 1995
- resName: dajin_effect_15_lz 2
extension: .mat
resPathIndex: 251
resAbNameIndex: 1995
- resName: dajin_effect_16
extension: .mat
resPathIndex: 251
@ -49580,7 +49612,6 @@ MonoBehaviour:
- lz4/atlas/publicatlas.unity3d
- lz4/atlas/tagatlas.unity3d
- lz4/atlas/tagbuttonatlas.unity3d
- lz4/bg/artfontbg/l_yueka_beijindi.unity3d
- lz4/bg/artfontbg/r_lianxuchongzhi_beijing.unity3d
- lz4/bg/artfontbg/r_meiriqiandaobeijing.unity3d
- lz4/bg/l_libao_beijin.unity3d
@ -50147,6 +50178,7 @@ MonoBehaviour:
- lz4/publicartres/models.unity3d
- assetBundleName: lz4/publicartres/materials.unity3d
dependences:
- lz4/atlas/firstrechargeatlas.unity3d
- lz4/bg/cardmask.unity3d
- lz4/bg/cardmask2.unity3d
- lz4/publicartres/shaders.unity3d

6
Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
View File

@ -41,9 +41,9 @@ function this.SetBasicValues(giftGoodsList)
local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
LogGreen("------充值活动-----------礼包类型：".. rechargeConfig.Type .." 礼包ID：".. giftGoodsInfo.goodsId .." 已购："
..giftGoodsInfo.buyTimes.." 开始："..giftGoodsInfo.startTime.." 结束："
..giftGoodsInfo.endTime .. " 可购(没卵用)：" .. giftGoodsInfo.dynamicBuyTimes)
-- LogGreen("------充值活动-----------礼包类型：".. rechargeConfig.Type .." 礼包ID：".. giftGoodsInfo.goodsId .." 已购："
-- ..giftGoodsInfo.buyTimes.." 开始："..giftGoodsInfo.startTime.." 结束："
-- ..giftGoodsInfo.endTime .. " 可购(没卵用)：" .. giftGoodsInfo.dynamicBuyTimes)
if giftGoodsInfoList[rechargeConfig.Type] then