jiaoyangna
|
16ca4f84d6
|
太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
|
2021-08-23 14:27:41 +08:00 |
jiaoyangna
|
ca656636ac
|
太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
|
2021-08-23 14:09:43 +08:00 |
jiaoyangna
|
5c4696ad6c
|
太初秘卷修改提交
|
2021-08-12 17:32:34 +08:00 |
jiaoyangna
|
a5af78f2c9
|
主城界面修改
|
2021-08-12 12:00:36 +08:00 |
jiaoyangna
|
792b533fa0
|
太初秘卷修改提交
|
2021-08-12 11:02:21 +08:00 |
jiaoyangna
|
b83ee5e000
|
太初秘卷修改
|
2021-08-11 17:14:20 +08:00 |
jiaoyangna
|
c3d45f1316
|
【ID1010059】
【新功能】太初密卷
|
2021-08-11 15:15:41 +08:00 |
zhangqiang
|
0de6e3f63a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-03 11:00:06 +08:00 |
zhangqiang
|
8ef10cb100
|
【主城小人层级】
|
2021-08-03 10:59:41 +08:00 |
ZhangBiao
|
fef7ea4d0b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-03 10:39:57 +08:00 |
ZhangBiao
|
53dc964596
|
【十绝阵】主界面倒计时超框修改
|
2021-08-03 10:39:40 +08:00 |
zhangqiang
|
3c899d20d5
|
【主城】主城小人层级错误
|
2021-08-03 10:36:55 +08:00 |
zhangqiang
|
acf647d9c5
|
【罗浮争锋】
|
2021-07-31 17:20:07 +08:00 |
zhangqiang
|
c0243afe6c
|
【跨服分组】推送
|
2021-07-30 15:14:52 +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 |
gaoxin
|
f5584b0fbe
|
【巅峰赛】添加未开放状态兼容处理
|
2021-07-29 20:00:02 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +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 |
jiaoyangna
|
24363d5c03
|
【ID1009862】
15日登录送白泽活动加入预告功能
|
2021-07-24 15:46:00 +08:00 |
wangzhenxing
|
3dc2970f1f
|
[功能]============15日登陆预告预设修改,整点自动刷新
|
2021-07-23 16:27:33 +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 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +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 |
DESKTOP-98AVA47\Administrator
|
0aa779f177
|
添加左右切换按钮
|
2021-07-16 14:18:25 +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
|
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
|
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
|
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
|
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
|
dc363d25c4
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit 9e1366ff27 )
|
2021-07-14 17:00:14 +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
|
f1a7e93595
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit ff8d774c2f )
|
2021-07-14 16:57:15 +08:00 |
jiaoyangna
|
9e1366ff27
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 15:05:04 +08:00 |
jiaoyangna
|
53e0f1adcc
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 12:04:37 +08:00 |
ZhangBiao
|
55f71e2c89
|
Revert "Revert "【山河试炼】增加主城红点检测""
This reverts commit 67e44741f6 .
|
2021-07-14 11:36:55 +08:00 |
ZhangBiao
|
c8b8a84d47
|
【山河试炼】差红点检测
|
2021-07-14 11:36:33 +08:00 |
jiaoyangna
|
9f4d456004
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-13 17:25:21 +08:00 |
jiaoyangna
|
ff8d774c2f
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-12 18:06:06 +08:00 |
jiaoyangna
|
fe5fc7fa68
|
【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置
(cherry picked from commit 7c960704aa )
|
2021-07-09 18:02:08 +08:00 |
jiaoyangna
|
7c960704aa
|
【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置
|
2021-07-09 18:01:41 +08:00 |
jiaoyangna
|
30ab410f00
|
抽卡优化
|
2021-07-08 18:40:43 +08:00 |
zhangqiang
|
7c7e0970a2
|
【跨服天梯】国内提交替换资源 。。。。
|
2021-07-08 10:36:33 +08:00 |
ZhangBiao
|
3764ac753b
|
【新副本】界面时间显示调整
|
2021-07-08 10:15:39 +08:00 |
ZhangBiao
|
e64223b78b
|
【副本】新界面提交
|
2021-07-06 16:30:58 +08:00 |
ZhangBiao
|
5173faa482
|
【主界面】右侧伸缩条
|
2021-07-05 11:28:18 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
ZhangBiao
|
53567ea586
|
【Log】清除带颜色的Log
|
2021-07-01 16:33:40 +08:00 |
ZhangBiao
|
47f6335b55
|
Merge branch 'china/dev' into 0活动开发聚集地/特惠神装
|
2021-07-01 14:44:48 +08:00 |
ZhangBiao
|
dc4581433e
|
【主城】右侧下拉调修复
|
2021-07-01 14:43:14 +08:00 |
ZhangBiao
|
04d4f6a5c3
|
【特惠神装】开坑
|
2021-06-30 13:26:34 +08:00 |
jiaoyangna
|
de0b9be884
|
添加首充和至尊降世的 显示
|
2021-06-30 11:36:07 +08:00 |
gaoxin
|
e46c1eb833
|
【GM】演算后端战斗接口添加GM地址配置
|
2021-06-28 11:50:10 +08:00 |
jiaoyangna
|
10e4552c4f
|
Merge branch 'china/dev-c' into 0功能/玲珑宝镜
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-06-28 10:31:22 +08:00 |
zhangqiang
|
c7f8a84c99
|
【特效】主城/挂机界面自己小人脚底添加光圈
|
2021-06-24 16:15:39 +08:00 |
ZhangBiao
|
fe16795d8c
|
【主城】右上伸缩条闪烁修改
|
2021-06-21 16:57:22 +08:00 |
jiaoyangna
|
e562176180
|
超凡入圣提交
|
2021-06-18 18:24:04 +08:00 |
jiaoyangna
|
bc20fa57fc
|
惊喜礼包推送修改提交
|
2021-06-17 15:05:44 +08:00 |
ZhangBiao
|
0b4c5f3c8f
|
【惊喜礼盒】提交
|
2021-06-16 19:56:10 +08:00 |
gaoxin
|
a4fa7cacff
|
Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f .
|
2021-06-16 10:08:41 +08:00 |
gaoxin
|
67e44741f6
|
Revert "【山河试炼】增加主城红点检测"
This reverts commit e0e8974850 .
|
2021-06-16 10:08:34 +08:00 |
ZhangBiao
|
e0e8974850
|
【山河试炼】增加主城红点检测
|
2021-06-15 20:39:05 +08:00 |
ZhangBiao
|
160a3e1a6f
|
【山河试炼】差红点的检测
|
2021-06-15 20:33:22 +08:00 |
zhangqiang
|
4438ad6a72
|
【跨服天梯】国内首提
|
2021-06-15 20:08:14 +08:00 |
jiaoyangna
|
f45fa022ea
|
玲珑宝镜修改提交
|
2021-06-15 11:41:37 +08:00 |
gaoxin
|
07a35aec13
|
【幸运探宝】按钮位置修改
|
2021-06-09 20:20:16 +08:00 |
zhangqiang
|
04fba6a182
|
【页签优化】游戏内分页签高度距离统一化
|
2021-06-09 12:32:30 +08:00 |
wangzhenxing
|
0f8ce2017f
|
[bug]=========【ID1016289】
【称号】唯我独尊这类称号位置需要调整
|
2021-06-09 11:24:58 +08:00 |
ZhangBiao
|
6c31fa860d
|
【右上角活动】红点修改
|
2021-06-07 13:32:01 +08:00 |
ZhangBiao
|
a96a61ec77
|
【逐胜之巅】入口调整至左侧
|
2021-06-07 11:18:37 +08:00 |
ZhangBiao
|
d744c010bf
|
【主城】红点
|
2021-06-05 11:14:36 +08:00 |
gaoxin
|
079afb4e8d
|
Revert "【Debug】红点不消失问题debug日志添加"
This reverts commit d20e47535e .
|
2021-06-03 22:37:30 +08:00 |
gaoxin
|
d20e47535e
|
【Debug】红点不消失问题debug日志添加
|
2021-06-03 19:50:02 +08:00 |
gaoxin
|
39fd13b7dc
|
【称号】主城他人称号特效不显示的问题
|
2021-06-03 14:01:39 +08:00 |
wangzhenxing
|
200e48ed73
|
[称号]=====称号高度设置
|
2021-06-03 11:23:05 +08:00 |
wangzhenxing
|
9bd4103768
|
【称号】====称号特效显示修改提交
|
2021-06-02 18:26:31 +08:00 |
ZhangBiao
|
592fad463d
|
【玉皇大帝】入口顯示
|
2021-06-02 15:12:44 +08:00 |
ZhangBiao
|
a6c7de8151
|
【主界面】成长礼包入口提交
|
2021-06-02 14:56:09 +08:00 |
ZhangBiao
|
0798248214
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 14:50:26 +08:00 |
ZhangBiao
|
e1145deced
|
【玉皇大帝入口】如果购买完成长礼包,就不显示
|
2021-06-02 14:50:18 +08:00 |
wangzhenxing
|
6d41cde054
|
[称号]=======称号无法卸下修改提交,称号高度修改
|
2021-06-02 14:47:54 +08:00 |
gaoxin
|
4eea852340
|
【称号】修复主界面称号偶现没有特效的问题,聊天界面称号逻辑修改
|
2021-06-02 14:34:51 +08:00 |
ZhangBiao
|
7679f85af3
|
【修行】图标调整
|
2021-06-02 11:08:24 +08:00 |
gaoxin
|
39bb3d5c06
|
【称号】修改称号节点为通用节点
|
2021-06-01 21:13:03 +08:00 |
gaoxin
|
58faec4feb
|
【红点】主界面鸿蒙阵红点没有清除
|
2021-06-01 15:44:18 +08:00 |
jiaoyangna
|
8f31b07d52
|
主城百宝时间修改提交
|
2021-06-01 14:54:46 +08:00 |
ZhangBiao
|
bfd8bee59e
|
【青龙秘宝】刷新不及时修改
|
2021-05-31 20:09:19 +08:00 |
ZhangBiao
|
19bce27f34
|
【修行】提交3
|
2021-05-29 19:58:52 +08:00 |
ZhangBiao
|
717b0039cb
|
【修行】印记提交2
|
2021-05-29 19:49:25 +08:00 |
ZhangBiao
|
1d4842a7d6
|
【修行】印记提交
|
2021-05-29 19:32:47 +08:00 |
ZhangBiao
|
749184a59a
|
【修行】提交
|
2021-05-29 19:22:35 +08:00 |
ZhangBiao
|
4cfff84328
|
【修行】印记提交
|
2021-05-29 19:14:24 +08:00 |
ZhangBiao
|
5aeb2f0ed3
|
【修行】名字左侧印记提交
|
2021-05-29 18:06:15 +08:00 |
zhangqiang
|
78ece97bfd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:54:30 +08:00 |
zhangqiang
|
1dc1ad1db1
|
【幸运探宝】加标签
|
2021-05-28 15:54:20 +08:00 |
ZhangBiao
|
3c67b0b8f3
|
【主城】icon问题调整
|
2021-05-28 15:35:02 +08:00 |