ZhangBiao
|
739eb8771c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 20:09:19 +08:00 |
ZhangBiao
|
104aeb9078
|
【适配】三界除魔
|
2021-03-31 20:09:10 +08:00 |
gaoxin
|
5f16021a0e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 19:06:34 +08:00 |
gaoxin
|
9c080a0cac
|
【激素探索】按钮扫光光效修改
|
2021-03-31 19:06:16 +08:00 |
ZhangBiao
|
762e257982
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:57:43 +08:00 |
ZhangBiao
|
87863f89f8
|
【适配】巅峰赛对战纪录
|
2021-03-31 18:57:31 +08:00 |
jiaoyangna
|
c16ac5d054
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:54:56 +08:00 |
ZhangBiao
|
5dc50c34da
|
【适配】天枢密卷 鸿蒙阵
|
2021-03-31 18:54:01 +08:00 |
jiaoyangna
|
292515e12e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:41:47 +08:00 |
ZhangBiao
|
2204717b5a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:40:34 +08:00 |
ZhangBiao
|
c521889e83
|
【适配】达人活动 逍遥游
|
2021-03-31 18:40:22 +08:00 |
jiaoyangna
|
4365e8afff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:39:02 +08:00 |
jiaoyangna
|
f8245898b0
|
特权礼包修改提交
|
2021-03-31 18:38:57 +08:00 |
zhangqiang
|
c2df1a807b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:29:00 +08:00 |
zhangqiang
|
d131bdbadd
|
【适配】
|
2021-03-31 18:28:46 +08:00 |
ZhangBiao
|
9b533a698b
|
【适配】
|
2021-03-31 17:55:47 +08:00 |
ZhangBiao
|
c280b85426
|
【适配】
|
2021-03-31 17:49:06 +08:00 |
zhangqiang
|
60353d6dbd
|
【归元优化】bug
|
2021-03-31 17:40:51 +08:00 |
ZhangBiao
|
e3d9b0b140
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 17:30:26 +08:00 |
zhangqiang
|
c6425d9fe9
|
【称号坐骑时装】三界降魔
|
2021-03-31 17:30:05 +08:00 |
ZhangBiao
|
ab7d045495
|
【适配】法宝 竞技场
|
2021-03-31 17:29:51 +08:00 |
jiaoyangna
|
c029a643ec
|
超值基金文字错乱修改
|
2021-03-31 15:24:05 +08:00 |
zhangqiang
|
5d407765a2
|
【适配】森罗幻境
|
2021-03-31 15:06:41 +08:00 |
jiaoyangna
|
fbe2dc4769
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:43:11 +08:00 |
jiaoyangna
|
2fa125f70e
|
特权礼包特效修改
|
2021-03-31 14:43:08 +08:00 |
ZhangBiao
|
5142db7d00
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:33:11 +08:00 |
ZhangBiao
|
c287216995
|
【适配】限时神装
|
2021-03-31 14:33:01 +08:00 |
jiaoyangna
|
6af6f89c18
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:25:47 +08:00 |
jiaoyangna
|
43da7e2d51
|
十绝阵提交
|
2021-03-31 14:25:43 +08:00 |
zhangqiang
|
2bfccba248
|
【适配】魂印分解...
|
2021-03-31 14:03:18 +08:00 |
ZhangBiao
|
94714c1ce4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 13:32:44 +08:00 |
ZhangBiao
|
beee0ed0b3
|
【适配】无尽副本
|
2021-03-31 13:32:23 +08:00 |
zhangqiang
|
3b7b310c8b
|
【适配】
|
2021-03-31 12:00:55 +08:00 |
zhangqiang
|
7da79393e5
|
【适配】
|
2021-03-31 11:51:27 +08:00 |
gaoxin
|
64ca85735c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:40:09 +08:00 |
jiaoyangna
|
8c87d221fb
|
活动 动态加载改名
|
2021-03-31 11:26:55 +08:00 |
gaoxin
|
2ea4d35ab9
|
【屏幕适配】vip界面适配修改
|
2021-03-31 11:23:26 +08:00 |
zhangqiang
|
04543dd9bb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:06:01 +08:00 |
zhangqiang
|
9806a56460
|
修改提交
|
2021-03-31 11:05:20 +08:00 |
ZhangBiao
|
116ab83a04
|
【福星高照】适配
|
2021-03-31 10:45:36 +08:00 |
ZhangBiao
|
3a23cb6cae
|
【青龙秘宝】解锁秘宝特权时,可直接领取的奖励显示区域超框
|
2021-03-30 22:09:25 +08:00 |
ZhangBiao
|
d4b843d972
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:03:59 +08:00 |
ZhangBiao
|
4dcdd67648
|
【极速探索优化】更改极速探索界面,突出激活探索特权的按钮
|
2021-03-30 22:01:58 +08:00 |
gaoxin
|
599a98b3a8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 21:24:58 +08:00 |
gaoxin
|
23e5bb6f98
|
【五星成长礼】添加箭头动画
|
2021-03-30 21:23:42 +08:00 |
jiaoyangna
|
0494e55215
|
Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
|
2021-03-30 20:41:32 +08:00 |
ZhangBiao
|
62a064b33e
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
|
2021-03-30 20:21:32 +08:00 |
jiaoyangna
|
23b46ba218
|
活动 修改提交
|
2021-03-30 20:17:26 +08:00 |
gaoxin
|
c2a5c2dc17
|
【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i
|
2021-03-30 19:54:19 +08:00 |
zhangqiang
|
cfaeff6759
|
【特权优化】 vip 公会 vip 升级战力提升
|
2021-03-30 19:49:49 +08:00 |