wangzhenxing
|
7d91331f5f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-03 17:47:25 +08:00 |
wangzhenxing
|
bc5d3e2f45
|
[战斗]============减怒数字修改提交
|
2021-07-03 17:47:00 +08:00 |
zhangqiang
|
6d5d480543
|
【缥缈之旅】提交4
|
2021-07-03 17:46:44 +08:00 |
wangzhenxing
|
c082a3c3d6
|
【功能】===========心魔试炼预设修改
|
2021-07-03 17:24:46 +08:00 |
zhangqiang
|
c87576944f
|
【刷资源提交】
|
2021-07-03 17:02:18 +08:00 |
zhangqiang
|
fbda34d678
|
Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-07-03 16:53:42 +08:00 |
zhangqiang
|
6af4522342
|
【缥缈之旅】提交3
|
2021-07-03 16:49:13 +08:00 |
wangzhenxing
|
6ad90cf3cf
|
[战斗]==========伤害文字修改提交
|
2021-07-03 15:50:58 +08:00 |
gaoxin
|
5458cd2889
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-03 15:27:09 +08:00 |
gaoxin
|
f75b844961
|
【拍脸】修复偶现栈空报错
|
2021-07-03 15:26:58 +08:00 |
wangzhenxing
|
353a15c216
|
[战斗]======战斗图片文字设置修改提交
|
2021-07-03 15:11:13 +08:00 |
wangzhenxing
|
2fbd5dd5e9
|
[战斗]============战斗伤害图片字修改提交
|
2021-07-03 14:50:03 +08:00 |
wangzhenxing
|
c266827b4e
|
[战斗]==========战斗文字材质球修改
|
2021-07-03 14:29:35 +08:00 |
wangzhenxing
|
802f41cadd
|
Merge branch 'china/dev-c-battle' into china/dev
|
2021-07-03 14:18:37 +08:00 |
zhangqiang
|
2f269ebfa8
|
【缥缈之旅】提交2
|
2021-07-03 12:37:56 +08:00 |
wangzhenxing
|
48e2a8a9bd
|
[战斗]========伤害数量图片修改提交
|
2021-07-02 20:48:36 +08:00 |
wangzhenxing
|
94dde31cf9
|
[战斗]====中毒伤害图片字提交
|
2021-07-02 19:12:09 +08:00 |
ZhangBiao
|
bcfb63e451
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 16:27:46 +08:00 |
ZhangBiao
|
3d462c708f
|
【站内信】排序
|
2021-07-02 16:27:36 +08:00 |
jiaoyangna
|
71a0806828
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 16:24:56 +08:00 |
jiaoyangna
|
cf412831e2
|
buildconfig 脚本提交
|
2021-07-02 16:24:50 +08:00 |
ZhangBiao
|
0a403e2099
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 16:11:04 +08:00 |
ZhangBiao
|
ee1da4348c
|
【站内信】协议漏题
|
2021-07-02 16:10:47 +08:00 |
jiaoyangna
|
6da6d47bcc
|
商店界面特效修改提交
|
2021-07-02 15:52:30 +08:00 |
jiaoyangna
|
eed42686ad
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 14:50:45 +08:00 |
jiaoyangna
|
d49f3c8e54
|
Revert "每日商店特效删除"
This reverts commit 64382c68c3 .
|
2021-07-02 14:50:31 +08:00 |
wangzhenxing
|
338ab55daa
|
【战斗】=========新增336被动
|
2021-07-02 14:49:28 +08:00 |
ZhangBiao
|
21f8259143
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 14:48:41 +08:00 |
ZhangBiao
|
01a6f7f277
|
【抽卡概率】增加显示概率
|
2021-07-02 14:48:29 +08:00 |
jiaoyangna
|
26fc32d583
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 14:28:57 +08:00 |
jiaoyangna
|
64382c68c3
|
每日商店特效删除
|
2021-07-02 14:28:46 +08:00 |
zhangqiang
|
211dc5838f
|
【特惠神装拍脸】修改
|
2021-07-02 14:22:42 +08:00 |
ZhangBiao
|
f2dd26a329
|
【特惠神装】icon调整
|
2021-07-02 13:50:56 +08:00 |
jiaoyangna
|
11bb11fb4b
|
每日礼包banner 替换
|
2021-07-02 13:50:41 +08:00 |
jiaoyangna
|
0fc62c0dfa
|
来源图片修改提交
|
2021-07-02 13:47:04 +08:00 |
jiaoyangna
|
5bd477fbab
|
config 修改提交
|
2021-07-02 13:05:29 +08:00 |
jiaoyangna
|
338a583705
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 12:11:32 +08:00 |
jiaoyangna
|
82f1650edf
|
神将来源定位描述错误修改
|
2021-07-02 12:11:29 +08:00 |
ZhangBiao
|
f4c2bd581c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 11:54:45 +08:00 |
ZhangBiao
|
ffb80c8750
|
【特惠神装、心愿抽卡】适配、增加上方英雄长按
|
2021-07-02 11:54:33 +08:00 |
jiaoyangna
|
11fe33f664
|
【ID1016973】
【高帧模式】设置界面显示了中文和越南语的切换
|
2021-07-02 11:53:51 +08:00 |
jiaoyangna
|
19247e296e
|
神将来源跳转修改提交
|
2021-07-02 11:23:07 +08:00 |
wangzhenxing
|
6e0c8e55c8
|
[战斗]==========被动335修改 困难副本 星级条件13修改
|
2021-07-02 11:20:52 +08:00 |
jiaoyangna
|
c85f18a814
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 11:14:03 +08:00 |
jiaoyangna
|
9b01d308e8
|
孙悟空添加新人商城
|
2021-07-02 11:13:59 +08:00 |
ZhangBiao
|
8cc655f107
|
【特惠神装】增加特效
|
2021-07-02 11:03:16 +08:00 |
jiaoyangna
|
26ef0d21d0
|
图鉴神将来源修改提交
|
2021-07-02 10:16:12 +08:00 |
wangzhenxing
|
d00d69ff68
|
[战斗]============第二期紫府神印提交
|
2021-07-02 09:56:06 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
zhangqiang
|
1be2dc60eb
|
【缥缈之旅】提交1
|
2021-07-01 20:13:47 +08:00 |