Commit Graph

97 Commits (e7698bd4e1663f80690febf93695448763e670bd)

Author SHA1 Message Date
zhangqiang 21f8a21aec 灵兽提交 2020-10-26 14:25:35 +08:00
zhangqiang 6767828cdc Merge branch 'master_develop' into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/Spine/ls_06_baize.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.atlas.txt.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.png.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.skel.bytes.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.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/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-10-23 14:38:50 +08:00
zhangqiang 0270d54e10 灵兽提交 2020-10-22 12:41:44 +08:00
ZhangBiao e063c2c23d 推送礼包。。。。 2020-10-13 18:39:55 +08:00
JieLing 5db40d2743 监听事件未移除正确 2020-10-12 20:48:15 +08:00
ZhangBiao 62f185c859 森罗回春散使用bug修改 2020-10-12 15:13:37 +08:00
ZhangBiao 69fee1514f 森罗回春散使用 问题修复 2020-10-12 14:43:44 +08:00
jiaoyangna 33209fa0c9 青龙秘宝修改 2020-10-15 14:00:21 +08:00
jiaoyangna 349316e2d7 时间销毁 2020-09-28 05:01:06 +08:00
jiaoyangna aa4e005be9 【青龙秘宝显示优化】修改进入青龙秘宝时自动滑动的位置 2020-09-24 20:15:25 +08:00
zhangqiang 48cae7ec43 二次弹窗关闭音效 2020-09-15 16:52:12 +08:00
jiaoyangna f2015e8c98 日常任务修改 2020-09-10 15:36:17 +08:00
ZhangBiao e3e95e2379 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
jiaoyangna d58a656bed 动画错乱修改 2020-09-01 00:36:34 +08:00
jiaoyangna f059b4aea6 时间修改 2020-09-01 00:11:14 +08:00
jiaoyangna 11cb6221f5 时间修改 2020-09-24 15:32:44 +08:00
jiaoyangna 34cc05a87d 青龙秘宝周任务修改, 2020-10-02 22:09:01 +08:00
jiaoyangna 5f5f6cb50a 【青龙秘宝】达到最大等级还可以购买等级【青龙秘宝】周任务刷新后倒计时负数【青龙秘宝】活动结束入口不消失 2020-09-14 05:01:10 +08:00
jiaoyangna 2e1515daa4 青龙秘宝入口修改 2020-09-22 11:58:49 +08:00
jiaoyangna e5bccae20b 【成就】点击任务,没有自动选择有红点的页签 2020-08-31 17:10:33 +08:00
jiaoyangna ed758d3a37 五星拍脸 2020-08-31 16:50:15 +08:00
jiaoyangna 0ab3d69773 青龙秘宝试炼排序提交 2020-09-07 16:09:29 +08:00
jiaoyangna 4069c41f74 日常副本添加咸鱼积分奖励 2020-09-07 15:50:46 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
jiaoyangna cb69e474b9 qinglong task redpoint commit 2020-08-27 14:53:27 +08:00
jiaoyangna 9bc710ce58 qinglong commit 2020-10-01 00:05:54 +08:00
jiaoyangna 1b5c0e361a qinglong commit 2020-08-26 23:14:51 +08:00
jiaoyangna 1cc497b2fd qinglong commit 2020-08-26 20:30:52 +08:00
jiaoyangna f28c176f18 add activity status 2020-08-26 20:17:37 +08:00
jiaoyangna 3c6a636d0d qinglong commit 2020-08-26 20:04:36 +08:00
jiaoyangna c2ec9c93f8 【秘宝试炼】周试炼刷新后时间显示负,青龙秘宝结束不关闭 2020-08-26 20:04:02 +08:00
jiaoyangna f62a007edb qinglong commit 2020-08-26 18:29:27 +08:00
jiaoyangna 4fd97151a5 qinglong commit 2020-08-26 17:13:27 +08:00
jiaoyangna 265f0f8781 qinglong commit 2020-08-26 17:08:04 +08:00
jiaoyangna 24b4852ea7 qinglong commit 2020-08-26 16:32:12 +08:00
jiaoyangna e1a2a7cd52 qinglong commit 2020-08-26 16:15:52 +08:00
jiaoyangna 22fa2b0d4c qinglong commit 2020-08-26 15:57:06 +08:00
jiaoyangna 66fb6f04d4 box update 2020-08-26 15:23:20 +08:00
jiaoyangna 1d3e961196 qinglong commit 2020-08-26 15:04:41 +08:00
jiaoyangna 7f9c8122c4 跳转修改提交 2020-08-26 14:51:10 +08:00
jiaoyangna a52ea7f6b7 qinglong commit 2020-08-26 14:04:26 +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
jiaoyangna 62a0d2f41a 帮助位置修改 2020-08-25 11:52:27 +08:00
jiaoyangna 8d69d04d09 添加帮助 2020-08-25 11:37:48 +08:00
jiaoyangna 8fb4e8cf13 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:22:05 +08:00
jiaoyangna 9ad0593572 qinglong redpoint commit 2020-08-25 11:21:42 +08:00
ZhangBiao 1382118441 成就点击进入是青龙 问题修复 2020-08-24 21:09:36 +08:00
jiaoyangna ccb38eb3a7 qinglong commit 2020-08-24 20:10:52 +08:00