Commit Graph

156 Commits (81b3ca1ddc86ee6ffe3456ccdf43344bf8e4b17f)

Author SHA1 Message Date
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
JieLing 03cdc9cf55 Merge branch 'master_xma_test' into gx/test_new
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
2021-01-05 14:23:00 +08:00
ZhangBiao 3280394186 【抽卡优化】连续十连或单抽也有确认提示
(cherry picked from commit becdc2dd88)
(cherry picked from commit 47378d9c50b36d9576a88dccb66016f2ca10127b)
2020-12-31 10:49:39 +08:00
JieLing af7e202ea9 【优化】部分界面动画效果优化 2020-12-30 19:51:14 +08:00
JieLing e8ea367a6e 【优化】scrollview setData不是回到顶部时不再播放动画 2020-12-30 16:45:52 +08:00
JieLing fca9bfccfc 【优化】修复周月礼包不显示在最上面 2020-12-30 15:04:30 +08:00
gaoxin 9f691e4e05 【优化】scrollview分帧加载-游戏内适应性修改 2020-12-29 20:37:57 +08:00
jiaoyangna d5d30fd6a8 刷新礼包修改 2020-12-26 11:47:16 +08:00
guowei df79f56b72 【优化五星成长礼包、心魔试炼礼包】 2020-12-24 13:52:28 +08:00
zhangqiang 899903104f 【特权礼包】加等级显示前端
【公会副本】 加前端五点刷新不能扫荡
2020-11-19 19:30:46 +08:00
zhangqiang 8531323faa 推送礼包剔除过期的礼包 2020-11-16 17:30:38 +08:00
jiaoyangna 384750e0e9 [限时折扣] 修改 2020-11-13 16:35:25 +08:00
JieLing 43a370f5a8 报错提交 2020-10-26 10:56:46 +08:00
jiaoyangna 68af385814 冲突提交 2020-10-29 10:29:14 +08:00
jiaoyangna 6d79dcab9a 活动修改提交 2020-10-29 09:50:47 +08:00
jiaoyangna 43702ee6ca 累计充值修改 2020-10-24 19:25:52 +08:00
jiaoyangna 8db39458ca [累计充值修改提交] 2020-10-24 19:25:08 +08:00
jiaoyangna 0901d837be 限时召唤修改提交 2020-10-24 19:23:16 +08:00
ZhangBiao a2a870f421 【社稷大典】提交4 2020-10-24 18:41:21 +08:00
ZhangBiao 958234c826 【推送礼包】推送最新礼包的拍脸 2020-10-20 14:58:50 +08:00
JieLing 8afa0c96a8 签到修改 2020-09-28 15:43:39 +08:00
JieLing 0fdac5e7d3 成长基金领取报错修改,签到报错修改,天赋提示文字 2020-09-28 15:41:17 +08:00
JieLing ee65632939 成长基金修改 2020-09-28 15:35:28 +08:00
liujiaqi 783c61eed8 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
gaoxin 701db5bb17 充值接口修改,sdk和本地走同一套接口 2020-09-09 20:13:23 +08:00
zhangqiang 7ecb24676f 代码漏提 2020-09-07 14:24:13 +08:00
zhangqiang 6b55198f12 周月礼包替图 2020-09-04 18:35:30 +08:00
gaoxin ad2ec00881 成长基金的显隐加入礼包是否存在的判断 2020-08-28 15:29:57 +08:00
gaoxin a7fea145f6 修复日周月礼包不显示的问题 2020-08-27 21:40:01 +08:00
gaoxin 82606d8fbe 每日周月礼包根据后端数据判断显隐 2020-08-27 18:35:32 +08:00
ZhangBiao 42b0ffe95d 月基金价格修改 2020-08-26 18:29:02 +08:00
gaoxin b0222ccd61 艺术字体替换,美元显示优化 2020-08-26 12:26:19 +08:00
gaoxin b175890bc3 累充活动金额处理 2020-08-26 11:11:14 +08:00
JieLing fcc9a5eb2a 修复打开限时活动界面报错的问题 2020-08-25 21:55:13 +08:00
JieLing b1774c3853 累充界面金额转换为美元显示 2020-08-25 21:21:34 +08:00
ZhangBiao d37af43f37 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:35:19 +08:00
ZhangBiao 617cb53270 森罗回春散星星、升级礼包调整 2020-08-25 18:35:04 +08:00
JieLing 5a89f52577 充值商品价格改为按配置显示 2020-08-25 17:59:34 +08:00
jiaoyangna d1ab290cf7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua
2020-08-25 16:26:13 +08:00
jiaoyangna 87cc8867c7 宝物 commit 2020-08-25 16:23:41 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
ZhangBiao e3b872d31a 元-》$ 2020-08-25 14:37:28 +08:00
ZhangBiao 6f6758bf14 元—>$的替换 2020-08-25 13:57:21 +08:00
JieLing c14f7c4526 美元资源替换,艺术字体添加, 2020-08-24 23:58:33 +08:00
gaoxin e806410e8a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-24 15:25:23 +08:00
ZhangBiao 939fa0227a 无尽入口例会、化虚进入修复、剪影仙踪 2020-08-24 15:20:00 +08:00