Commit Graph

6613 Commits (5c778aad2224df6289594ff77016c1f28df7f83f)
 

Author SHA1 Message Date
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
gaoxin 593a8cb398 【山河社稷图】猪八戒普攻后半身像显示不全 2021-05-28 13:31:06 +08:00
wangzhenxing fb9ced58fb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 12:37:06 +08:00
wangzhenxing 347341ca02 [福利]红包修改提交 2021-05-28 12:36:39 +08:00
jiaoyangna b78b006009 神将情报界面修改提交 2021-05-28 12:30:47 +08:00
jiaoyangna 8e1d427e2a 属性修改提交 2021-05-28 11:43:14 +08:00
jiaoyangna f76005afb7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 11:29:31 +08:00
jiaoyangna 81761b26af 无尽修改提交 2021-05-28 11:29:27 +08:00
gaoxin 36240be7e9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 11:23:37 +08:00
gaoxin c76af7fe0b 【左上角图标UI】六星玉帝图标没有置顶 2021-05-28 11:23:10 +08:00
wangzhenxing 2a21b80147 [限时祈愿]弹窗界面id修改 2021-05-28 11:05:50 +08:00
wangzhenxing 560089c1f5 [限时祈愿活动] 预设 协议提交 2021-05-28 10:58:20 +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
jiaoyangna 5c3c32be15 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 10:35:13 +08:00
jiaoyangna d9773587a5 修改提交 2021-05-28 10:35:01 +08:00
ZhangBiao 6adde33bf8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 10:34:00 +08:00
ZhangBiao 458ab29053 【清除Log】清楚部分Log 2021-05-28 10:33:53 +08:00
zhangqiang fe6b69bfe6 【bug】提交 2021-05-28 10:32:42 +08:00
jiaoyangna 4b33fee287 红点修改提交 2021-05-28 10:20:13 +08:00
jiaoyangna f2c557c66e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 09:55:52 +08:00
jiaoyangna 89c667d314 无尽红点修改提交 2021-05-28 09:55:48 +08:00
gaoxin 613434d1fd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 23:33:08 +08:00
gaoxin 33efb7bc2a 【修行】亢龙有悔,东陵圣母大招没有眩晕敌方,没回怒
【修行】亢龙有悔神印,达摩连续追击,连续没眩晕,只第一次回了怒
2021-05-27 23:33:03 +08:00