gaoxin
|
ab3d7e939b
|
【解锁提示】添加功能解锁提示
|
2021-12-26 19:12:25 +08:00 |
jiaoyangna
|
740aeac6bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 18:43:36 +08:00 |
gaoxin
|
eaea265bc7
|
【物品】添加物品使用的限制等级
|
2021-12-26 17:35:50 +08:00 |
jiaoyangna
|
19a1e1b7ca
|
超值返利提交
|
2021-12-16 18:41:30 +08:00 |
jiaoyangna
|
c1f0e0f78b
|
添加选中框
|
2021-12-16 18:38:32 +08:00 |
ZhangBiao
|
b203711459
|
Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-16 17:17:16 +08:00 |
gaoxin
|
cb8f8fe0aa
|
【挂机物品】添加时间标签
|
2021-12-26 17:13:30 +08:00 |
jiaoyangna
|
50927b9ac5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 16:55:46 +08:00 |
jiaoyangna
|
1ae167efb5
|
至尊降世修改提交
|
2021-12-16 16:55:30 +08:00 |
ZhangBiao
|
ae3f0c5df2
|
【连续礼包】新增连续礼包入口
|
2021-12-16 14:20:04 +08:00 |
jiaoyangna
|
b811bd0d24
|
超值返利预设代码提交
|
2021-12-16 11:45:51 +08:00 |
jiaoyangna
|
33f0b51d94
|
超值返利预设代码提交
|
2021-12-16 11:45:02 +08:00 |
jiaoyangna
|
11c4f914b5
|
至尊降世提交
|
2021-12-16 11:42:00 +08:00 |
ZhangBiao
|
2858f2e400
|
【商城界面】提交
|
2021-12-16 10:46:11 +08:00 |
jiaoyangna
|
73283bd818
|
回退修改提交
|
2021-12-16 10:09:48 +08:00 |
jiaoyangna
|
c6eb719fa6
|
添加回退消耗数量
|
2021-12-15 14:41:04 +08:00 |
ZhangBiao
|
0b190666d5
|
【商城界面】提交
|
2021-12-15 14:34:21 +08:00 |
jiaoyangna
|
568ad92a9b
|
回退修改
|
2021-12-15 14:28:36 +08:00 |
jiaoyangna
|
0d9a3cb8ed
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-15 10:28:43 +08:00 |
jiaoyangna
|
2e2718d5bf
|
预设修改提交
|
2021-12-15 10:28:26 +08:00 |
wangzhenxing
|
9f2a977b07
|
[功能]=========战斗统计界面添加死亡置灰
|
2021-12-15 09:44:35 +08:00 |
ZhangBiao
|
b07f3ce2d5
|
【商城界面】提交
|
2021-12-14 19:16:30 +08:00 |
ZhangBiao
|
56aad6a959
|
【命格】提交
|
2021-12-14 17:52:15 +08:00 |
jiaoyangna
|
89a034a85e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-14 17:26:02 +08:00 |
jiaoyangna
|
0c83c3412e
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:25:44 +08:00 |
ZhangBiao
|
e1a9459101
|
【命格】提交
|
2021-12-14 16:17:49 +08:00 |
ZhangBiao
|
98308fe892
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-14 15:32:05 +08:00 |
ZhangBiao
|
31ce94705d
|
【商城界面】资源提交
|
2021-12-14 13:15:20 +08:00 |
ZhangBiao
|
887e444547
|
【新商城】提交
|
2021-12-14 11:18:25 +08:00 |
ZhangBiao
|
4cb31b3ba0
|
【森罗幻境】修复英雄选框底图消失问题
|
2021-12-14 10:05:49 +08:00 |
ZhangBiao
|
f248583e9e
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-14 09:49:12 +08:00 |
jiaoyangna
|
663957bbce
|
去掉帮助按钮,修改文字
|
2021-12-14 09:35:35 +08:00 |
jiaoyangna
|
bfd0cd7184
|
适配修改提交
|
2021-12-13 17:27:29 +08:00 |
ZhangBiao
|
0b9bd476dd
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-13 17:26:43 +08:00 |
ZhangBiao
|
d91811a555
|
【命格】提交
|
2021-12-13 17:26:08 +08:00 |
jiaoyangna
|
acca1c0eae
|
添加一个按钮
|
2021-12-13 16:31:41 +08:00 |
jiaoyangna
|
2079a4efcb
|
适配修改提交
|
2021-12-13 15:08:02 +08:00 |
ZhangBiao
|
ab5b654b73
|
【法宝聚灵】增加特效
|
2021-12-13 12:14:46 +08:00 |
ZhangBiao
|
f444315fee
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-10 18:32:41 +08:00 |
ZhangBiao
|
c11848b98a
|
【命格】红点提交
|
2021-12-10 18:27:43 +08:00 |
ZhangBiao
|
94c98be0e5
|
【命格】提交
|
2021-12-10 16:17:47 +08:00 |
ZhangBiao
|
d3a2fdf110
|
【命格】提交
|
2021-12-10 16:07:46 +08:00 |
ZhangBiao
|
1ae26afed2
|
【命格】跳转
|
2021-12-10 15:46:35 +08:00 |
ZhangBiao
|
a3c24ee4b7
|
【命格】提交
|
2021-12-10 15:29:03 +08:00 |
ZhangBiao
|
70f5308d1d
|
【命格】宝石资源提交
|
2021-12-10 15:05:18 +08:00 |
jiaoyangna
|
9069b2ed2c
|
招募秘宝提交
|
2021-12-10 14:58:14 +08:00 |
ZhangBiao
|
9140a632f9
|
【命格】提交
|
2021-12-10 14:57:23 +08:00 |
ZhangBiao
|
f09556242d
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 14:16:28 +08:00 |
ZhangBiao
|
982137c9b7
|
【命格】提交
|
2021-12-10 14:14:08 +08:00 |
ZhangBiao
|
82c89e5e7d
|
【命格】提交
|
2021-12-10 13:57:24 +08:00 |
jiaoyangna
|
fe0efcb631
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 13:42:27 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
ZhangBiao
|
f067ae5080
|
【命格】提交
|
2021-12-10 11:40:15 +08:00 |
ZhangBiao
|
bab62f274c
|
【命格】提交
|
2021-12-10 11:01:44 +08:00 |
ZhangBiao
|
cb5cf43089
|
【命格】提交
|
2021-12-09 20:17:37 +08:00 |
ZhangBiao
|
9875630085
|
【命格】提交
|
2021-12-09 13:29:16 +08:00 |
ZhangBiao
|
7bcc95f31f
|
【命格】提交
|
2021-12-08 18:34:56 +08:00 |
ZhangBiao
|
b52b30ab1e
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-12-08 17:30:54 +08:00 |
ZhangBiao
|
4f1e129473
|
【命格】加成预览提交
|
2021-12-08 17:27:22 +08:00 |
gaoxin
|
f846d6f17e
|
【战斗】加入三倍速
|
2021-12-08 16:39:37 +08:00 |
ZhangBiao
|
be16abf79a
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-12-08 14:18:38 +08:00 |
ZhangBiao
|
016780c7bc
|
【命格】命石替换
|
2021-12-08 14:17:18 +08:00 |
jiaoyangna
|
1136879d55
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-08 14:03:43 +08:00 |
jiaoyangna
|
9b1ca0135c
|
【ID1010829】
增加开服竞技比拼活动——竞技试炼
|
2021-12-08 14:03:23 +08:00 |
ZhangBiao
|
1efc9fc56b
|
【命格】命石穿戴
|
2021-12-08 09:29:08 +08:00 |
ZhangBiao
|
2a68523d05
|
【命格】提交
|
2021-12-07 17:19:07 +08:00 |
ZhangBiao
|
a0675baeb8
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-07 16:28:44 +08:00 |
ZhangBiao
|
eb1a9f29e5
|
【命格】测试按钮提交
|
2021-12-07 15:40:36 +08:00 |
ZhangBiao
|
86f1620e7d
|
【连购好礼】活动时间兼容调整
|
2021-12-07 15:22:52 +08:00 |
ZhangBiao
|
00f0e12f28
|
【命格】背包中显示
|
2021-12-07 14:03:02 +08:00 |
ZhangBiao
|
3ad898f8af
|
【命格】提交
|
2021-12-07 11:50:03 +08:00 |
ZhangBiao
|
8efea1f06e
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-07 09:17:01 +08:00 |
ZhangBiao
|
692425511c
|
【寻宝迷踪】增加珍奇宝阁入口
|
2021-12-06 18:44:33 +08:00 |
ZhangBiao
|
3b53332e7b
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-06 18:26:14 +08:00 |
jiaoyangna
|
d9f71e2f48
|
大闹天宫添加神魂等级
|
2021-12-06 17:47:14 +08:00 |
ZhangBiao
|
78e8865e95
|
【连购礼包】提交
|
2021-12-06 16:59:10 +08:00 |
ZhangBiao
|
daa1780104
|
【命格】提交
|
2021-12-06 16:54:16 +08:00 |
jiaoyangna
|
9ae56712c4
|
添加已获得标志
|
2021-12-06 16:04:01 +08:00 |
ZhangBiao
|
022a3ee307
|
【命格】提交
|
2021-12-06 15:31:29 +08:00 |
ZhangBiao
|
10ad308033
|
【命格】提交
|
2021-12-06 15:07:34 +08:00 |
ZhangBiao
|
06d532a9bc
|
【命格】开坑
|
2021-12-06 14:06:23 +08:00 |
ZhangBiao
|
6bf98e7c9f
|
【修行】结构修改
|
2021-12-06 13:02:18 +08:00 |
jiaoyangna
|
2c83c873b9
|
时间修改提交
|
2021-12-06 10:32:31 +08:00 |
jiaoyangna
|
7e1cac4cbe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 09:58:25 +08:00 |
jiaoyangna
|
6309159f77
|
方寸寻宝修改提交
|
2021-12-06 09:58:04 +08:00 |
ZhangBiao
|
011c8d7f5d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-03 19:01:27 +08:00 |
ZhangBiao
|
e2ec6d9765
|
【连购礼包】奖励靠左
|
2021-12-03 19:01:17 +08:00 |
jiaoyangna
|
b19801639d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-03 18:03:53 +08:00 |
jiaoyangna
|
660bbdf997
|
方寸寻宝修改提交
|
2021-12-03 18:03:36 +08:00 |
ZhangBiao
|
7348534847
|
【去除多余活动信息】
|
2021-12-03 16:46:40 +08:00 |
ZhangBiao
|
8e7afd757d
|
【连购礼包】提交
|
2021-12-03 13:21:15 +08:00 |
ZhangBiao
|
ed5e0f6ab1
|
Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
|
2021-12-03 10:00:31 +08:00 |
ZhangBiao
|
4c7b379ce7
|
【灵脉秘境】1号灵脉的灵气数值超框
|
2021-12-02 19:49:49 +08:00 |
ZhangBiao
|
55f2e6e783
|
Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-12-02 17:16:00 +08:00 |
jiaoyangna
|
aa0e501b4b
|
ID1019319】
【神将情报】神将到达330级时情报右侧显示提示应为“最高等级”
|
2021-12-02 16:01:01 +08:00 |
jiaoyangna
|
7b8306f98a
|
【ID1010715】
【公会信息优化】公会名称底框右侧添加编辑图标
|
2021-12-02 15:31:23 +08:00 |
jiaoyangna
|
1253466912
|
天地烘炉提交
|
2021-12-02 15:18:56 +08:00 |
ZhangBiao
|
f431eea90c
|
【连购礼包】提交
|
2021-12-02 14:03:38 +08:00 |
ZhangBiao
|
63bf32f335
|
【战斗】白片尝试修改
|
2021-12-01 13:59:22 +08:00 |
gaoxin
|
2e2c4292b6
|
【引导】修复修为引导位置错误
|
2021-11-30 21:27:26 +08:00 |
jiaoyangna
|
658a655f2c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 17:18:06 +08:00 |
jiaoyangna
|
76a94a227e
|
文字大小修改
|
2021-11-29 17:17:50 +08:00 |
wangzhenxing
|
ac32149aa8
|
[立绘朝向]=====皮肤,敌方立绘朝向修改
|
2021-11-29 17:07:28 +08:00 |
jiaoyangna
|
bce0b9b9ff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 16:35:39 +08:00 |
jiaoyangna
|
ff48e4c11f
|
天地烘炉修改提交
|
2021-11-29 16:35:23 +08:00 |
gaoxin
|
bead1c571a
|
【对话】显示异常修复
|
2021-11-29 15:57:54 +08:00 |
gaoxin
|
c035221989
|
【剧情】立绘和文字出现的节奏调整
|
2021-11-29 13:50:29 +08:00 |
gaoxin
|
0d1c025624
|
【活动】连续礼包,添加
|
2021-12-02 01:44:29 +08:00 |
ZhangBiao
|
a8e619b8c6
|
【乾坤宝盒】去除珍奇宝阁
|
2021-11-27 17:03:58 +08:00 |
luyao
|
352de7108e
|
【神将头像朝向修改左>右】
|
2021-11-27 16:45:05 +08:00 |
ZhangBiao
|
1775784bcd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-27 16:34:59 +08:00 |
jiaoyangna
|
41ae610a31
|
变身卡界面修改提交
|
2021-11-27 16:14:59 +08:00 |
jiaoyangna
|
12e091408d
|
层级修改
|
2021-11-27 15:37:48 +08:00 |
ZhangBiao
|
d8956e0fe2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-27 15:31:17 +08:00 |
ZhangBiao
|
b83dc76f7b
|
【灵兽特惠】时间显示修改
|
2021-11-27 15:30:49 +08:00 |
gaoxin
|
d253668aef
|
【战斗】修复按钮被立绘遮挡
|
2021-11-27 15:13:35 +08:00 |
jiaoyangna
|
f6c0b80512
|
位置修改提交
|
2021-11-27 14:32:57 +08:00 |
jiaoyangna
|
0c6ff17ddd
|
修改提交
|
2021-11-27 14:30:51 +08:00 |
jiaoyangna
|
767d4589c7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-27 13:54:56 +08:00 |
jiaoyangna
|
04987414e9
|
图片修改提交
|
2021-11-27 13:54:36 +08:00 |
gaoxin
|
060a380305
|
【战斗】跳过按钮进度显示优化
|
2021-11-26 19:41:10 +08:00 |
jiaoyangna
|
f6c94a3cfe
|
变身卡详情提交
|
2021-11-26 19:36:20 +08:00 |
jiaoyangna
|
80fb3c9108
|
添加tips
|
2021-11-26 18:20:03 +08:00 |
gaoxin
|
0ddf804234
|
【战斗】战斗结构调整
|
2021-11-26 17:20:28 +08:00 |
jiaoyangna
|
2814265ba7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 17:06:24 +08:00 |
jiaoyangna
|
5542212cc1
|
天地烘炉提交
|
2021-11-26 17:04:54 +08:00 |
ZhangBiao
|
7e1039bf3b
|
【灵脉秘境】特效
|
2021-11-26 15:43:39 +08:00 |
ZhangBiao
|
5c7ba2529d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 15:15:23 +08:00 |
ZhangBiao
|
b33ee1b006
|
【灵脉秘境】特效提交
|
2021-11-26 15:15:10 +08:00 |
jiaoyangna
|
b63b619426
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 14:11:37 +08:00 |
jiaoyangna
|
b6bcd50dd3
|
身外化身修改提交
|
2021-11-26 14:11:23 +08:00 |
gaoxin
|
15b3718dd8
|
【测试战斗】添加一些特效配置的参数
|
2021-11-26 13:59:18 +08:00 |
jiaoyangna
|
14b54c7d5e
|
变身卡名字颜色修改
|
2021-11-26 13:18:45 +08:00 |
jiaoyangna
|
a15ca8407e
|
标题位置调整
|
2021-11-26 13:08:48 +08:00 |
jiaoyangna
|
def89bf7e3
|
身外化身提交
|
2021-11-26 12:51:52 +08:00 |
jiaoyangna
|
2212df06ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:39:24 +08:00 |
jiaoyangna
|
1e17151d7f
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-11-26 11:35:57 +08:00 |
jiaoyangna
|
964a1b4fde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:34:57 +08:00 |
jiaoyangna
|
b78e2335fa
|
身外化身提交
|
2021-11-26 11:34:25 +08:00 |
ZhangBiao
|
c8fa05d5a0
|
【固定活动】提交
|
2021-11-26 11:09:22 +08:00 |
jiaoyangna
|
c0c8a6710c
|
身外化身提交
|
2021-11-26 11:08:48 +08:00 |
ZhangBiao
|
7ef385ac53
|
【固定活动】提交
|
2021-11-26 10:34:41 +08:00 |
ZhangBiao
|
45df1fb982
|
【寻仙招募】增加心愿阵营条
|
2021-11-26 09:54:12 +08:00 |
jiaoyangna
|
8a3ca0cb97
|
天地洪炉提交
|
2021-11-25 19:06:20 +08:00 |
jiaoyangna
|
34949242a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-11-25 18:57:48 +08:00 |
jiaoyangna
|
fd22b5a87f
|
天地洪炉提交
|
2021-11-25 18:55:20 +08:00 |
ZhangBiao
|
db5627ab24
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 18:51:46 +08:00 |
ZhangBiao
|
fd97f584cb
|
【固定活动】调整
|
2021-11-25 18:51:36 +08:00 |
wangzhenxing
|
7949e8c21c
|
【战斗】========灵兽卡面翻转提交
|
2021-11-25 18:47:53 +08:00 |
wangzhenxing
|
6927b52365
|
[战斗]=======主角变身卡添加gm
|
2021-11-25 18:36:00 +08:00 |
ZhangBiao
|
cb331c612e
|
【删除活动类那个43】
|
2021-11-25 16:51:35 +08:00 |
jiaoyangna
|
a248330241
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
|
2021-11-25 16:10:14 +08:00 |
ZhangBiao
|
8da0a81588
|
【寻仙抽】提交
|
2021-11-25 15:59:31 +08:00 |
gaoxin
|
b316f54e50
|
【战斗】护盾特效层级问题优化
|
2021-11-25 14:46:46 +08:00 |
ZhangBiao
|
0f0f08b260
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 11:52:45 +08:00 |
ZhangBiao
|
1c9d113a86
|
【活动、修为】界面调整
|
2021-11-25 11:52:35 +08:00 |
gaoxin
|
53648fbbe3
|
【每日豪礼】预设文字替换
|
2021-11-25 11:20:00 +08:00 |
ZhangBiao
|
0d3f9c36ad
|
【灵脉秘境】背景图
|
2021-11-24 18:43:59 +08:00 |
ZhangBiao
|
ac768ff163
|
【常驻活动】提交
|
2021-11-24 18:14:25 +08:00 |
ZhangBiao
|
2d25ebb61b
|
【修为】修为调整
|
2021-11-24 11:30:55 +08:00 |
ZhangBiao
|
60c12192af
|
【灵脉秘境】记录时间文字不显示修改
|
2021-11-23 10:43:38 +08:00 |
jiaoyangna
|
e88f1f7b01
|
【ID1019276】
【法宝聚灵】改排版后,返回按钮遮挡技能描述
|
2021-11-23 10:31:09 +08:00 |
jiaoyangna
|
5e8f8c59a1
|
添加底图
|
2021-11-22 15:48:54 +08:00 |
wangzhenxing
|
f980485ce2
|
[战斗表现]========足下阴影显示修改
|
2021-11-22 15:18:44 +08:00 |
jiaoyangna
|
9abd87c14b
|
战力添加
|
2021-11-22 15:06:44 +08:00 |
jiaoyangna
|
7647b0057e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 14:15:55 +08:00 |
jiaoyangna
|
85ef5170bb
|
文字修改提交
|
2021-11-22 14:15:26 +08:00 |
ZhangBiao
|
025edbcacf
|
【灵脉秘境】界面修改、红点修改
|
2021-11-22 14:13:49 +08:00 |
jiaoyangna
|
112f7fd196
|
滑动修改提交
|
2021-11-22 14:11:40 +08:00 |
jiaoyangna
|
a568ec1707
|
隐藏特效底
|
2021-11-22 14:01:40 +08:00 |
ZhangBiao
|
aa52131d3f
|
【灵脉秘境】文字遮挡、跳转
|
2021-11-22 13:27:54 +08:00 |
jiaoyangna
|
047e5cbe72
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 11:46:56 +08:00 |
jiaoyangna
|
0d073eb323
|
属性界面修改提交i
|
2021-11-22 11:44:48 +08:00 |
gaoxin
|
f78031984a
|
【背包】法宝聚灵页签添加
|
2021-11-22 11:18:28 +08:00 |
jiaoyangna
|
e61de063cf
|
法宝聚灵修改提交
|
2021-11-22 11:01:43 +08:00 |
jiaoyangna
|
8c10c104d8
|
适配修改
|
2021-11-19 19:10:05 +08:00 |
jiaoyangna
|
6916a5f95a
|
适配修改提交
|
2021-11-19 19:08:11 +08:00 |
jiaoyangna
|
4a36c62362
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-19 18:52:12 +08:00 |
ZhangBiao
|
c9faa2e74d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-19 18:43:01 +08:00 |
ZhangBiao
|
a334b3536f
|
【灵脉秘境】界面设配调整
|
2021-11-19 18:42:50 +08:00 |
jiaoyangna
|
2978dc203c
|
添加特效,添加点击事件
|
2021-11-19 18:32:22 +08:00 |
jiaoyangna
|
5ef8b89239
|
文字位置修改提交
|
2021-11-19 18:15:19 +08:00 |
jiaoyangna
|
db0fcea43e
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-19 18:01:59 +08:00 |
ZhangBiao
|
f1737b1c5d
|
【灵脉秘境】提交
|
2021-11-19 17:48:56 +08:00 |
jiaoyangna
|
c058e0ac74
|
底图修改提交
|
2021-11-19 17:39:38 +08:00 |
ZhangBiao
|
95f71667fe
|
【灵脉秘境】提交
|
2021-11-19 17:23:06 +08:00 |
jiaoyangna
|
d62584866e
|
星星缺少修改
|
2021-11-19 17:17:28 +08:00 |
jiaoyangna
|
467dd1aebb
|
添加特效提交
|
2021-11-19 17:08:14 +08:00 |
ZhangBiao
|
9f356783e1
|
【灵脉秘境】提交
|
2021-11-19 17:01:10 +08:00 |
jiaoyangna
|
bc62311af9
|
法宝之魂第二个界面提交
|
2021-11-19 16:52:15 +08:00 |
ZhangBiao
|
c8d4cadb2b
|
【灵脉秘境】提交
|
2021-11-19 15:38:41 +08:00 |
jiaoyangna
|
d69b3c8ca5
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-11-19 14:35:42 +08:00 |
ZhangBiao
|
c9e465f662
|
【灵脉秘境】提交
|
2021-11-19 11:45:53 +08:00 |
jiaoyangna
|
9e99347a2b
|
法宝聚灵提交
|
2021-11-19 11:37:26 +08:00 |
jiaoyangna
|
808dcddc62
|
法宝聚灵界面1提交
|
2021-11-19 11:33:34 +08:00 |
ZhangBiao
|
6454e84172
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 19:07:50 +08:00 |
ZhangBiao
|
fc704b98c3
|
【灵脉秘境】资源提交
|
2021-11-18 19:07:19 +08:00 |
ZhangBiao
|
c994c9e636
|
【灵脉秘境】提交
|
2021-11-18 18:43:22 +08:00 |
wangzhenxing
|
45bc2139a6
|
[战斗表现]=========我方前排血条位置修改
|
2021-11-18 18:37:14 +08:00 |
wangzhenxing
|
b74561d70b
|
[战斗表现]===============敌我前后排立绘缩放大小固定
|
2021-11-18 18:29:13 +08:00 |