Commit Graph

3880 Commits (2dd30f9ca3d81908cd43100a1f8448b2e5188a0c)
 

Author SHA1 Message Date
ZhangBiao f091914b4f Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 17:07:44 +08:00
ZhangBiao ee04d93830 【灵兽宝阁】增加结束时间 2020-11-13 17:07:32 +08:00
ZhangBiao 10b3c375e7 【灵兽宝阁】增加假战斗
(cherry picked from commit 933f2d4768)
2020-11-13 16:38:41 +08:00
ZhangBiao 1e5e64db1e 【灵兽宝阁】倒计时显示刷新问题修复
(cherry picked from commit d739896793)
2020-11-13 16:36:13 +08:00
jiaoyangna 97cdd13df9 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 16:35:29 +08:00
jiaoyangna 384750e0e9 [限时折扣] 修改 2020-11-13 16:35:25 +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
gaoxin 9e49e3e5ce Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-13 16:06:42 +08:00
gaoxin 779f61cc15 【封禁】添加封禁提示 2020-11-13 16:06:35 +08:00
jiaoyangna f1dfa111f1 灵兽特惠 价格修改 2020-11-13 15:56:21 +08:00
jiaoyangna d4f79a0abb 限时招募提交 2020-11-13 15:50:42 +08:00
jiaoyangna 29312b211f Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 15:47:11 +08:00
jiaoyangna 44a1d94860 神医天降修改 2020-11-13 15:47:04 +08:00
JieLing 2cb5ee9176 【放生】 删除之前背景 2020-11-13 15:23:25 +08:00
wangzhenxing 7129226ff4 257,261,267被动修改 2020-11-13 16:05:56 +09:00
liujiaqi 762e35b2c1 灵兽山 觉醒图标 2020-11-20 15:24:41 +08:00
gaoxin 523e5c7328 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-13 14:51:19 +08:00
gaoxin 59a62755c8 【资源】修复东华帝君普攻技能报错的问题 2020-11-13 14:51:00 +08:00
ZhangBiao c2933ddb96 Merge branch '0活动开发聚集地/灵兽抽卡(可更换兽)' into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/lingshou_lingshoubeijing_03.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
2020-11-13 14:20:49 +08:00
ZhangBiao 8a5d51e2a3 【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
2020-11-13 12:12:44 +08:00
ZhangBiao 8185be7c27 【灵兽抽卡】增加可选灵兽 2020-11-13 12:12:06 +08:00
gaoxin 31378d1a76 【工具】刷新资源路径工具不再自动重命名 2020-11-13 11:30:50 +08:00
gaoxin 26cbfccf57 【工具】特效资源整理工具 2020-11-13 11:30:01 +08:00
wangzhenxing bb4dfa322c 【技能】被动265修改 2020-11-13 12:22:33 +09:00
zhangqiang 21988be4e2 【觉醒】 觉醒成功替换资源 2020-11-13 11:18:46 +08:00
zhangqiang 2f5b2c2d4f 【觉醒】 觉醒成功界面显示bug 2020-11-13 10:11:41 +08:00
wangzhenxing 2ed9f538b3 [技能] 被动效果修改 2020-11-13 10:40:39 +09: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
wangzhenxing a1315561e1 被动修改提交 2020-11-12 20:22:52 +09:00
gaoxin 8fe495cf88 【战斗】修复获取空的灵兽数据报错的问题 2020-11-12 19:42:31 +08:00
ZhangBiao debaf0210c 【易经宝库】加号位置调整 2020-11-12 18:32:53 +08:00
gaoxin b606e5bb97 【音效】孙悟空普通攻击音效提交 2020-11-12 18:22:10 +08:00
ZhangBiao c5117b9fc1 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-12 18:18:33 +08:00
ZhangBiao 2563c6bdd6 【灵兽宝阁】货币显示修复 2020-11-12 18:17:56 +08:00
gaoxin ee9f3af6bb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-12 18:12:33 +08:00
zhangqiang 8b15fe28eb 【献祭坛】11.5 资源提换 2020-11-12 18:12:02 +08:00
ZhangBiao 5f596eef04 【灵兽宝阁】bug修复,增加等级限制 2020-11-12 17:53:49 +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 b1eba4887a 【灵兽】灵兽上阵主界面名字颜色变化 2020-11-12 17:05:50 +08:00
zhangqiang b1128dd88e 【献祭坛】适配调试 2020-11-12 17:05:34 +08:00
zhangqiang 8a73056eac 【献祭坛】预设微调 2020-11-12 17:04:06 +08:00
zhangqiang 33a40c700d 【献祭坛】 适配修改 2020-11-12 16:57:50 +08:00
zhangqiang 5da1841a03 【灵兽】灵兽上阵主界面名字颜色变化 2020-11-12 16:56:40 +08:00
gaoxin ba30732766 【特效】再次修复孙悟空技能特效丢失的问题 2020-11-12 16:39:45 +08:00
jiaoyangna 7fc14ec822 [主题活动] 修改提交 2020-11-12 16:07:19 +08:00
gaoxin 86dd29629c 【忽略文件】忽略BattleRecord下的所有内容 2020-11-12 15:36:45 +08:00