zhangqiang
|
580b43eff8
|
跨服排行榜里,查看玩家信息,战力显示超框问题
|
2021-07-30 10:33:29 +08:00 |
jiaoyangna
|
a7b8bb88fc
|
四元阵适配修改
|
2021-07-30 10:29:55 +08:00 |
jiaoyangna
|
19628fdcbd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 10:25:32 +08:00 |
jiaoyangna
|
89cf45bf35
|
四元阵适配修改
|
2021-07-30 10:25:29 +08:00 |
zhangqiang
|
23d4f9548f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 10:21:45 +08:00 |
zhangqiang
|
edbfbc9afc
|
【主城优化】跨服战入口变更位置
|
2021-07-30 10:20:35 +08:00 |
jiaoyangna
|
97c5e11f5c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 18:36:45 +08:00 |
jiaoyangna
|
0480506f53
|
【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
|
2021-07-29 18:36:30 +08:00 |
zhangqiang
|
8b56e352ba
|
【跨服排行榜】
|
2021-07-29 17:11:10 +08:00 |
zhangqiang
|
c11d9849fd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-07-29 16:38:35 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
jiaoyangna
|
44119d5a28
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 15:21:48 +08:00 |
jiaoyangna
|
01632378f6
|
魂印分解界面修改
|
2021-07-29 15:21:44 +08:00 |
ZhangBiao
|
c6598ecff4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 15:03:54 +08:00 |
ZhangBiao
|
49d4336f38
|
【限时召唤优化】调整适配,使部分屏幕内隐藏的召唤次数上限显示出来
|
2021-07-29 15:03:39 +08:00 |
jiaoyangna
|
856f03b494
|
【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
|
2021-07-29 15:01:58 +08:00 |
jiaoyangna
|
1cff130e45
|
【ID1017827】
【心魔试炼】dev分支心魔试炼界面底部白边
|
2021-07-29 14:38:13 +08:00 |
jiaoyangna
|
9a87435469
|
【ID1017808】
【天书秘卷】适配错误,文字超出显示区域
|
2021-07-29 14:16:07 +08:00 |
jiaoyangna
|
8ad1911755
|
文字大小调整
|
2021-07-29 13:55:50 +08:00 |
jiaoyangna
|
44965dd1c2
|
跨服十绝阵提交
|
2021-07-29 12:09:03 +08:00 |
jiaoyangna
|
43c4c159ed
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:27:42 +08:00 |
jiaoyangna
|
dd076dfb6a
|
立绘删除
|
2021-07-29 11:25:36 +08:00 |
ZhangBiao
|
68466c0fff
|
【副本界面】按钮调整
|
2021-07-29 11:18:53 +08:00 |
ZhangBiao
|
e1ae3e3bf3
|
【副本界面】按下区域大小调整
|
2021-07-29 10:09:02 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +08:00 |
jiaoyangna
|
55c839dcd0
|
Revert "Revert "红点修改提交""
This reverts commit d53776b558.
|
2021-07-28 16:59:07 +08:00 |
jiaoyangna
|
7ac8f03cd3
|
Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
|
2021-07-28 16:58:52 +08:00 |
jiaoyangna
|
ab7c586a90
|
Revert "Revert "装备界面改动""
This reverts commit 9a1d361c63.
|
2021-07-28 16:58:44 +08:00 |
jiaoyangna
|
93a9473184
|
红点修改提交
|
2021-07-28 16:52:41 +08:00 |
ZhangBiao
|
87e8496df0
|
【适配】优化神将升星提示在长屏手机的适配效果
|
2021-07-28 14:49:21 +08:00 |
jiaoyangna
|
eea24f126e
|
红点添加
|
2021-07-28 13:49:04 +08:00 |
jiaoyangna
|
1123d9dc2d
|
宝物修改提交
|
2021-07-28 11:52:47 +08:00 |
zhangqiang
|
0204573ad9
|
【玩家信息】跨服排行榜里,查看玩家信息,战力显示超框问题
|
2021-07-28 10:52:49 +08:00 |
jiaoyangna
|
527295f30c
|
宝物优化
|
2021-07-28 10:51:39 +08:00 |
jiaoyangna
|
d1845618d1
|
宝物可强化时,TIPS上的【强化】按钮未显示红点,精炼功能有相同问题
|
2021-07-27 18:53:36 +08:00 |
jiaoyangna
|
94c92a7f22
|
拥有可替换/战斗力较高的宝物时,应在宝物图标右上角,及下方的魂宝/灵宝按钮上显示红点,不应当在魂宝/灵宝装备格子上显示红点
|
2021-07-27 18:34:37 +08:00 |
jiaoyangna
|
917662ff20
|
宝物培养红点提交
|
2021-07-26 17:16:29 +08:00 |
zhangqiang
|
b54f3ca07a
|
【跨服天梯】主界面
|
2021-07-27 11:34:46 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
ZhangBiao
|
74c713c65b
|
【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度
|
2021-07-26 19:00:41 +08:00 |
ZhangBiao
|
11543e53a0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 11:09:20 +08:00 |
ZhangBiao
|
beea770b78
|
【竞技场】适配调整
|
2021-07-26 11:09:07 +08:00 |
jiaoyangna
|
9a1d361c63
|
Revert "装备界面改动"
This reverts commit c131d41d58.
|
2021-07-26 10:03:10 +08:00 |
jiaoyangna
|
4590076eb9
|
Revert "宝物培养修改提交"
This reverts commit bcd0651029.
|
2021-07-26 10:00:59 +08:00 |
jiaoyangna
|
d53776b558
|
Revert "红点修改提交"
This reverts commit 734efe7b52.
|
2021-07-26 10:00:07 +08:00 |
jiaoyangna
|
734efe7b52
|
红点修改提交
|
2021-07-24 19:36:34 +08:00 |
jiaoyangna
|
fd7d51168d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 19:12:46 +08:00 |
jiaoyangna
|
bcd0651029
|
宝物培养修改提交
|
2021-07-23 19:12:42 +08:00 |
wangzhenxing
|
ff6639ebfb
|
【称号】=====称号属性显示修改
|
2021-07-23 18:34:07 +08:00 |
ZhangBiao
|
25ace8439d
|
【公会】旗帜位置调整
|
2021-07-23 18:26:28 +08:00 |
wangzhenxing
|
3dc2970f1f
|
[功能]============15日登陆预告预设修改,整点自动刷新
|
2021-07-23 16:27:33 +08:00 |
zhangqiang
|
3b15f14d97
|
【跨服天梯】世界等级
|
2021-07-23 15:54:39 +08:00 |
wangzhenxing
|
887f071868
|
[功能]============15日登陆预告预设提交
|
2021-07-23 15:30:40 +08:00 |
zhangqiang
|
545e6cd8af
|
【跨服天梯】世界等级提交
|
2021-07-23 15:28:15 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +08:00 |
wangzhenxing
|
d0d533cecc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:08:03 +08:00 |
wangzhenxing
|
f7029c2ef0
|
[功能]==============15日登陆添加 预告
|
2021-07-23 11:07:46 +08:00 |
gaoxin
|
6461dbc161
|
【灵兽特惠】修复全面屏时间显示位置错误
|
2021-07-22 20:16:30 +08:00 |
gaoxin
|
0db39ccbe3
|
Merge branch 'china/ios' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
|
2021-07-22 19:39:14 +08:00 |
ZhangBiao
|
b0d10a29d2
|
【公会】公会按钮位置调整
|
2021-07-22 17:41:01 +08:00 |
ZhangBiao
|
056d3dc094
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 17:01:32 +08:00 |
ZhangBiao
|
789c6b3d91
|
【新副本界面】上方不可点击修改
|
2021-07-22 17:01:10 +08:00 |
jiaoyangna
|
997eae4e2c
|
已获得修改提交
|
2021-07-22 15:48:56 +08:00 |
ZhangBiao
|
db258d27cb
|
【副本界面】调整
|
2021-07-22 15:13:24 +08:00 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +08:00 |
ZhangBiao
|
5fa9f25c09
|
【点将台】白片修改
|
2021-07-22 10:53:27 +08:00 |
ZhangBiao
|
b7d7b3270a
|
【主题活动】分页处理
|
2021-07-22 10:36:35 +08:00 |
ZhangBiao
|
2bf92fdfdd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-21 18:37:25 +08:00 |
ZhangBiao
|
683e0eefc4
|
【心愿抽卡】界面调整
|
2021-07-21 18:37:15 +08:00 |
jiaoyangna
|
5150fd2edf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-21 18:27:17 +08:00 |
jiaoyangna
|
c131d41d58
|
装备界面改动
|
2021-07-21 18:27:03 +08:00 |
ZhangBiao
|
30edf664da
|
Merge branch 'china/dev' into 0优化/新增心愿神将提示
|
2021-07-21 18:26:34 +08:00 |
ZhangBiao
|
183cd238d3
|
【心愿抽卡】完成
|
2021-07-21 18:22:24 +08:00 |
jiaoyangna
|
1d2ed2a4f7
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 18:03:23 +08:00 |
jiaoyangna
|
8477043738
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 17:38:27 +08:00 |
ZhangBiao
|
b0e53312e7
|
【心愿抽卡】增加英雄加入卡池的天数条件
|
2021-07-21 17:35:38 +08:00 |
jiaoyangna
|
399d90809d
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 17:32:07 +08:00 |
jiaoyangna
|
d1abaf403c
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 17:23:14 +08:00 |
JLIOSM1
|
d680e5a507
|
Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
# Assets/StreamingAssets/Res/PackConfig.txt
# Assets/StreamingAssets/Res/_ReadMe.md
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
# Assets/StreamingAssets/Res/loading1.png
# Assets/StreamingAssets/Res/loading1.png.meta
# Assets/StreamingAssets/Res/loading2.png
# Assets/StreamingAssets/Res/loading2.png.meta
# Assets/StreamingAssets/Res/loading3.png
# Assets/StreamingAssets/Res/loading3.png.meta
# Assets/StreamingAssets/Res/loading4.png
# Assets/StreamingAssets/Res/loading4.png.meta
# Assets/StreamingAssets/Res/loading5.png
# Assets/StreamingAssets/Res/loading5.png.meta
# Assets/StreamingAssets/Res/loading6.png
# Assets/StreamingAssets/Res/loading6.png.meta
# Assets/StreamingAssets/Res/loading_caohua.png.meta
# Assets/StreamingAssets/Res/loading_xipu.png.meta
# Assets/StreamingAssets/Res/login_caohua.png.meta
# Assets/StreamingAssets/Res/login_video.mp4.meta
# Assets/StreamingAssets/Res/login_xipu.png.meta
|
2021-07-21 17:15:36 +08:00 |
JLIOSM1
|
557d19910d
|
【屏幕适配】优化剧情界面在宽屏设备下的显示
|
2021-07-21 11:30:13 +08:00 |
zhangqiang
|
a359ff284f
|
【跨服主城按钮修改】
|
2021-07-20 18:32:02 +08:00 |
zhangqiang
|
b395410ac1
|
Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-20 18:09:07 +08:00 |
jiaoyangna
|
7cf1150c52
|
四元阵预设修改提交
|
2021-07-20 12:37:14 +08:00 |
wangzhenxing
|
38d384e9a7
|
[bug]=========【ID1017466】
【首充按钮】武将预览修改成神将预览
|
2021-07-19 17:34:04 +08:00 |
luyao
|
9a65f93211
|
玲珑宝镜修改
|
2021-07-16 19:12:35 +08:00 |
jiaoyangna
|
05d12558b7
|
玲珑宝镜
|
2021-07-16 19:03:41 +08:00 |
jiaoyangna
|
f631bb3c15
|
玲珑宝镜修改提交
|
2021-07-16 18:11:50 +08:00 |
jiaoyangna
|
6ed3b05885
|
四元阵修改提交
|
2021-07-16 17:59:22 +08:00 |
jiaoyangna
|
ea704d62c3
|
Revert "四元阵修改提交"
This reverts commit f33d64871a.
|
2021-07-16 17:58:13 +08:00 |
jiaoyangna
|
f33d64871a
|
四元阵修改提交
|
2021-07-16 17:57:45 +08:00 |
jiaoyangna
|
05358f15f5
|
玲珑宝镜修改提交
|
2021-07-16 17:52:33 +08:00 |
jiaoyangna
|
a2fa26e67e
|
玲珑宝镜修改提交
|
2021-07-16 17:41:38 +08:00 |
wangzhenxing
|
a70f45e7a5
|
[乾坤宝盒]==========提示文字颜色修改
|
2021-07-16 16:19:59 +08:00 |
jiaoyangna
|
2d6f5f3fb1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-16 15:51:12 +08:00 |
jiaoyangna
|
bec2eca580
|
适配修改
|
2021-07-16 15:51:06 +08:00 |
wangzhenxing
|
d6226e77bf
|
[乾坤宝盒]=====魂印详情修改提交
|
2021-07-16 15:11:53 +08:00 |
DESKTOP-98AVA47\Administrator
|
324ba7bc57
|
文字内容修改提交
|
2021-07-16 15:04:09 +08:00 |
DESKTOP-98AVA47\Administrator
|
aae52de39b
|
去掉已获得屏蔽
|
2021-07-16 14:46:21 +08:00 |
DESKTOP-98AVA47\Administrator
|
b253745ab0
|
超值基金特效修改
|
2021-07-16 14:28:26 +08:00 |
DESKTOP-98AVA47\Administrator
|
0aa779f177
|
添加左右切换按钮
|
2021-07-16 14:18:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
0a4ef7e68d
|
心愿抽卡修改提交
|
2021-07-16 11:40:08 +08:00 |
DESKTOP-98AVA47\Administrator
|
89925e511a
|
抽卡调整
|
2021-07-16 10:15:59 +08:00 |
DESKTOP-98AVA47\Administrator
|
e7187d75c4
|
预设调整,左右红点切换界面调整
|
2021-07-16 10:12:41 +08:00 |
luyao
|
b8afca215b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 21:10:50 +08:00 |
luyao
|
2fbecd6584
|
文字修改提交
|
2021-07-15 21:10:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
af7e58f531
|
位置修改
|
2021-07-15 21:02:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
08b9873d25
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 20:48:51 +08:00 |
DESKTOP-98AVA47\Administrator
|
53dadfff49
|
抽卡修改提交
|
2021-07-15 20:48:46 +08:00 |
wangzhenxing
|
908f15bf49
|
[乾坤宝盒]===========预设特效修改提交
|
2021-07-15 20:17:51 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b413e06e2
|
神将抽加号修改
|
2021-07-15 20:08:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
dda2c78b05
|
预设修改提交
|
2021-07-15 19:59:54 +08:00 |
ZhangBiao
|
9cfca39bb1
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-15 19:48:59 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
DESKTOP-98AVA47\Administrator
|
385dcb9c90
|
位置修改交
|
2021-07-15 19:47:04 +08:00 |
ZhangBiao
|
88bd6a9801
|
【新副本】完成?
|
2021-07-15 19:46:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b97a35ce8
|
mata 文件修改提交
|
2021-07-15 19:44:55 +08:00 |
DESKTOP-98AVA47\Administrator
|
6d4bf07c21
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 19:38:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
01a2171a31
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 19:33:34 +08:00 |
DESKTOP-98AVA47\Administrator
|
695a61abaa
|
Merge branch '0优化/主题活动' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
2021-07-15 18:52:59 +08:00 |
DESKTOP-98AVA47\Administrator
|
c5ceba8603
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 18:51:51 +08:00 |
DESKTOP-98AVA47\Administrator
|
7eb776f699
|
【ID1009829】
升星界面的进阶要求改成进阶预览
|
2021-07-15 18:23:17 +08:00 |
wangzhenxing
|
fe8714f7fa
|
[乾坤宝盒]========优化提交
|
2021-07-15 16:43:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
4bd4f1f483
|
Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-15 16:24:35 +08:00 |
ZhangBiao
|
109a109301
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/StreamingAssets/Android.meta
|
2021-07-15 16:19:05 +08:00 |
DESKTOP-98AVA47\Administrator
|
25ffe0ff1f
|
玲珑宝镜特效提交
|
2021-07-15 15:58:01 +08:00 |
ZhangBiao
|
e3baabda96
|
【副本界面】特效提交
|
2021-07-15 15:25:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
25939d4d25
|
玲珑宝镜特效上传
|
2021-07-15 14:44:19 +08:00 |
ZhangBiao
|
37dd3100b9
|
【心愿抽卡】文字内容颜色调整
|
2021-07-15 13:44:46 +08:00 |
DESKTOP-98AVA47\Administrator
|
36f04065fc
|
Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-07-15 12:59:20 +08:00 |
ZhangBiao
|
32654b045a
|
抽卡资源提交
|
2021-07-15 11:57:24 +08:00 |
wangzhenxing
|
c3da0a2df8
|
[乾坤宝盒]=============优化提交
|
2021-07-15 11:14:32 +08:00 |
skuld
|
7845904c32
|
红点位置修改提交
|
2021-07-15 10:48:07 +08:00 |
wangzhenxing
|
e0d680da50
|
[乾坤宝盒]=============功能提交
|
2021-07-14 18:20:04 +08:00 |
ZhangBiao
|
bc55cf3a19
|
Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-07-14 18:08:46 +08:00 |
jiaoyangna
|
7d5968f058
|
超值基金
(cherry picked from commit 7cca06a5d7)
|
2021-07-14 17:00:22 +08:00 |
jiaoyangna
|
977faf9b04
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit ff14ff62ee)
|
2021-07-14 17:00:07 +08:00 |
jiaoyangna
|
a8fd256812
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit 53e0f1adcc)
|
2021-07-14 16:59:59 +08:00 |
jiaoyangna
|
047c5c26f7
|
globaldefine冲突修改
|
2021-07-14 16:59:03 +08:00 |
jiaoyangna
|
6aea37d365
|
Revert "Revert "超值基金提交""
This reverts commit 23fa4e0ab1.
|
2021-07-14 16:56:27 +08:00 |
jiaoyangna
|
7cca06a5d7
|
超值基金
|
2021-07-14 16:09:55 +08:00 |
jiaoyangna
|
ff14ff62ee
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 14:07:44 +08:00 |
jiaoyangna
|
53e0f1adcc
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 12:04:37 +08:00 |
ZhangBiao
|
c8b8a84d47
|
【山河试炼】差红点检测
|
2021-07-14 11:36:33 +08:00 |
ZhangBiao
|
227def7404
|
【山河试炼】代码提交
|
2021-07-14 11:33:33 +08:00 |
ZhangBiao
|
f90babe2e8
|
Revert "Revert "【山河试炼】界面提交""
This reverts commit 3dc9dd5d64.
|
2021-07-14 11:30:35 +08:00 |
ZhangBiao
|
6be1886d2f
|
【山河试炼】开坑
|
2021-07-14 11:30:09 +08:00 |
zhangqiang
|
f7932b9e8c
|
【罗浮争锋】国内提交+1
|
2021-07-13 17:40:25 +08:00 |
jiaoyangna
|
9f4d456004
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-13 17:25:21 +08:00 |
jiaoyangna
|
23fa4e0ab1
|
Revert "超值基金提交"
This reverts commit 75ffbf8d0b.
|
2021-07-13 14:39:31 +08:00 |
zhangqiang
|
5162b3247c
|
【跨服天梯】国内提交+1
|
2021-07-13 11:28:36 +08:00 |
jiaoyangna
|
4ff85486ed
|
【ID1009791】
幸运探宝够12张券时开启红点提示
(cherry picked from commit 877ec25063)
|
2021-07-13 10:39:30 +08:00 |
jiaoyangna
|
877ec25063
|
【ID1009791】
幸运探宝够12张券时开启红点提示
|
2021-07-13 10:35:39 +08:00 |
jiaoyangna
|
db2f2312a7
|
超值基金提交
|
2021-07-12 17:29:14 +08:00 |
jiaoyangna
|
75ffbf8d0b
|
超值基金提交
|
2021-07-12 17:28:24 +08:00 |
jiaoyangna
|
5450b9201a
|
心愿添加问号确认按钮
|
2021-07-10 18:50:39 +08:00 |
jiaoyangna
|
f710e20c60
|
抽卡红点提交
|
2021-07-10 18:12:50 +08:00 |
jiaoyangna
|
429bbb32cd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-09 18:38:19 +08:00 |
jiaoyangna
|
ee344a1a39
|
神将界面切换遮罩修改
(cherry picked from commit 513cd35d5c)
|
2021-07-09 18:38:15 +08:00 |
jiaoyangna
|
513cd35d5c
|
神将界面切换遮罩修改
|
2021-07-09 18:37:53 +08:00 |
gaoxin
|
e8a86baed8
|
【物品特效】修复魂印界面特效显示位置错误
|
2021-07-09 18:33:14 +08:00 |
gaoxin
|
1d739a9d9d
|
【物品特效】魂印各界面显示修改
|
2021-07-09 18:28:18 +08:00 |
jiaoyangna
|
21b85bedff
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移 调整间距
(cherry picked from commit eae0af74e5)
|
2021-07-09 14:47:17 +08:00 |
jiaoyangna
|
eae0af74e5
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移 调整间距
|
2021-07-09 14:45:11 +08:00 |
gaoxin
|
5d60ef45ab
|
【地图】添加第27号事件点
|
2021-07-09 14:37:40 +08:00 |
jiaoyangna
|
894e7d7c46
|
抽卡动画播放时。去掉跳过按钮,改为点击屏幕任意位置,即可跳过动画,界面内增加
|
2021-07-09 13:39:24 +08:00 |
jiaoyangna
|
30ab410f00
|
抽卡优化
|
2021-07-08 18:40:43 +08:00 |
ZhangBiao
|
52a7b26e0a
|
【新副本】预设修改
|
2021-07-08 11:30:03 +08:00 |
zhangqiang
|
7c7e0970a2
|
【跨服天梯】国内提交替换资源 。。。。
|
2021-07-08 10:36:33 +08:00 |
ZhangBiao
|
f44a8c280f
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-07 18:42:13 +08:00 |
ZhangBiao
|
6950b52db9
|
【新副本】基本完成
|
2021-07-07 17:05:32 +08:00 |
zhangqiang
|
803fcee6bf
|
【碎片图标】点击碎片图标弹出弹窗,再点击弹窗中图标,显示错误
|
2021-07-07 15:16:31 +08:00 |
ZhangBiao
|
656c6a00d2
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-07 14:44:00 +08:00 |
ZhangBiao
|
3732c7c4ca
|
【新副本】界面提交
|
2021-07-07 14:43:37 +08:00 |
ZhangBiao
|
a711f13642
|
【新副本】资源重新提交
|
2021-07-07 13:50:11 +08:00 |
jiaoyangna
|
2042f3ace8
|
Merge branch '0优化/主题活动' into china/dev
|
2021-07-07 11:57:31 +08:00 |
ZhangBiao
|
6a3c7903f5
|
【新副本】资源提交
|
2021-07-06 18:32:23 +08:00 |
ZhangBiao
|
6dd996b752
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-06 16:31:24 +08:00 |
gaoxin
|
8297176603
|
Merge remote-tracking branch 'origin/china/quick' into china/dev
# Conflicts:
# Assets/Editor/AutoPack.cs
# Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt
# Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png
# Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-07-06 15:37:43 +08:00 |
gaoxin
|
9c58070aa8
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
# Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
# Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
|
2021-07-06 15:27:09 +08:00 |
jiaoyangna
|
bc34bdce69
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-06 15:19:56 +08:00 |
ZhangBiao
|
7b66ae5db4
|
【副本】新界面
|
2021-07-06 14:47:10 +08:00 |
jiaoyangna
|
3219a1a2b8
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-06 14:43:45 +08:00 |
ZhangBiao
|
3620c4095e
|
【副本】新副本界面开坑
|
2021-07-06 11:55:21 +08:00 |
jiaoyangna
|
4ba69227f5
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 11:17:49 +08:00 |
zhangqiang
|
d29613e32a
|
【缥缈之旅】替换资源
|
2021-07-06 10:22:17 +08:00 |
ZhangBiao
|
241f780a15
|
【心愿抽卡】概率显示修改
|
2021-07-05 16:31:13 +08:00 |
ZhangBiao
|
48e3b63a08
|
【特惠神装】界面逻辑修改
|
2021-07-05 10:57:47 +08:00 |
zhangqiang
|
b519d3270c
|
【缥缈之旅】提交6
|
2021-07-03 20:02:13 +08:00 |
zhangqiang
|
de844aea18
|
【缥缈之旅】提交5
|
2021-07-03 19:23:15 +08:00 |
wangzhenxing
|
7d9edd42dd
|
[ui]==============心魔试炼适配修改提交
|
2021-07-03 18:28:18 +08:00 |
zhangqiang
|
6d5d480543
|
【缥缈之旅】提交4
|
2021-07-03 17:46:44 +08:00 |
wangzhenxing
|
c082a3c3d6
|
【功能】===========心魔试炼预设修改
|
2021-07-03 17:24:46 +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
|
2fbd5dd5e9
|
[战斗]============战斗伤害图片字修改提交
|
2021-07-03 14:50:03 +08:00 |
wangzhenxing
|
c266827b4e
|
[战斗]==========战斗文字材质球修改
|
2021-07-03 14:29:35 +08:00 |
zhangqiang
|
2f269ebfa8
|
【缥缈之旅】提交2
|
2021-07-03 12:37:56 +08:00 |
jiaoyangna
|
11bb11fb4b
|
每日礼包banner 替换
|
2021-07-02 13:50:41 +08:00 |
ZhangBiao
|
ffb80c8750
|
【特惠神装、心愿抽卡】适配、增加上方英雄长按
|
2021-07-02 11:54:33 +08:00 |
ZhangBiao
|
8cc655f107
|
【特惠神装】增加特效
|
2021-07-02 11:03:16 +08:00 |