JieLing
|
0752b7694e
|
【排行榜】 排行榜显示
|
2020-10-27 16:23:35 +08:00 |
ZhangBiao
|
35f6a6c430
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta
|
2020-10-27 16:16:10 +08:00 |
ZhangBiao
|
acd3f336e9
|
【设计大典】特效添加
|
2020-10-27 16:15:34 +08:00 |
gaoxin
|
ec7e498b87
|
【战斗】修复持续伤害会出现小数的问题
|
2020-10-27 15:16:04 +08:00 |
gaoxin
|
9add8d8dbf
|
【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题)
|
2020-10-27 13:53:32 +08:00 |
JieLing
|
4b522dd9ea
|
【积天豪礼】$1 -> $0.99
|
2020-10-27 13:51:11 +08:00 |
JieLing
|
e1a8028ec6
|
【资源】部分资源位置修改,防止热更资源过大
|
2020-10-27 11:03:08 +08:00 |
gaoxin
|
9808cad9b9
|
【逍遥游】骰子音效替换
|
2020-10-26 20:20:51 +08:00 |
gaoxin
|
88516ad0e2
|
【战斗】加血普攻会触发降怒被动的问题,修改被动技能195全部免疫改为部分免疫
|
2020-10-26 19:43:04 +08:00 |
JieLing
|
7870934f0c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:58:03 +08:00 |
yuanshuai
|
0ea67ffa33
|
【逍遥游】骰子动画优化,隐藏动画下面的黑影
|
2020-10-26 18:57:45 +08:00 |
jiaoyangna
|
29789b6c0d
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:45:12 +08:00 |
jiaoyangna
|
5d3d65871a
|
[主题活动-社稷大典]商店立绘重叠提交
|
2020-10-26 18:44:57 +08:00 |
ZhangBiao
|
3d19d05b04
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:07:40 +08:00 |
ZhangBiao
|
d7ad797ce5
|
【车迟斗法】点击抢夺下方名字修改
|
2020-10-26 18:07:28 +08:00 |
JieLing
|
837d7d8886
|
【社稷大典】 公会排行显示问题
|
2020-10-26 17:59:58 +08:00 |
ZhangBiao
|
6eea05fa06
|
【竞技场】领奖界面报错修改
|
2020-10-26 17:30:26 +08:00 |
ZhangBiao
|
6149e88620
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 17:04:28 +08:00 |
ZhangBiao
|
c2612e2ca8
|
【社稷大典】捐献后 左上角 按钮状态切换修复
|
2020-10-26 17:04:07 +08:00 |
JieLing
|
0b8abaeabf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:51:53 +08:00 |
jiaoyangna
|
d8f5a48811
|
【累计充值】提示修改
|
2020-10-26 16:51:47 +08:00 |
ZhangBiao
|
a9e8cad755
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:50:03 +08:00 |
ZhangBiao
|
5a20d41b77
|
【社稷大典】左上公会排行空白修改
|
2020-10-26 16:49:47 +08:00 |
JieLing
|
a33ac4576f
|
添加一个特效打包路径
|
2020-10-26 16:45:43 +08:00 |
ZhangBiao
|
0340b7d468
|
【社稷大典】打开社稷大典界面 时被提出公会 检测
|
2020-10-26 16:37:56 +08:00 |
ZhangBiao
|
b2c841e572
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:11:11 +08:00 |
ZhangBiao
|
709dc1a5bd
|
【社稷大典】时间弹跳修复,物品边框颜色修改
|
2020-10-26 16:10:58 +08:00 |
liujiaqi
|
e80c0f8e0d
|
【社稷大典】商店标题资源替换
|
2020-10-26 16:06:55 +08:00 |
JieLing
|
21f0e6abfb
|
【逍遥游】动画资源引用错误
|
2020-10-26 15:46:24 +08:00 |
JieLing
|
0b2a309b60
|
【逍遥游】删除旧骰子资源
|
2020-10-26 15:39:49 +08:00 |
gaoxin
|
76dadc8077
|
【逍遥游】合并后资源缺失
|
2020-10-26 15:30:24 +08: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 |
zhangqiang
|
0a5816a4ec
|
线上问题工会技能战力修改
|
2020-10-26 14:47:14 +08:00 |
zhangqiang
|
b6f48c4910
|
线上战力 属性取整问题
|
2020-10-26 14:46:43 +08:00 |
jiaoyangna
|
0ba1161933
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-08-25 13:34:25 +08:00 |
ZhangBiao
|
d30209f844
|
【社稷大典】捐献品价值修改
|
2020-10-26 12:35:29 +08:00 |
ZhangBiao
|
0d0b849435
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 12:28:08 +08:00 |
ZhangBiao
|
469235ff74
|
【社稷大典】捐献品3 点击加号跳转
|
2020-10-26 12:27:56 +08:00 |
ZhangBiao
|
e6610518ce
|
【社稷大典】长按贡献数量不够无法捐赠bug修复
|
2020-10-26 12:23:04 +08:00 |
ZhangBiao
|
6407abc8c9
|
【社稷大典】提交8 漏题补
|
2020-10-26 11:53:53 +08:00 |
gaoxin
|
c12c63bdaf
|
【language表】修复战斗中会出现错误文字 “抢夺成功,获得%s积分!” 的问题
|
2020-10-26 11:21:40 +08:00 |
JieLing
|
ab0c5a4867
|
报错提交
|
2020-10-26 11:19:10 +08:00 |
jiaoyangna
|
ebb2748b5c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-29 11:04:20 +08:00 |
jiaoyangna
|
9e7cd31376
|
逍遥游云游宝玉修改提交
|
2020-10-29 11:03:13 +08:00 |
jiaoyangna
|
68af385814
|
冲突提交
|
2020-10-29 10:29:14 +08:00 |
jiaoyangna
|
6d79dcab9a
|
活动修改提交
|
2020-10-29 09:50:47 +08:00 |