Commit Graph

3673 Commits (10db1d34b36314cc0dd43330aafab50a023dd078)
 

Author SHA1 Message Date
JieLing 0b2a309b60 【逍遥游】删除旧骰子资源 2020-10-26 15:39:49 +08:00
gaoxin 76dadc8077 【逍遥游】合并后资源缺失 2020-10-26 15:30:24 +08: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
yuanshuai 0fee60ea37 【逍遥游】骰子动画修改 2020-10-26 15:19:33 +08:00
gaoxin 71dc347456 【逍遥游】删除旧骰子动画,修复新动画缺失的问题 2020-10-26 15:18:32 +08:00
gaoxin c2db80b5bf 【逍遥游】骰子资源提交 2020-10-26 15:15:56 +08:00
jiaoyangna 942849cdcf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 15:06:24 +08:00
jiaoyangna ce5db82250 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:05:59 +08:00
gaoxin 343237ae6d 【灵兽】战斗数据协议添加,修复战斗数据组建错误 2020-10-26 14:56:03 +08:00
zhangqiang 0a5816a4ec 线上问题工会技能战力修改 2020-10-26 14:47:14 +08:00
zhangqiang b6f48c4910 线上战力 属性取整问题 2020-10-26 14:46:43 +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
zhangqiang 5a72414908 灵兽修改提交 2020-10-26 11:34:01 +08:00
zhangqiang af2364c075 线上战力 属性取整问题 2020-10-26 11:33:23 +08:00
gaoxin fc7b5d2c48 【逍遥游】骰子资源提交 2020-10-26 10:43:44 +08:00
gaoxin 3aa5ac3207 【社稷大典】特效资源添加 2020-10-26 10:26:36 +08:00
jiaoyangna 11d0d95bde Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-29 10:13:11 +08:00
jiaoyangna 0a610313a6 主题活动图片资源修改提交,累计重置红点检测修改提交 2020-10-29 10:12:47 +08:00
gaoxin fe7d22e4ae 【灵兽】灵兽战斗表现添加 2020-10-26 10:13:31 +08:00
zhangqiang 3fa9583f56 灵兽修改提交 2020-10-26 10:10:29 +08:00
zhangqiang aff128d50a 灵兽提交 2020-10-24 19:46:10 +08:00
gaoxin 043304eb18 Merge branch 'master_develop' into 0功能/灵兽战斗 2020-10-24 18:51:57 +08:00
wangzhenxing ac0c59e9a1 灵兽显示修改 2020-10-24 18:54:14 +09:00
wangzhenxing a0270d471b 灵兽提交 2020-10-24 18:41:20 +09:00
zhangqiang 1d67775000 灵兽提交 2020-10-24 18:14:00 +08:00
ZhangBiao d36645cc7f 【社稷大典】资源修改 2020-10-24 17:36:51 +08:00
gaoxin bb66461441 Merge branch 'master_develop' into 0功能/灵兽战斗 2020-10-24 17:17:52 +08:00