Commit Graph

122 Commits (4622263234e333d91b7ce8470cb4aa56a45f8acc)

Author SHA1 Message Date
gaoxin d4f57caa96 【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题 2020-11-03 14:20:10 +08:00
gaoxin fa9f029266 【好友切磋】修复战斗结果显示错误的问题 2020-11-02 19:16:03 +08:00
zhangqiang 4f25b8cc98 【灵兽系统】 修改bug 2020-10-30 17:48:49 +08:00
zhangqiang c22b0d34d5 【灵兽系统】 红点刷新 2020-10-29 16:58:00 +08:00
zhangqiang a20217223a 【灵兽系统】 添加碎片合成红点 2020-10-27 17:02:37 +08:00
ZhangBiao 7b4f959687 Merge branch '0活动开发聚集地/社稷大典' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2020-10-24 16:47:45 +08:00
ZhangBiao c768775e06 【社稷大典】加完红点完事了 2020-10-24 16:18:57 +08:00
zhangqiang 7a4cd7ba8f 零售品升级升星红点 2020-10-24 14:15:35 +08:00
jiaoyangna 911c4b9f54 xieyi commit 2020-11-05 04:11:09 +08:00
jiaoyangna 7931e3ed1c Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
2020-10-22 11:12:17 +08:00
gaoxin 8aa4abdbeb 【逍遥游】云游值自动恢复修改 2020-10-20 00:23:42 +08:00
gaoxin 7ea442ff5d Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
2020-10-19 23:52:22 +08:00
gaoxin 27eaa02a88 修复部分奖励不刷新的问题 2020-10-19 23:51:15 +08:00
yuanshuai 92af021625 倒计时云游值回复问题修改 2020-10-19 23:49:21 +08:00
yuanshuai 7e0f32ec1f 逍遥游bug修改 2020-10-19 23:24:07 +08:00
gaoxin ba87f5c181 【逍遥游】功能入口随功能开启添加 2020-10-19 22:56:05 +08:00
yuanshuai 4316c30bf2 逍遥游红点和帮助弹窗提交 2020-10-19 20:29:49 +08:00
yuanshuai 95ed2ba352 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 18:19:22 +08:00
yuanshuai fdf1fe5724 逍遥游脚本修改 2020-10-19 18:19:05 +08:00
gaoxin 0e19f21805 【自动恢复物品】物品恢复机制改为前端计算 2020-10-19 16:48:42 +08:00
gaoxin 539be2d810 【自动恢复物品】物品恢复机制改为前端计算 2020-10-19 16:46:24 +08:00
yuanshuai 911bacc56c 逍遙游預設脚本提交 2020-10-19 16:00:48 +08:00
yuanshuai 773fb4085e Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 14:38:56 +08:00
yuanshuai d844a36917 逍遥游脚本提交 2020-10-19 14:38:44 +08:00
jiaoyangna 01f5227c72 xiaoyao commit 2020-10-19 13:50:23 +08:00
yuanshuai 964abba2a0 逍遥游脚本预设提交 2020-10-19 11:53:47 +08:00
zhangqiang 7d2016c812 加跳转 2020-10-16 17:13:14 +08:00
jiaoyangna ea4166a6e3 神州令跳转修改 2020-10-15 21:49:04 +08:00
jiaoyangna 1184cd3f76 【跳转】碧海卷使用按钮跳转位置不正确 2020-10-12 11:01:17 +08:00
zhangqiang d2f9ffd2db 线上活动 森罗幻境达人前端显示 2020-10-10 14:51:50 +08:00
jiaoyangna 5c9fcf1c44 跳转限时兑换修改 2020-10-02 18:41:55 +08:00
jiaoyangna 4389beca87 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-23 16:56:53 +08:00
jiaoyangna 2269c50897 【活动需求】百宝商会,免费礼包红点 2020-09-23 16:56:06 +08:00
zhangqiang 121901c06e 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表 2020-09-23 15:49:48 +08:00
zhangqiang 5f8b1027ee 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-23 14:51:33 +08:00
zhangqiang d700e0da1c 打开充值每日礼包 和 成长礼包 红点检测 2020-09-17 14:16:04 +08:00
zhangqiang 29ee4bf51e 注释公会副本刷新 修改音效 2020-09-14 18:19:26 +08:00
zhangqiang c985f4d874 跳转公会 2020-09-14 14:50:18 +08:00
ZhangBiao f56be71560 主题活动修改 2020-09-08 17:16:08 +08:00
jiaoyangna 5a861862d5 商店添加动画 2020-09-04 16:54:58 +08:00
ZhangBiao 04b18aa4ad 竞技场有免费次数 时提示红点 2020-09-03 14:42:31 +08:00
ZhangBiao c3b0f590d2 好友增加一键领取红点 2020-09-03 10:50:25 +08:00
gaoxin 541d4277c7 部分界面屏幕适配修改 2020-09-02 16:11:53 +08:00
jiaoyangna 5b68ae2cb9 tujian commit 2020-09-12 14:12:26 +08:00
zhangqiang aabef68ccb 气泡提交 2020-09-01 11:50:24 +08:00
ZhangBiao e74c120d01 大闹天宫重置红点、无尽副本界面红点 2020-09-01 11:25:38 +08:00
zhangqiang a6fa4453e6 需求主城或关卡停留过长添加聊天气泡 2020-08-31 20:52:50 +08:00
ZhangBiao 40266d1120 删除一些log、修复升级豪礼红点bug 2020-08-31 16:32:27 +08:00
jiaoyangna 2bf39b8a9c 副本红点提交 2020-08-31 15:01:20 +08:00
jiaoyangna 366343b72b 副本红点修改提交 2020-08-31 13:58:47 +08:00