Commit Graph

136 Commits (17882656fef193834323f85a801ba6c5adb5d8df)

Author SHA1 Message Date
zhangqiang 3f2029a681 旗开得胜 提交 2020-11-25 21:02:16 +08:00
jiaoyangna 1299b62feb 灵兽宝阁位置名称修改 2020-11-19 17:22:10 +08:00
jiaoyangna d8f31bab35 主题活动修改提交 2020-11-19 14:26:57 +08:00
jiaoyangna e09872eb7f 限时招募修改提交 2020-11-19 10:35:21 +08:00
jiaoyangna 3e7c24c029 【主题活动】降龙伏虎 2020-11-18 18:15:50 +08:00
ZhangBiao 69d818118c 【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复 2020-11-17 10:56:21 +08:00
ZhangBiao f384e25ad6 【灵兽宝阁】今日召唤上限次数不对修改
(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
(cherry picked from commit bef1181f19)
2020-11-16 17:51:25 +08:00
ZhangBiao 4a0a702fec 【灵兽宝阁】凤凰无限飞bug缓解 2020-11-13 18:58:35 +08:00
ZhangBiao 46eeceb79d 【主题活动】bug修复 2020-11-13 18:00:56 +08:00
ZhangBiao ee04d93830 【灵兽宝阁】增加结束时间 2020-11-13 17:07:32 +08:00
ZhangBiao 933f2d4768 【灵兽宝阁】增加假战斗 2020-11-13 16:25:42 +08:00
ZhangBiao e4f48eb668 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 16:10:34 +08:00
ZhangBiao d739896793 【灵兽宝阁】倒计时显示刷新问题修复 2020-11-13 16:10:26 +08:00
jiaoyangna d4f79a0abb 限时招募提交 2020-11-13 15:50:42 +08:00
jiaoyangna 44a1d94860 神医天降修改 2020-11-13 15:47:04 +08:00
ZhangBiao 8a5d51e2a3 【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
2020-11-13 12:12:44 +08:00
ZhangBiao 2563c6bdd6 【灵兽宝阁】货币显示修复 2020-11-12 18:17:56 +08:00
ZhangBiao 5f596eef04 【灵兽宝阁】bug修复,增加等级限制 2020-11-12 17:53:49 +08:00
ZhangBiao 2c143deea9 Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-11-12 17:21:42 +08:00
ZhangBiao a5c36cf58a 【灵兽宝阁】未开启更换灵兽版本 2020-11-12 17:11:18 +08:00
jiaoyangna 7fc14ec822 [主题活动] 修改提交 2020-11-12 16:07:19 +08:00
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
jiaoyangna 45c088e6b7 [灵兽特惠] 提交 2020-11-12 11:37:12 +08:00
jiaoyangna a6483b3181 [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
ZhangBiao 1ba753044f 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
ZhangBiao ebe03eff48 【易经宝库】漏题 2020-11-10 16:43:24 +08:00
ZhangBiao ec9458aac7 【易经宝库】抽取灵兽报错修复 2020-11-10 16:25:42 +08:00
ZhangBiao d493246f2f 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
ZhangBiao 46b8e52524 【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
2020-11-09 16:02:34 +08:00
ZhangBiao dca4f2511a Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-09 15:29:42 +08:00
ZhangBiao e6eb5d7673 【易经宝库】格子点击位置不准确修复 曾加tips 2020-11-09 15:28:24 +08:00
DESKTOP-98AVA47\Administrator 4be2045801 添加容错 --by 焦杨钠 2020-11-13 07:12:51 +08:00
ZhangBiao c4745e8c7c 【易经宝库】最终奖励选择bug修复 2020-11-09 13:47:37 +08:00
ZhangBiao 9ca403ebff 【易经宝库】第三层抽取完成后bug修复 2020-11-09 11:09:42 +08:00
jiaoyangna 6cb1610d31 神医天降修改 2020-11-07 16:56:53 +08:00
jiaoyangna 04fac7f216 魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗 2020-11-07 15:39:01 +08:00
jiaoyangna 0a772f466b 皮肤提交 2020-11-06 20:36:38 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +08:00
zhangqiang ac64980843 【易经宝库】 特效层级调整 2020-11-06 16:49:12 +08:00
ZhangBiao 5e130a7585 Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 16:17:12 +08:00
ZhangBiao 36759d8044 【易经宝库】增加稿子动效 2020-11-06 16:06:08 +08:00
ZhangBiao b98490f233 【易经宝库】差一个稿子的动效 2020-11-06 15:11:19 +08:00
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00
jiaoyangna e8be02de87 [移山倒海] 提交 2020-11-06 10:49:08 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
ZhangBiao 476057bd1c 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00
ZhangBiao 809c6daa01 【易经宝库】数据调试 2020-11-04 10:53:02 +08:00
ZhangBiao 5d40b102dc 【易经宝库】添加type 拼数据 2020-11-03 19:01:47 +08:00
ZhangBiao f79499faea 【易经宝库】开始获取活动数据 2020-11-03 09:58:37 +08:00
ZhangBiao 8640018b87 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00