gaoxin
|
70f660d158
|
【资源】所向披靡banner资源替换
|
2021-06-23 13:58:48 +08:00 |
jiaoyangna
|
1c89a4218c
|
假人骑牛修改
|
2021-06-23 11:05:53 +08:00 |
jiaoyangna
|
e5a491b7b9
|
随机人物修改提交
|
2021-06-23 10:20:03 +08:00 |
gaoxin
|
c60fe0c7c6
|
【资源】修复玉帝皮肤技能显示错误
|
2021-06-22 20:58:52 +08:00 |
jiaoyangna
|
8b3e5dbae4
|
config build 提交
|
2021-06-22 20:41:51 +08:00 |
jiaoyangna
|
97da91abc3
|
buildconfig 修改提交
|
2021-06-22 20:37:34 +08:00 |
JieLing
|
75b77403be
|
Merge remote-tracking branch 'origin/china/test' into china/zf_test
|
2021-06-22 17:53:05 +08:00 |
JieLing
|
574341ed13
|
Merge branch 'china/local' into china/test
|
2021-06-22 17:52:36 +08:00 |
gaoxin
|
c0a561e75e
|
【公告】修改公告在分子包时配置的字段
|
2021-06-22 17:52:01 +08:00 |
gaoxin
|
abbdbfe3e4
|
【称号】修复老包中称号报错
|
2021-06-22 17:51:55 +08:00 |
gaoxin
|
24c2de4c6d
|
【公告】修改公告在分子包时配置的字段
|
2021-06-22 17:51:14 +08:00 |
gaoxin
|
efca8d1244
|
【称号】修复老包中称号报错
|
2021-06-22 17:42:18 +08:00 |
gaoxin
|
aec9b12ab2
|
【资源】玉皇大帝技能显示错误修复
|
2021-06-22 17:40:41 +08:00 |
gaoxin
|
db2143bfac
|
【资源】玉皇大帝皮肤技能特效资源优化
|
2021-06-22 16:38:26 +08:00 |
gaoxin
|
2d5667f9ec
|
【登录】serverversion改为从后端获取
|
2021-06-22 15:01:02 +08:00 |
JieLing
|
f1f4d1b613
|
Merge remote-tracking branch 'origin/china/test' into china/zf_test
|
2021-06-22 11:13:14 +08:00 |
JieLing
|
2154e0add4
|
【配置】专服都是从包版本1开始
|
2021-06-22 11:13:01 +08:00 |
JieLing
|
6370bc7c3b
|
Merge branch 'china/local' into china/test
|
2021-06-22 11:08:58 +08:00 |
gaoxin
|
8ec017d56f
|
【资源】草花背景资源还原
|
2021-06-22 11:08:35 +08:00 |
jiaoyangna
|
9163e4e517
|
大圣购买修改
|
2021-06-22 11:08:04 +08:00 |
gaoxin
|
4bde4b31ad
|
【资源】新增无尽副本地图资源
|
2021-06-22 11:00:37 +08:00 |
jiaoyangna
|
274f315d2b
|
大圣购买修改
|
2021-06-22 10:08:42 +08:00 |
gaoxin
|
0e451e8ea0
|
【资源】玉皇大帝皮肤资源
|
2021-06-21 20:24:32 +08:00 |
JieLing
|
98a5b74e6e
|
Merge remote-tracking branch 'origin/china/test' into china/zf_test
|
2021-06-21 20:24:05 +08:00 |
gaoxin
|
d04d0bbefb
|
【资源】玉皇大帝皮肤特效资源上传
|
2021-06-21 19:54:12 +08:00 |
jiaoyangna
|
cb37edbba0
|
秘宝间隔调整
|
2021-06-21 18:26:31 +08:00 |
ZhangBiao
|
252aff3423
|
【月卡激活】如果购买的礼包不弹恭喜获得,就不会提示已激活月卡,待下次任意界面弹恭喜获得才会提示
|
2021-06-21 17:37:34 +08:00 |
ZhangBiao
|
0dc5976dd0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-21 16:57:31 +08:00 |
ZhangBiao
|
fe16795d8c
|
【主城】右上伸缩条闪烁修改
|
2021-06-21 16:57:22 +08:00 |
gaoxin
|
e888e3987e
|
【资源】草花背景资源还原
|
2021-06-21 16:32:03 +08:00 |
gaoxin
|
f2d8eec607
|
【资源】玉皇大帝皮肤资源优化
|
2021-06-21 16:27:15 +08:00 |
jiaoyangna
|
78c4e2bc8f
|
挂机卡死修改提交
|
2021-06-21 16:19:27 +08:00 |
wangzhenxing
|
d943d3044b
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-06-21 15:29:16 +08:00 |
gaoxin
|
01e033ad00
|
【资源】玉皇大帝皮肤资源
|
2021-06-21 15:14:02 +08:00 |
JieLing
|
05f9f121d1
|
Merge branch 'china/local' into china/test
|
2021-06-21 14:14:19 +08:00 |
JieLing
|
ca982b566c
|
Merge branch 'china/dev' into china/local
|
2021-06-21 14:13:11 +08:00 |
gaoxin
|
3f320f1e89
|
【降妖夺宝】修复协程导致报错
|
2021-06-21 14:12:33 +08:00 |
zhangqiang
|
057e32fe52
|
【福星高照】领取完所有奖励后,按钮红点不消失
|
2021-06-21 13:52:41 +08:00 |
ZhangBiao
|
ba5bc832d9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 11:45:13 +08:00 |
ZhangBiao
|
4fdbc4a559
|
【降妖夺宝】抽卡跳转修改
|
2021-06-21 11:45:03 +08:00 |
jiaoyangna
|
77dea82a94
|
【ID1016745】
【升级豪礼】新到的图片资源,需要替换
|
2021-06-21 11:42:19 +08:00 |
jiaoyangna
|
0014224024
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 11:30:50 +08:00 |
jiaoyangna
|
daba103fdb
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 11:06:23 +08:00 |
jiaoyangna
|
be75375dd6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 10:53:42 +08:00 |
jiaoyangna
|
0f309447c2
|
【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
|
2021-06-21 10:53:24 +08:00 |
ZhangBiao
|
cf38744969
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 10:52:04 +08:00 |
ZhangBiao
|
428df0c41d
|
【降妖夺宝】限时商市道具光效穿透
|
2021-06-21 10:51:55 +08:00 |
zhangqiang
|
8152d96e1e
|
【福星高照】领取完所有奖励后,按钮红点不消失
|
2021-06-21 10:42:27 +08:00 |
jiaoyangna
|
e5ff298534
|
Revert "【ID1016740】"
This reverts commit 343b92aff9 .
|
2021-06-21 10:38:09 +08:00 |
jiaoyangna
|
343b92aff9
|
【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
|
2021-06-21 10:36:33 +08:00 |