jiaoyangna
|
5018ba2d9b
|
活动结束 修改提交
|
2021-05-14 13:13:15 +08:00 |
jiaoyangna
|
14b1420d14
|
修改add 为addOnce
|
2021-05-12 14:38:45 +08:00 |
jiaoyangna
|
0b5177748b
|
主题活动修改提交
|
2021-05-11 14:59:41 +08:00 |
jiaoyangna
|
847adfc761
|
主题活动提交
|
2021-05-10 20:20:20 +08:00 |
jiaoyangna
|
3fffdd9cd3
|
活动主界面修改提交
|
2021-05-10 10:52:44 +08:00 |
jiaoyangna
|
f88ccd8f68
|
[主题活动修改提交]
|
2021-05-10 10:06:53 +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 |
zhangqiang
|
d373b1ff0f
|
【累积充值】金额斜了
|
2021-04-22 16:54:20 +08:00 |
ZhangBiao
|
5eca5dd50e
|
【珍奇宝阁】双倍修改
(cherry picked from commit 0d4bacbe8297a34561275fe0c5720ff38e349769)
|
2021-04-21 18:06:35 +08:00 |
ZhangBiao
|
f1538a4776
|
【限时活动】提交
|
2021-04-21 16:49:34 +08:00 |
ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
ZhangBiao
|
eab420381c
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-21 15:02:04 +08:00 |
ZhangBiao
|
aa834ad136
|
【限时活动】重构完成
|
2021-04-21 15:00:20 +08:00 |
zhangqiang
|
78220a5cf9
|
【珍奇宝阁】修改
|
2021-04-21 14:32:43 +08:00 |
ZhangBiao
|
30361f5393
|
【限时活动】调整提交
|
2021-04-21 11:37:55 +08:00 |
JieLing
|
f30d2f042e
|
【提审切换】开关活动
|
2021-04-17 16:16:03 +08:00 |
zhangqiang
|
1ee7063569
|
【限时招募】 提交
|
2021-04-16 18:13:09 +08:00 |
gaoxin
|
60ccfce6dc
|
【累计充值】第二次销毁时报错
|
2021-04-16 14:23:31 +08:00 |
jiaoyangna
|
444e1e4428
|
限时招募提交
|
2021-04-16 10:08:33 +08:00 |
JieLing
|
52a2ecabd6
|
【活动开启】提审服关闭日周月礼包
|
2021-04-12 10:46:32 +08:00 |
JieLing
|
e8dd8f9bea
|
【活动】未开启的活动页签不再显示
|
2021-04-11 02:14:55 +08:00 |
ZhangBiao
|
8becd11f4d
|
【神衣天降】按钮价格修改
|
2021-04-09 19:39:50 +08:00 |
jiaoyangna
|
acca43f54c
|
菩提树神图片提交
|
2021-04-09 16:20:26 +08:00 |
jiaoyangna
|
66763117a3
|
立绘修改提交
|
2021-04-09 15:22:27 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
jiaoyangna
|
38e64fb774
|
还原文字提交
|
2021-04-09 11:39:09 +08:00 |
gaoxin
|
eab8a42191
|
【灵兽特惠】金钱显示兼容
|
2021-04-08 20:40:00 +08:00 |
gaoxin
|
795657a213
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 17:31:38 +08:00 |
gaoxin
|
680d3e2e7d
|
【金钱显示】修复累计充值第一个商品显示错误
|
2021-04-08 17:31:32 +08:00 |
jiaoyangna
|
32f5e051ad
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 17:03:34 +08:00 |
jiaoyangna
|
7784e3a9d1
|
主题活动提交
(cherry picked from commit d9c500fb36 )
|
2021-04-08 17:03:29 +08:00 |
zhangqiang
|
4b1f021ac0
|
【累计充值】
|
2021-04-08 10:18:24 +08:00 |
zhangqiang
|
894a8bcfd4
|
【问题提交】
|
2021-04-07 19:52:25 +08:00 |
zhangqiang
|
69d3f4a331
|
【bug 主要是翻译】
|
2021-04-07 16:38:26 +08:00 |
jiaoyangna
|
586d7eca06
|
限时召唤提交
|
2021-04-07 11:24:49 +08:00 |
ZhangBiao
|
58d20c0bd3
|
【限时活动】没东西有红点
|
2021-04-07 11:05:26 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |