wangzhenxing
|
574d95b607
|
[限时祈愿活动]======修改bug提交
|
2021-05-29 15:35:52 +08:00 |
wangzhenxing
|
53cbc08d48
|
[限时祈愿]=============抽卡修改
|
2021-05-28 16:54:40 +08:00 |
ZhangBiao
|
ea4662a447
|
【福星高照】bug修复
|
2021-05-28 16:20:14 +08:00 |
wangzhenxing
|
510b2460ea
|
[限时祈愿] 活动奖励界面提交
|
2021-05-28 15:09:18 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
ZhangBiao
|
4b54176492
|
【协议提交】
|
2021-05-27 20:08:32 +08:00 |
zhangqiang
|
aca4aa47ac
|
【音效修改】
|
2021-05-26 19:40:03 +08:00 |
jiaoyangna
|
4ced80cf6a
|
福星高照,牛气冲天 提交
|
2021-05-24 11:08:16 +08:00 |
gaoxin
|
a856603686
|
【降妖夺宝】修复图片加载器错误
|
2021-05-19 15:24:14 +08:00 |
gaoxin
|
989361e574
|
Merge branch 'china/ios' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
|
2021-05-19 15:15:13 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
jiaoyangna
|
deeaa0221d
|
每日礼包界面内,点击妖晶快捷获取按钮,再点击商店,商店内点击妖晶快捷获取,退出时会重复显示界面的bug;
|
2021-05-18 21:04:58 +08:00 |
jiaoyangna
|
83697a9de4
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-18 20:53:23 +08:00 |
gaoxin
|
2b693b417e
|
【跳转】活动跳转添加开启判断
|
2021-05-18 15:50:17 +08:00 |
zhangqiang
|
433bcf9ddb
|
【添加音效】
|
2021-05-18 14:24:09 +08:00 |
gaoxin
|
8ed3371932
|
【限时召唤】修复左上角奖励领取报错
|
2021-05-18 11:42:47 +08:00 |
jiaoyangna
|
896a52a6a1
|
乾坤宝盒弹窗提交
|
2021-05-14 19:06:12 +08:00 |
jiaoyangna
|
c62a293740
|
结束修改
|
2021-05-14 16:02:14 +08:00 |
jiaoyangna
|
3905116205
|
活动结束 修改提交
(cherry picked from commit 5018ba2d9b )
|
2021-05-14 13:14:12 +08:00 |
jiaoyangna
|
d08e051590
|
神医天降任务重叠修改
|
2021-05-13 21:01:35 +08:00 |
jiaoyangna
|
22eeef86f3
|
灵兽特惠修改提交
|
2021-05-13 19:46:50 +08:00 |
jiaoyangna
|
3b72644446
|
乾坤宝盒提交
|
2021-05-13 18:28:51 +08:00 |
jiaoyangna
|
b7dbc1919a
|
乾坤宝盒预设修改
|
2021-05-13 18:17:41 +08:00 |
jiaoyangna
|
de6d728dd4
|
乾坤宝盒描述修改
|
2021-05-13 18:04:35 +08:00 |
jiaoyangna
|
efdd57a103
|
修改描述
|
2021-05-13 18:00:35 +08:00 |
jiaoyangna
|
20b5ded8e9
|
修改add 为addOnce
(cherry picked from commit 14b1420d14 )
|
2021-05-12 17:42:51 +08:00 |
jiaoyangna
|
5817146b6f
|
主题活动修改提交
(cherry picked from commit 0b5177748b )
|
2021-05-12 17:41:19 +08:00 |
jiaoyangna
|
06fb7e218f
|
主题活动提交
(cherry picked from commit 847adfc761 )
|
2021-05-12 17:39:46 +08:00 |
jiaoyangna
|
5eed825a7c
|
活动主界面修改提交
(cherry picked from commit 3fffdd9cd3 )
|
2021-05-12 17:38:12 +08:00 |
jiaoyangna
|
3c04e8dbe1
|
[主题活动修改提交]
(cherry picked from commit f88ccd8f68 )
|
2021-05-12 17:37:59 +08:00 |
gaoxin
|
b7b3f610ed
|
【翻译文字导出】
|
2021-05-11 17:03:09 +08:00 |
ZhangBiao
|
e167fbbc1b
|
【灵兽宝阁】概率公示描述优化
|
2021-05-11 13:50:42 +08:00 |
ZhangBiao
|
7ec3ae01f6
|
【升级限量礼包】无剩余礼包逻辑缺失修复
|
2021-05-11 10:08:09 +08:00 |
ZhangBiao
|
40bc700f65
|
【累充】周刷新的累充,页签会显示每日累充
|
2021-05-08 12:01:18 +08:00 |
jiaoyangna
|
fb51497d38
|
主题活动提交
|
2021-05-07 18:05:09 +08:00 |
jiaoyangna
|
25cfb730b6
|
灵兽特惠提交
|
2021-05-07 17:49:23 +08:00 |
jiaoyangna
|
dd862760cd
|
图片修改提交
|
2021-05-07 17:00:54 +08:00 |
jiaoyangna
|
c6a5a7ce01
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-05-07 11:02:14 +08:00 |
jiaoyangna
|
ff8b9b57cc
|
限时up 提交
|
2021-05-07 11:01:33 +08:00 |
ZhangBiao
|
04e3fec068
|
【灵兽宝阁】有免费抽的时候不显示倒计时
|
2021-05-07 10:55:04 +08:00 |
jiaoyangna
|
885c8bc53c
|
限时兑换在两个活动里出现修改
|
2021-05-06 18:22:15 +08:00 |
ZhangBiao
|
95b4b8197a
|
【特权商城】特效消失修改
|
2021-04-28 05:10:00 +08:00 |
zhangqiang
|
52e6cdd917
|
【累计充值红点】主题活动中累计充值的红点会显示在限时活动入口
|
2021-04-27 23:04:58 +08:00 |
zhangqiang
|
8db10cf7eb
|
【神衣天降】购买次数显示修改
|
2021-04-27 21:09:29 +08:00 |
gaoxin
|
7cbec8230a
|
【跳转】跳转充值,点返回没反应,再点直接返回主城
|
2021-04-27 15:45:49 +08:00 |
zhangqiang
|
460ec366cb
|
【礼包】去掉LevelLinit 字段判断
|
2021-04-26 20:27:29 +08:00 |
ZhangBiao
|
2770e6da31
|
Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-04-26 17:18:02 +08:00 |
gaoxin
|
9874f5b42a
|
【新人商城】法宝直升25级提示添加
|
2021-04-25 19:26:58 +08:00 |
ZhangBiao
|
bd236f0f32
|
【踏碎凌霄】
|
2021-04-23 14:12:24 +08:00 |