Commit Graph

3103 Commits (6de92f3692d5deed025f9b45f0e1800df06c3ef8)
 

Author SHA1 Message Date
wangzhenxing eb109ff09b 灵兽信息显示界面修改 2020-10-27 11:23:14 +09:00
gaoxin 13f37fa31a Merge branch '0功能/灵兽战斗' into master_develop 2020-10-27 10:07:29 +08:00
gaoxin c4ca00dfd3 【战斗】灵兽加入测试战斗 2020-10-27 10:07:18 +08:00
gaoxin 4139589270 【逍遥游】骰子音效替换 2020-10-26 20:20:32 +08:00
wangzhenxing f3d5640893 人物信息显示详情修改 2020-10-26 19:04:56 +09:00
yuanshuai f97263ff09 【逍遥游】骰子动画优化,隐藏动画下面的黑影 2020-10-26 18:56:35 +08:00
zhangqiang 3107e9a00f 【灵兽系统】 技能显示修改 2020-10-26 18:26:23 +08:00
JieLing ef4f4232cb 【灵兽系统】 修改显示 排行榜显示修改 2020-10-26 18:04:45 +08:00
jiaoyangna ce05f94695 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 17:41:06 +08:00
jiaoyangna 9c7839540a [灵兽系统]羁绊排序,羁绊红点修改 2020-10-26 17:40:54 +08:00
zhangqiang 388cb8a418 【灵兽系统】 修改合成逻辑 2020-10-26 17:23:08 +08:00
ZhangBiao 9a15a6e5b9 【社稷大典】捐献后 左上角 按钮状态切换修复
(cherry picked from commit c2612e2ca8)
2020-10-26 17:17:28 +08:00
ZhangBiao 79774302f5 【社稷大典】左上公会排行空白修改
(cherry picked from commit 5a20d41b77)
2020-10-26 17:17:20 +08:00
ZhangBiao e03d5449e5 【社稷大典】打开社稷大典界面 时被提出公会 检测
(cherry picked from commit 0340b7d468)
2020-10-26 17:17:12 +08:00
jiaoyangna f47ca02503 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 17:14:49 +08:00
jiaoyangna db98590cf3 【灵兽系统】召唤修改 2020-10-26 17:14:24 +08:00
zhangqiang 35f64de903 【灵兽系统】 修改预设加载 2020-10-26 17:11:04 +08:00
gaoxin 00f262d2f4 【灵兽】战斗内灵兽头像显示添加 2020-10-26 16:45:33 +08:00
jiaoyangna 37259287a4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:43:37 +08:00
jiaoyangna 94858e80ff 【主题活动-累计充值】 文字提示修改 2020-10-26 16:43:22 +08:00
jiaoyangna 573fc1d5f8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:01:34 +08:00
jiaoyangna 1ebd6a5727 灵兽召唤提交 2020-10-26 16:00:34 +08:00
zhangqiang 2a6954293a 【灵兽系统】 灵兽羁绊战力计算修改 2020-10-26 15:47:14 +08:00
wangzhenxing c5b97f3cda 灵兽去除log 2020-10-26 16:42:48 +09:00
wangzhenxing 443bdab87f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:27:38 +09:00
ZhangBiao 1444c0712c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:25:44 +08:00
ZhangBiao d4b75e0d73 【社稷大典】时间弹跳修复,物品边框颜色修改
(cherry picked from commit 709dc1a5bd)
2020-10-26 16:24:16 +08:00
ZhangBiao ddd417b3f3 【社稷大典】捐献品价值修改
(cherry picked from commit d30209f844)
2020-10-26 16:24:06 +08:00
ZhangBiao 55f9ccdb86 【社稷大典】捐献品3 点击加号跳转
(cherry picked from commit 469235ff74)
2020-10-26 16:23:58 +08:00
ZhangBiao 8f0553c1f6 【社稷大典】长按贡献数量不够无法捐赠bug修复
(cherry picked from commit e6610518ce)
2020-10-26 16:23:50 +08:00
ZhangBiao 5bf6dfb39f 【社稷大典】提交8 漏题补 2020-10-26 16:23:40 +08:00
yuanshuai 46b48f53d9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:21:54 +08:00
yuanshuai 8015f4cfc7 【逍遥游】犀牛贺州地图资源提交 2020-10-26 16:21:42 +08:00
wangzhenxing 91ed513602 人物信息修改提交 2020-10-26 16:26:21 +09:00
gaoxin 343237ae6d 【灵兽】战斗数据协议添加,修复战斗数据组建错误 2020-10-26 14:56:03 +08:00
wangzhenxing 71f365b3e4 人物信息显示修改 2020-10-26 15:35:03 +09:00
jiaoyangna bdfb518274 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:11:44 +08:00
jiaoyangna 88afa2d704 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 15:07:13 +08:00
yuanshuai e37e260678 Merge branch 'master_devlop_ys' into master_develop 2020-10-26 15:05:43 +08:00
yuanshuai afd0b542fe 骰子动画修改 2020-10-26 15:04:44 +08:00
gaoxin 1dc2b96916 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 14:57:05 +08:00
gaoxin e96bfbdbf5 【灵兽】获取全部灵兽信息接口修改返回数组,修复打开灵兽信息界面报错 2020-10-26 14:57:01 +08:00
zhangqiang 982e29b2ba 线上问题工会技能战力修改 2020-10-26 14:45:29 +08:00
gaoxin 9ac7e7b9a3 Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
2020-10-26 14:33:22 +08:00
gaoxin 4265c533c8 【战斗】GM战斗测试数据提交 2020-10-26 14:32:48 +08:00
zhangqiang 21f8a21aec 灵兽提交 2020-10-26 14:25:35 +08:00
gaoxin 2eef0bbac5 【逍遥游】删除旧骰子动画,修复新动画缺失的问题 2020-10-26 14:09:55 +08:00
liujiaqi 3e9cedaf34 设计商店图标 2020-11-01 12:15:45 +08:00
gaoxin 8a455e2c9e 【灵兽】后端数据解析添加 2020-10-26 14:03:59 +08:00
gaoxin 7b64ca48d3 【灵兽】战斗界面结构修改 2020-10-26 11:41:51 +08:00