luyao
|
a307674de8
|
新按钮 已完成状态
|
2022-04-21 18:32:25 +08:00 |
luyao
|
8fe5b43449
|
新 按钮(前往、可领取、已完成)
|
2022-04-21 18:21:08 +08:00 |
luyao
|
cb3576eb58
|
新底板拆分
|
2022-04-21 14:27:03 +08:00 |
luyao
|
023ba719d4
|
tips弹窗资源
|
2022-04-21 14:14:19 +08:00 |
wangzhenxing
|
9999138d97
|
[资源]=======新提示背景框提交
|
2022-04-21 13:41:59 +08:00 |
luyao
|
7ef0eac7f1
|
变身卡 【变】字角标(规格同阵营元素图标)
|
2022-04-21 11:22:12 +08:00 |
luyao
|
47e8205e8a
|
回合挑战、伤害挑战 标题
挑战副本标题
|
2022-04-21 11:18:03 +08:00 |
luyao
|
d99e434172
|
2022年新图标(魂印、法宝、神印、装备)
|
2022-04-21 11:13:29 +08:00 |
luyao
|
15672af59a
|
回合挑战、伤害挑战图标(各2个,选中,未选中状态)
|
2022-04-21 11:11:54 +08:00 |
yuanshuai
|
bf52645eb7
|
挑战副本优化
|
2022-04-25 18:20:53 +08:00 |
yuanshuai
|
c5b0d30f9c
|
资源提交
|
2022-04-19 13:39:48 +08:00 |
gaoxin
|
81f76cc4dc
|
【限时折扣】主界面按钮资源修改添加特效
|
2022-03-15 13:37:13 +08:00 |
wangzhenxing
|
4ed698b567
|
[资源]======buff图片提交
|
2022-03-14 16:07:35 +08:00 |
jiaoyangna
|
fd0ee200ac
|
【ID1011218】
天书秘卷功能图标位置调整
|
2022-03-10 16:15:07 +08:00 |
jiaoyangna
|
1c0ce769c3
|
山河试炼页签修改提交
|
2022-03-03 10:34:19 +08:00 |
jiaoyangna
|
3b0871ad17
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 18:08:56 +08:00 |
jiaoyangna
|
6b4cf31c3c
|
【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
|
2022-03-02 17:48:52 +08:00 |
张彪
|
e4e23c8ac7
|
【易经宝库】改页签名字
|
2022-03-02 17:33:08 +08:00 |
jiaoyangna
|
d0720e17b2
|
【ID1011178】
至尊降世活动拉到1000档
|
2022-02-23 17:24:34 +08:00 |
张彪
|
6044ee2828
|
【战力冲刺】图标提交
|
2022-02-18 18:11:18 +08:00 |
张彪
|
4ca27d13ad
|
【战力冲刺】提交
|
2022-02-18 16:27:49 +08:00 |
jiaoyangna
|
22f070e13b
|
资源提交
|
2022-02-16 14:28:08 +08:00 |
gaoxin
|
67c855ad56
|
【资源】特惠商城资源替换
|
2022-02-23 18:36:30 +08:00 |
jiaoyangna
|
3a9acbdf19
|
签到好礼提交
|
2022-01-21 18:49:40 +08:00 |
wangzhenxing
|
b64234bcb8
|
[飞升]=====特效修改提交
|
2022-01-20 18:18:40 +08:00 |
wangzhenxing
|
e734c4a03d
|
[飞升]=======飞升修改
|
2022-01-20 11:41:20 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
ZhangBiao
|
60df01190d
|
【家园】资源替换
|
2022-01-18 15:19:19 +08:00 |
jiaoyangna
|
ac24c2e0ce
|
【ID1010998】
【春节活动】签到领奖活动
|
2022-01-18 14:48:27 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
wangzhenxing
|
2df3e777db
|
[图片]====记录按钮资源修改
|
2022-01-15 16:38:45 +08:00 |
wangzhenxing
|
1ef962d688
|
【图鉴】====飞升通用图标资源修改
|
2022-01-15 16:05:54 +08:00 |
ZhangBiao
|
c373f8d014
|
【修改】提交
|
2022-01-15 15:05:26 +08:00 |
ZhangBiao
|
756dc54595
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 14:35:21 +08:00 |
ZhangBiao
|
f4c1b9d097
|
【修改】提交
|
2022-01-15 14:34:55 +08:00 |
wangzhenxing
|
e8f8f5ca59
|
[图鉴]=====图鉴详情修改提交
|
2022-01-15 14:32:55 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
ZhangBiao
|
9d8586008d
|
【家园】资源替换
|
2022-01-14 17:51:56 +08:00 |
ZhangBiao
|
cbea9006b3
|
【家园】资源替换
|
2022-01-14 17:38:46 +08:00 |
ZhangBiao
|
dddbe9f223
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:20:18 +08:00 |
ZhangBiao
|
9ec22eee1f
|
【好感度】引导
|
2022-01-14 17:20:06 +08:00 |
jiaoyangna
|
e6791caf3f
|
图片修改提交
|
2022-01-14 17:08:41 +08:00 |
jiaoyangna
|
3f267894a8
|
神将修改提交
|
2022-01-14 16:14:52 +08:00 |
jiaoyangna
|
053de388f2
|
神将修改提交
|
2022-01-14 14:52:56 +08:00 |
jiaoyangna
|
7556405e8b
|
切图修改
|
2022-01-14 13:45:12 +08:00 |
jiaoyangna
|
5252dbe400
|
技能添加底图
|
2022-01-14 13:20:32 +08:00 |
jiaoyangna
|
981aba2417
|
神将情报修改提交
|
2022-01-14 11:26:13 +08:00 |
jiaoyangna
|
ed63358ab6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Icon/LinshiSkill/linshi_2000340_xy.png.meta
# Assets/ManagedResources/Icon/LinshiSkill/linshi_8810_hh.png.meta
# Assets/ManagedResources/Icon/LinshiSkill/linshi_ysz_7.png.meta
|
2022-01-14 10:19:54 +08:00 |
jiaoyangna
|
e4ea506ed1
|
神将情报修改提交
|
2022-01-14 10:17:19 +08:00 |