Commit Graph

689 Commits (119be29c7d8fb1eb5a020b7ea330d14d4b361d7c)

Author SHA1 Message Date
gaoxin 8c86335070 【资源】三四星技能音效添加,孟姜女立绘修改 2020-11-27 18:04:14 +08:00
ZhangBiao 13e2fbb98d Merge branch '0功能/竞技场胜负奖励' into master_xma_local 2020-11-26 11:11:57 +08:00
ZhangBiao 80538ec42f 【竞技场】增加产出 2020-11-25 18:24:23 +08:00
zhangqiang cf7068da1c 【灵兽特惠】 适配问题 2020-11-24 14:55:46 +08:00
ZhangBiao d938acc273 【竞技场】增加输赢奖励掉落 2020-11-23 09:58:22 +08:00
zhangqiang ddb5f1b299 【日常任务】 11.25 bug 宝箱位置修改 2020-11-20 17:36:42 +08:00
jiaoyangna 2a9b4cb5ab 动态立绘修改 2020-11-19 11:49:34 +08:00
ZhangBiao bdf45413bc 【森罗幻境】敌将详情 敌将位置调整
(cherry picked from commit 2dd30f9ca3)
2020-11-17 14:56:42 +08:00
zhangqiang cae41baf71 【图鉴】 升星点亮图鉴 调整献祭坛预设 2020-11-17 10:57:16 +08:00
ZhangBiao 6c8a011528 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 18:01:05 +08:00
ZhangBiao 46eeceb79d 【主题活动】bug修复 2020-11-13 18:00:56 +08:00
wangzhenxing 70e019f837 gm 测试战斗添加设置皮肤 2020-11-13 17:48:11 +08:00
gaoxin bd083a67a3 【测试战斗】同步界面修改 2020-11-13 17:47:54 +08:00
ZhangBiao ee04d93830 【灵兽宝阁】增加结束时间 2020-11-13 17:07:32 +08:00
jiaoyangna f1dfa111f1 灵兽特惠 价格修改 2020-11-13 15:56:21 +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
zhangqiang 21988be4e2 【觉醒】 觉醒成功替换资源 2020-11-13 11:18:46 +08:00
zhangqiang e9d984b329 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-12 19:34:29 +08:00
ZhangBiao debaf0210c 【易经宝库】加号位置调整 2020-11-12 18:32:53 +08:00
ZhangBiao 2563c6bdd6 【灵兽宝阁】货币显示修复 2020-11-12 18:17:56 +08:00
ZhangBiao 32afdddb4f 【灵兽宝阁】合并到local 预设提交 2020-11-12 17:24:14 +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
zhangqiang b1128dd88e 【献祭坛】适配调试 2020-11-12 17:05:34 +08:00
zhangqiang 8a73056eac 【献祭坛】预设微调 2020-11-12 17:04:06 +08:00
jiaoyangna 7fc14ec822 [主题活动] 修改提交 2020-11-12 16:07:19 +08:00
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
zhangqiang 492d969a4f 【觉醒】bug 修改 公会成员灵兽显示错误 2020-11-12 14:38:40 +08:00
zhangqiang cbf9f5cade 【觉醒】问题修改 2020-11-12 13:55:46 +08:00
jiaoyangna a6483b3181 [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
ZhangBiao 1ba753044f 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
zhangqiang 629eb98f1b Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-11 11:37:26 +08:00
zhangqiang 90e9e84c64 【觉醒】十一星的星级展示修改 2020-11-11 11:12:14 +08:00
zhangqiang 48e6d33b7b 【神将觉醒】 效果图 资源 提交 2020-11-10 17:29:38 +08:00
ZhangBiao d493246f2f 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
jiaoyangna 89a90ae5c5 神医天降修改 2020-11-10 11:04:19 +08:00
zhangqiang 6278bb0cc8 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:16:23 +08:00
zhangqiang 92d85c4200 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:16:01 +08:00
zhangqiang 6a1693939c 【觉醒】 觉醒添加图鉴 2020-11-09 20:05:51 +08:00
zhangqiang 85b21b27f0 Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-09 18:04:54 +08:00
ZhangBiao e6eb5d7673 【易经宝库】格子点击位置不准确修复 曾加tips 2020-11-09 15:28:24 +08:00
zhangqiang f94c84f1cd 【觉醒】 增加觉醒页签 2020-11-09 15:04:48 +08:00
zhangqiang de677bee2f 【觉醒】增加脚本 2020-11-09 11:13:53 +08:00
ZhangBiao 9ca403ebff 【易经宝库】第三层抽取完成后bug修复 2020-11-09 11:09:42 +08:00
zhangqiang 5c73587f89 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-09 10:16:16 +08:00
ZhangBiao de32379f8e 【竞技场】竞技场增加输赢奖励 2020-11-07 18:52:04 +08:00
jiaoyangna 6cb1610d31 神医天降修改 2020-11-07 16:56:53 +08:00
jiaoyangna 77047346dd 神医天降价格修改 2020-11-14 14:43:48 +08:00
zhangqiang 68979d577e 【神将觉醒】 觉醒成功界面 2020-11-07 15:15:49 +08:00