Commit Graph

6486 Commits (2246cd5260064ba76c7b265d9e1d8d5c096a599e)
 

Author SHA1 Message Date
jiaoyangna 2246cd5260 物名称标识调整 2021-05-28 19:18:43 +08:00
jiaoyangna 876322a315 【限时兑换】人物名称标识调整 2021-05-28 19:16:43 +08:00
jiaoyangna c0f4310d19 百宝 2021-05-28 19:03:31 +08:00
jiaoyangna e60c32cab1 百宝商会修改提交 2021-05-28 18:58:15 +08:00
jiaoyangna f6d701fc6a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 18:53:57 +08:00
jiaoyangna fb8db45fda 百宝商会修改提交 2021-05-28 18:53:54 +08:00
zhangqiang cb7a727901 【踏碎凌霄】排行榜 2021-05-28 18:26:01 +08:00
zhangqiang 46a7f519fb 【探索统计】复现步骤挂机满12小时不领,激活月卡立即前往,返回充值页面再返回主城 2021-05-28 17:40:42 +08:00
ZhangBiao 6df1668bc6 【八日登陆】第八日图片替换 2021-05-28 17:25:08 +08:00
wangzhenxing 53cbc08d48 [限时祈愿]=============抽卡修改 2021-05-28 16:54:40 +08:00
jiaoyangna e63200f4a2 预设修改提交 2021-05-28 16:26:12 +08:00
jiaoyangna 9e6c8248df Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:22:15 +08:00
jiaoyangna 9be6ae227a 小游戏 修改提交 2021-05-28 16:22:04 +08:00
ZhangBiao aaf98b4cf0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:20:26 +08:00
ZhangBiao ea4662a447 【福星高照】bug修复 2021-05-28 16:20:14 +08:00
jiaoyangna 60903eb982 活动修改提交 2021-05-28 16:19:20 +08:00
jiaoyangna cc081e68d9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:10:54 +08:00
jiaoyangna 68d39a1d5e 森罗修改提交 2021-05-28 16:10:44 +08:00
gaoxin 74d2dcfcbf Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:03:12 +08:00
gaoxin 9c0de19fd0 【注释】接口描述优化 2021-05-28 16:02:47 +08:00
jiaoyangna d165c87724 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
2021-05-28 16:01:35 +08:00
jiaoyangna 7a104f9ff7 【主题活动累充】累充图标白篇且奖励间距不对 2021-05-28 16:01:03 +08:00
zhangqiang 78ece97bfd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:54:30 +08:00
zhangqiang 1dc1ad1db1 【幸运探宝】加标签 2021-05-28 15:54:20 +08:00
gaoxin afdbb49aca Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:53:45 +08:00
gaoxin 05c3f30a7f 【资源】主界面活动按钮优化 2021-05-28 15:53:40 +08:00
ZhangBiao a7f4b320d7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:35:11 +08:00
ZhangBiao 3c67b0b8f3 【主城】icon问题调整 2021-05-28 15:35:02 +08:00
gaoxin 9e06f1994d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:20:35 +08:00
gaoxin 51d04d5526 【每日豪礼】修复红点不消失的问题 2021-05-28 15:20:22 +08:00
ZhangBiao 5bd86d81fe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:12:07 +08:00
ZhangBiao 4af21bc33d 【幸运探宝】进度条奖励包装显示修改 2021-05-28 15:11:57 +08:00
wangzhenxing 2526371970 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:09:29 +08:00
wangzhenxing 510b2460ea [限时祈愿] 活动奖励界面提交 2021-05-28 15:09:18 +08:00
jiaoyangna d69164dd42 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:02:50 +08:00
jiaoyangna 33909a2f91 【旗开得胜】社稷赏商店购买限购商品到达上限后,页面不限时已售空,需要切换页签。 2021-05-28 15:02:17 +08:00
zhangqiang 9a4f1a64b2 【漏提】 2021-05-28 15:01:18 +08:00
jiaoyangna edd52b5eaa 【无尽副本】体力刷新倒计时结束后,页面计时显示不重置,退出重进显示正常 2021-05-28 14:45:42 +08:00
jiaoyangna 86e49bb7c0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 14:43:31 +08:00
jiaoyangna 1c7046260b 无尽新手引导 2021-05-28 14:43:27 +08:00
gaoxin 1e36398a50 【内存优化】Util.Loadsprite 替换为 spLoader 2021-05-28 14:41:58 +08:00
gaoxin 9cce82f017 【SpriteLoader】修改初始化位置,兼容老包 2021-05-28 14:34:01 +08:00
gaoxin e0b0140609 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 14:32:49 +08:00
gaoxin 41fbecb79a 【优化】修复界面销毁后计时器报错 2021-05-28 14:32:42 +08:00
zhangqiang 63671cacbb 【修改图片加载方式 】 增加踏碎凌霄称号预设 没特效 2021-05-28 14:18:41 +08:00
zhangqiang 8dbf142b74 【踏碎凌霄】排行榜添加 2021-05-28 14:05:17 +08:00
zhangqiang ffed262485 【bug】 2021-05-28 13:48:43 +08:00
gaoxin fe996d3e54 【战斗】修复不满屏显示的问题 2021-05-28 13:36:36 +08:00
gaoxin d66ee3980d 【战斗】删除上部边框 2021-05-28 13:35:02 +08:00
gaoxin f1b5b0a97f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 13:31:11 +08:00