Commit Graph

3103 Commits (08708c841ceafb1c2c48b1aa2623fc1170e2ba51)
 

Author SHA1 Message Date
jiaoyangna 7a86931564 转盘,招募提交 2020-10-15 16:50:56 +08:00
yuanshuai a052877b1b 逍遥游功能完善 2020-10-15 16:30:51 +08:00
zhangqiang b93d7d0435 提交 2020-10-15 15:43:35 +08:00
ZhangBiao c65c0beeb9 社稷大典 排名奖励提交 2020-10-15 15:35:48 +08:00
yuanshuai faff35373b 预设提交 2020-10-15 14:28:27 +08:00
jiaoyangna f664ef0af5 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
2020-10-15 14:17:36 +08:00
jiaoyangna e12a075e2c bosstij 2020-10-15 14:16:57 +08:00
gaoxin aa72f7dd0d 修复活动刷新会导致引导报错的问题 2020-10-15 13:36:48 +08:00
yuanshuai a9b9d9467f 掷骰子协议修改 2020-10-15 12:04:23 +08:00
yuanshuai a05cb7cc43 协议修改 2020-10-15 11:53:03 +08:00
liujiaqi b205951c26 社稷大典兑换道具图标资源 2020-10-14 20:19:58 +08:00
zhangqiang eaf610e9c2 提交 2020-10-14 19:41:33 +08:00
ZhangBiao 2c708ed98d 限时活动 tabs调整 2020-10-14 17:56:08 +08:00
zhangqiang b37b584d68 提交 2020-10-14 17:10:36 +08:00
wangzhenxing aa82e7f13f Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-14 16:58:43 +09:00
wangzhenxing be7ba4315a 抽卡活动添加灵兽类型 2020-10-14 16:58:28 +09:00
ZhangBiao 74b9f4ec3a Merge branch 'master_develop' into 0活动开发聚集地/社稷大典
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
2020-10-14 14:39:04 +08:00
ZhangBiao f45e820dad Merge branch 'master_develop' into 0活动开发聚集地/社稷大典 2020-10-14 14:03:57 +08:00
ZhangBiao 9265a8883c 无尽副本出图多次请求商店 修复 2020-10-14 11:55:40 +08:00
gaoxin 63e5be4088 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 22:30:12 +08:00
jiaoyangna ea4166a6e3 神州令跳转修改 2020-10-15 21:49:04 +08:00
jiaoyangna 2e574adea8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-15 21:26:23 +08:00
jiaoyangna 5a17813275 森罗幻境 修改 2020-10-15 21:26:19 +08:00
jiaoyangna b4da41b5e5 势不可挡页签修改提交 2020-10-15 20:50:05 +08:00
gaoxin c3198d413d 修复无尽副本过渡期间依然可以进入的问题 2020-10-13 22:30:06 +08:00
jiaoyangna aa4c2a3f9c 势不可挡 提交 2020-10-13 20:36:01 +08:00
wangzhenxing 2f8801a230 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 20:51:21 +09:00
wangzhenxing 65a8e0048a 118被动修改: 额外技能不会触发伤害加成,但是会享受加成收益 2020-10-13 20:50:57 +09:00
zhangqiang c939bab156 提交 2020-10-13 19:14:34 +08:00
ZhangBiao 2e57796328 礼包拍脸时机修复
(cherry picked from commit 3a74abd86633bba9e837e660b94eb56aa49db8bf)
2020-10-13 19:12:24 +08:00
ZhangBiao 745983b30a Merge branch '0活动开发聚集地/推送礼包' of http://60.1.1.230/gaoxin/JL_Client into 0活动开发聚集地/推送礼包 2020-10-13 18:40:05 +08:00
ZhangBiao e063c2c23d 推送礼包。。。。 2020-10-13 18:39:55 +08:00
ZhangBiao 71313c63c2 推送礼包 2020-10-13 18:24:11 +08:00
ZhangBiao 5efebacbbb 推送礼包,恢复被覆盖的部分 2020-10-13 18:20:35 +08:00
ZhangBiao 9ddfb22e3a Merge branch 'master_develop' into 0活动开发聚集地/推送礼包 2020-10-13 17:26:13 +08:00
jiaoyangna 0b344eb1c0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-22 01:39:08 +08:00
jiaoyangna eceb50c114 no message 2020-10-22 01:39:04 +08:00
jiaoyangna 9a980bf88b 主题活动修改 2020-10-21 23:20:41 +08:00
ZhangBiao b359ae2df9 推送礼包 完事儿 2020-10-13 17:21:27 +08:00
jiaoyangna 89c7961154 推送礼包修改 2020-10-22 03:24:22 +08:00
jiaoyangna 598eac1d3a 推送礼包修改 2020-10-22 02:57:40 +08:00
zhangqiang f28501a893 提交 2020-10-13 16:32:50 +08:00
ZhangBiao 677dca14e7 森罗幻境 炸弹使用描述修改
(cherry picked from commit 3b19043f34)
2020-10-13 14:01:05 +08:00
ZhangBiao 3b19043f34 森罗幻境 炸弹使用描述修改 2020-10-13 14:00:41 +08:00
zhangqiang bf2804f080 提交 2020-10-13 13:56:41 +08:00
ZhangBiao c4fac7b58f Revert "关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改"
This reverts commit 63a1588f66.
2020-10-13 13:55:31 +08:00
ZhangBiao 45c9c20dd6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 13:52:41 +08:00
ZhangBiao 63a1588f66 关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改 2020-10-13 13:51:11 +08:00
gaoxin 91173e3f91 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 12:44:20 +08:00
gaoxin a107de4ebe 删除新增的打点事件 2020-10-13 12:44:15 +08:00