DESKTOP-98AVA47\Administrator
|
25939d4d25
|
玲珑宝镜特效上传
|
2021-07-15 14:44:19 +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 |
luyao
|
3565338eb8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-14 18:25:34 +08:00 |
luyao
|
d9c3b4cefe
|
超值基金图片修改提交
|
2021-07-14 18:25:26 +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
|
f1a7e93595
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit ff8d774c2f)
|
2021-07-14 16:57:15 +08:00 |
jiaoyangna
|
6aea37d365
|
Revert "Revert "超值基金提交""
This reverts commit 23fa4e0ab1.
|
2021-07-14 16:56:27 +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 |
jiaoyangna
|
23fa4e0ab1
|
Revert "超值基金提交"
This reverts commit 75ffbf8d0b.
|
2021-07-13 14:39:31 +08:00 |
zhangqiang
|
60e6f0e186
|
【跨服天梯】国内提交+1
|
2021-07-13 13:31:00 +08:00 |
zhangqiang
|
5162b3247c
|
【跨服天梯】国内提交+1
|
2021-07-13 11:28:36 +08:00 |
jiaoyangna
|
ff8d774c2f
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-12 18:06:06 +08:00 |
jiaoyangna
|
db2f2312a7
|
超值基金提交
|
2021-07-12 17:29:14 +08:00 |
jiaoyangna
|
75ffbf8d0b
|
超值基金提交
|
2021-07-12 17:28:24 +08:00 |
jiaoyangna
|
5531dca914
|
【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置,增加特效突出效果
(cherry picked from commit eaf814bbfa)
|
2021-07-09 18:22:52 +08:00 |
jiaoyangna
|
eaf814bbfa
|
【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置,增加特效突出效果
|
2021-07-09 18:22:13 +08:00 |
jiaoyangna
|
751f7cd84b
|
【ID1009609】
【优化】无尽副本优化
(cherry picked from commit dd1f598515)
|
2021-07-09 17:11:23 +08:00 |
jiaoyangna
|
dd1f598515
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-09 15:22:10 +08:00 |
jiaoyangna
|
23c58e1bd0
|
九元露图片提交
(cherry picked from commit 75b93cdff1)
|
2021-07-08 18:41:24 +08:00 |
jiaoyangna
|
75b93cdff1
|
九元露图片提交
|
2021-07-08 18:39:39 +08:00 |
zhangqiang
|
7c7e0970a2
|
【跨服天梯】国内提交替换资源 。。。。
|
2021-07-08 10:36:33 +08:00 |
ZhangBiao
|
656c6a00d2
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-07 14:44:00 +08:00 |
ZhangBiao
|
a711f13642
|
【新副本】资源重新提交
|
2021-07-07 13:50:11 +08:00 |
ZhangBiao
|
6a3c7903f5
|
【新副本】资源提交
|
2021-07-06 18:32:23 +08:00 |
jiaoyangna
|
d55789480a
|
图片修改提交
|
2021-07-06 14:43:12 +08:00 |
ZhangBiao
|
3620c4095e
|
【副本】新副本界面开坑
|
2021-07-06 11:55:21 +08:00 |
jiaoyangna
|
cd8e1554de
|
图片提交
|
2021-07-06 11:22:53 +08:00 |
zhangqiang
|
d29613e32a
|
【缥缈之旅】替换资源
|
2021-07-06 10:22:17 +08:00 |
ZhangBiao
|
48e3b63a08
|
【特惠神装】界面逻辑修改
|
2021-07-05 10:57:47 +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 |
zhangqiang
|
2f269ebfa8
|
【缥缈之旅】提交2
|
2021-07-03 12:37:56 +08:00 |
ZhangBiao
|
f2dd26a329
|
【特惠神装】icon调整
|
2021-07-02 13:50:56 +08:00 |
jiaoyangna
|
0fc62c0dfa
|
来源图片修改提交
|
2021-07-02 13:47:04 +08:00 |
jiaoyangna
|
26ef0d21d0
|
图鉴神将来源修改提交
|
2021-07-02 10:16:12 +08:00 |
zhangqiang
|
1be2dc60eb
|
【缥缈之旅】提交1
|
2021-07-01 20:13:47 +08:00 |
ZhangBiao
|
a37fd67704
|
【特惠神装】基本完成
|
2021-07-01 19:56:28 +08:00 |
ZhangBiao
|
47f6335b55
|
Merge branch 'china/dev' into 0活动开发聚集地/特惠神装
|
2021-07-01 14:44:48 +08:00 |
jiaoyangna
|
652d754a13
|
玲珑宝镜修改提交
|
2021-07-01 10:28:11 +08:00 |
ZhangBiao
|
555ccd253f
|
【特惠神装】提交
|
2021-06-30 18:38:20 +08:00 |
wangzhenxing
|
2578107be4
|
【战斗】============战斗图片字显示修改
|
2021-06-30 18:06:56 +08:00 |
zhangqiang
|
dbe2b1f3ea
|
【心魔试炼】资源替换2
|
2021-06-30 16:29:37 +08:00 |
zhangqiang
|
bd27e2094b
|
【心魔试炼】资源替换
|
2021-06-30 16:03:40 +08:00 |
ZhangBiao
|
194c610b14
|
Merge branch 'china/dev' into 0功能/心愿抽卡
|
2021-06-30 11:00:00 +08:00 |
wangzhenxing
|
aeed1703bd
|
【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交
|
2021-06-30 10:40:52 +08:00 |
ZhangBiao
|
fc5a91522a
|
【心愿抽卡】提交
|
2021-06-29 20:29:22 +08:00 |
zhangqiang
|
a72f77c71d
|
【跨服天梯】国内提交4
|
2021-06-29 18:02:47 +08:00 |
jiaoyangna
|
8f226ad066
|
玲珑宝镜提交
|
2021-06-28 18:25:21 +08:00 |
ZhangBiao
|
65887aa135
|
【站内信】提交
|
2021-06-28 10:44:15 +08:00 |
wangzhenxing
|
a02de7de2f
|
[战斗]============战斗效果显示文字图片提交
|
2021-06-26 13:23:09 +08:00 |
ZhangBiao
|
74ef8bc129
|
【图标】图标大小跟其他不一致调整
|
2021-06-24 15:27:08 +08:00 |
ZhangBiao
|
097cf4055f
|
【灵兽界面优化】优化界面效果
|
2021-06-24 14:47:54 +08:00 |
jiaoyangna
|
77dea82a94
|
【ID1016745】
【升级豪礼】新到的图片资源,需要替换
|
2021-06-21 11:42:19 +08:00 |
jiaoyangna
|
45a1079d88
|
大圣提交
|
2021-06-18 18:55:04 +08:00 |
jiaoyangna
|
60b2cf1cf6
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
|
2021-06-18 18:27:01 +08:00 |
ZhangBiao
|
78d2efc59c
|
【惊喜礼盒】提交
|
2021-06-18 18:01:27 +08:00 |
ZhangBiao
|
683964cd8a
|
【惊喜礼盒】资源更换
|
2021-06-18 17:52:09 +08:00 |
jiaoyangna
|
09095e5b16
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
|
2021-06-18 11:08:40 +08:00 |
jiaoyangna
|
10c86e509a
|
超凡入圣修改提交
|
2021-06-18 10:50:04 +08:00 |
ZhangBiao
|
54bc0f2caa
|
【惊喜礼盒】提价
|
2021-06-17 15:26:10 +08:00 |
ZhangBiao
|
0b4c5f3c8f
|
【惊喜礼盒】提交
|
2021-06-16 19:56:10 +08:00 |
ZhangBiao
|
656c8b3359
|
【惊喜礼盒】提交
|
2021-06-16 11:59:52 +08:00 |
gaoxin
|
b3fca866e8
|
Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f.
|
2021-06-16 10:09:15 +08:00 |
gaoxin
|
3dc9dd5d64
|
Revert "【山河试炼】界面提交"
This reverts commit fbc5316b01.
|
2021-06-16 10:09:04 +08:00 |
zhangqiang
|
4438ad6a72
|
【跨服天梯】国内首提
|
2021-06-15 20:08:14 +08:00 |
ZhangBiao
|
fbc5316b01
|
【山河试炼】界面提交
|
2021-06-15 14:25:22 +08:00 |
ZhangBiao
|
4df5b08d1f
|
【山河试炼】开坑
|
2021-06-15 11:40:47 +08:00 |
ZhangBiao
|
6152c52f2c
|
【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容
|
2021-06-15 10:22:32 +08:00 |
JieLing
|
530374e00b
|
【资源】循环引用资源优化
|
2021-06-10 22:53:11 +08:00 |
zhangqiang
|
3506d2bb2c
|
【页签图标替换】局部 + 修行提示文字修改
|
2021-06-10 16:33:43 +08:00 |
zhangqiang
|
d91c57f6ea
|
【心魔试炼】
|
2021-06-09 19:48:28 +08:00 |
gaoxin
|
a10d34b076
|
【逐胜之巅】入口资源添加文字
|
2021-06-09 18:18:35 +08:00 |
gaoxin
|
5a54f51107
|
【主界面】逐胜之巅资源替换
|
2021-06-09 15:00:49 +08:00 |
zhangqiang
|
04fba6a182
|
【页签优化】游戏内分页签高度距离统一化
|
2021-06-09 12:32:30 +08:00 |
jiaoyangna
|
debd1f0a63
|
心愿抽卡 资源提交
|
2021-06-08 14:55:06 +08:00 |
jiaoyangna
|
54cc26cb51
|
图片替换修改提交
|
2021-06-07 16:44:42 +08:00 |
gaoxin
|
51eb62af65
|
【资源】新增一批功能提示按钮
|
2021-06-03 13:57:40 +08:00 |
gaoxin
|
d65ec0fe2a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 20:26:02 +08:00 |
gaoxin
|
4d757a84d8
|
【资源】添加逍遥游预告icon
|
2021-06-02 20:25:50 +08:00 |
jiaoyangna
|
26cd24eba1
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 20:21:33 +08:00 |
jiaoyangna
|
06cac292f2
|
每日豪礼 修改提交
|
2021-06-02 20:20:39 +08:00 |
ZhangBiao
|
4cc35be589
|
【牛气冲天】界面按钮调整
|
2021-06-02 20:11:37 +08:00 |
gaoxin
|
cf189bbbb6
|
【每日充值】文字替换
|
2021-06-02 19:45:24 +08:00 |
gaoxin
|
3f605a818b
|
【资源】修改白金框资源
|
2021-06-02 17:30:39 +08:00 |
wangzhenxing
|
aa3171aef7
|
[抽卡祈愿]======活动报错修改
|
2021-06-01 14:41:28 +08:00 |
gaoxin
|
081ff4c0d8
|
【资源】修行和困难副本预告图标上传
|
2021-05-31 19:20:37 +08:00 |
gaoxin
|
8b35b8ccf7
|
【踏碎凌霄】称号icon上传
|
2021-05-31 17:32:18 +08:00 |
jiaoyangna
|
37b818abb5
|
图片提交
|
2021-05-29 21:06:11 +08:00 |
ZhangBiao
|
5aeb2f0ed3
|
【修行】名字左侧印记提交
|
2021-05-29 18:06:15 +08:00 |
gaoxin
|
b20c824b8a
|
【资源】新增碎片框资源
|
2021-05-29 16:26:12 +08:00 |
jiaoyangna
|
d3098d3b3b
|
百寶
|
2021-05-29 15:06:31 +08:00 |
jiaoyangna
|
fb8db45fda
|
百宝商会修改提交
|
2021-05-28 18:53:54 +08:00 |
gaoxin
|
05c3f30a7f
|
【资源】主界面活动按钮优化
|
2021-05-28 15:53:40 +08:00 |
ZhangBiao
|
4af21bc33d
|
【幸运探宝】进度条奖励包装显示修改
|
2021-05-28 15:11:57 +08:00 |
wangzhenxing
|
347341ca02
|
[福利]红包修改提交
|
2021-05-28 12:36:39 +08:00 |
wangzhenxing
|
560089c1f5
|
[限时祈愿活动] 预设 协议提交
|
2021-05-28 10:58:20 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |