gaoxin
|
0458ee7bf7
|
【debug】修复部分报错导致报错的问题。。。
|
2021-06-10 16:11:02 +08:00 |
gaoxin
|
930a16b2e7
|
【sdk】登录参数空值处理
|
2021-06-09 17:13:37 +08:00 |
jiaoyangna
|
bf5c4197ce
|
【ID1009418】
【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面
|
2021-06-09 11:03:18 +08:00 |
jiaoyangna
|
d91a94d309
|
【ID1009380】
【公会】公会信息弹窗上添加【?】按钮
|
2021-06-08 20:47:03 +08:00 |
gaoxin
|
c2961f8f2d
|
【sdk登录】新增两个参数extData 和 p_appId 草花渠道使用
|
2021-06-08 17:27:24 +08:00 |
gaoxin
|
b95a511dc2
|
【log】manager lateupdate 报错添加一些提示
|
2021-06-07 10:38:47 +08:00 |
gaoxin
|
746e92f23d
|
【战斗】日常副本,无尽副本,山河社稷图战斗背景修改
|
2021-06-04 15:01:48 +08:00 |
gaoxin
|
4077e33390
|
【红点】箭头红点不消失修复
|
2021-06-03 19:30:57 +08:00 |
wangzhenxing
|
9c3f1cb5eb
|
[称号]====挂机界面特效显示修改,称号位置修改
|
2021-06-03 15:52:12 +08:00 |
wangzhenxing
|
2cde942f47
|
[限时祈愿]=====红点逻辑修改
|
2021-06-03 12:04:04 +08:00 |
wangzhenxing
|
6e2e88a930
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 18:26:56 +08:00 |
wangzhenxing
|
9bd4103768
|
【称号】====称号特效显示修改提交
|
2021-06-02 18:26:31 +08:00 |
gaoxin
|
3f605a818b
|
【资源】修改白金框资源
|
2021-06-02 17:30:39 +08:00 |
jiaoyangna
|
259155fe52
|
【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
|
2021-06-01 16:53:08 +08:00 |
wangzhenxing
|
5ec2c38563
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-31 18:02:05 +08:00 |
wangzhenxing
|
db6f172f70
|
[显示抽卡活动]============抽卡活动类型常量修改
|
2021-05-31 18:01:37 +08:00 |
ZhangBiao
|
9ebd4c5e05
|
【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面
|
2021-05-31 18:00:42 +08:00 |
gaoxin
|
928a64f435
|
【物品】添加一个碎片类型
|
2021-05-31 10:37:50 +08:00 |
zhangqiang
|
f7be239ea7
|
【踏碎凌霄】排行榜
|
2021-05-29 18:37:45 +08:00 |
gaoxin
|
74d2dcfcbf
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 16:03:12 +08:00 |
gaoxin
|
9c0de19fd0
|
【注释】接口描述优化
|
2021-05-28 16:02:47 +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 |
wangzhenxing
|
2526371970
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:09:29 +08:00 |
wangzhenxing
|
510b2460ea
|
[限时祈愿] 活动奖励界面提交
|
2021-05-28 15:09:18 +08:00 |
gaoxin
|
9cce82f017
|
【SpriteLoader】修改初始化位置,兼容老包
|
2021-05-28 14:34:01 +08:00 |
zhangqiang
|
8dbf142b74
|
【踏碎凌霄】排行榜添加
|
2021-05-28 14:05:17 +08:00 |
wangzhenxing
|
2a21b80147
|
[限时祈愿]弹窗界面id修改
|
2021-05-28 11:05:50 +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 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
jiaoyangna
|
cde2379d78
|
常量重复修改
|
2021-05-27 22:43:50 +08:00 |
jiaoyangna
|
1e247043ac
|
Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-27 19:42:22 +08:00 |
jiaoyangna
|
f49cefd6b3
|
战斗结算修改
|
2021-05-27 11:23:38 +08:00 |
jiaoyangna
|
da6437e2a2
|
无尽提交
|
2021-05-27 10:46:22 +08:00 |
zhangqiang
|
f758982d32
|
【山河社稷图】跳转
|
2021-05-27 09:50:11 +08:00 |
DESKTOP-98AVA47\Administrator
|
1f75672cb8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 18:15:45 +08:00 |
DESKTOP-98AVA47\Administrator
|
0ad3913381
|
红点修改提交
|
2021-05-26 18:15:37 +08:00 |
ZhangBiao
|
f186f29646
|
提交
|
2021-05-26 14:44:22 +08:00 |
jiaoyangna
|
c95211428b
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-26 11:55:14 +08:00 |
zhangqiang
|
da9aeed441
|
【心魔试炼】提交
|
2021-05-26 11:48:44 +08:00 |
ZhangBiao
|
f38620058c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 21:09:43 +08:00 |
ZhangBiao
|
9e6dc29cb9
|
【主界面】右上伸缩条红点
|
2021-05-25 21:08:48 +08:00 |
zhangqiang
|
fcc00ee1d7
|
【心魔试炼】提交
|
2021-05-25 20:50:23 +08:00 |
zhangqiang
|
dfa198081a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 14:51:58 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +08:00 |
wangzhenxing
|
32b28f03eb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 11:15:04 +08:00 |
wangzhenxing
|
1e82024f29
|
添加弹窗类型
|
2021-05-25 11:14:50 +08:00 |
ZhangBiao
|
a22a984c61
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 10:16:17 +08:00 |
ZhangBiao
|
cecea9b415
|
【修行】主界面 修行提交 1
|
2021-05-25 10:16:07 +08:00 |
gaoxin
|
caa32bac70
|
【红包】消息删除空格
|
2021-05-25 10:00:42 +08:00 |