gaoxin
|
8d644dd080
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-25 07:58:52 +08:00 |
gaoxin
|
973eee4b30
|
【物品】添加新物品类型
|
2021-12-25 07:58:30 +08:00 |
jiaoyangna
|
0c83c3412e
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:25:44 +08:00 |
ZhangBiao
|
6e92bbd082
|
【红点】主题活动入口显示红点,签到后或领达人活动奖励后,红点消失
|
2021-12-13 11:04:27 +08:00 |
jiaoyangna
|
fe0efcb631
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 13:42:27 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
gaoxin
|
34b02496f2
|
【战斗】二倍速,三倍速解锁条件修改,跳过条件修改
|
2021-12-09 09:46:02 +08:00 |
jiaoyangna
|
9b1ca0135c
|
【ID1010829】
增加开服竞技比拼活动——竞技试炼
|
2021-12-08 14:03:23 +08:00 |
jiaoyangna
|
6036916582
|
身外化身添加跳转
|
2021-12-06 16:22:13 +08:00 |
jiaoyangna
|
2a3a22a997
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 15:43:24 +08:00 |
jiaoyangna
|
709f125845
|
商店修改
|
2021-12-06 15:43:05 +08:00 |
ZhangBiao
|
50d2066481
|
【零售特惠】跳转错误修改
|
2021-12-06 15:37:53 +08:00 |
jiaoyangna
|
6309159f77
|
方寸寻宝修改提交
|
2021-12-06 09:58:04 +08:00 |
ZhangBiao
|
7348534847
|
【去除多余活动信息】
|
2021-12-03 16:46:40 +08:00 |
ZhangBiao
|
8e7afd757d
|
【连购礼包】提交
|
2021-12-03 13:21:15 +08:00 |
ZhangBiao
|
55f2e6e783
|
Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-12-02 17:16:00 +08:00 |
jiaoyangna
|
43d40d90e1
|
【ID1019316】
【神将归元】7星玉帝归元弹窗显示5星,实际只是显示问题
|
2021-12-02 15:55:08 +08:00 |
jiaoyangna
|
1253466912
|
天地烘炉提交
|
2021-12-02 15:18:56 +08:00 |
ZhangBiao
|
f431eea90c
|
【连购礼包】提交
|
2021-12-02 14:03:38 +08:00 |
ZhangBiao
|
65461a4014
|
【灵兽特惠】跳转错误修改
|
2021-11-29 16:35:40 +08:00 |
wangzhenxing
|
1eb6115bc9
|
[角色朝向]=======立绘朝向修改
|
2021-11-29 13:21:23 +08:00 |
gaoxin
|
0efa821585
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-02 01:44:34 +08:00 |
gaoxin
|
0d1c025624
|
【活动】连续礼包,添加
|
2021-12-02 01:44:29 +08:00 |
jiaoyangna
|
9a61491b90
|
资源条修改提交
|
2021-11-27 18:28:11 +08:00 |
jiaoyangna
|
0c6ff17ddd
|
修改提交
|
2021-11-27 14:30:51 +08:00 |
wangzhenxing
|
a6bf54daaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 17:08:20 +08:00 |
jiaoyangna
|
2814265ba7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 17:06:24 +08:00 |
jiaoyangna
|
5542212cc1
|
天地烘炉提交
|
2021-11-26 17:04:54 +08:00 |
wangzhenxing
|
13e0ab29ba
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 16:56:01 +08:00 |
wangzhenxing
|
69e30d908c
|
[立绘朝向]===============我方立绘展示朝向修改
|
2021-11-26 16:55:13 +08:00 |
gaoxin
|
efe08520b9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 14:28:04 +08:00 |
gaoxin
|
62097d4d05
|
【红包】时间显示方法修改
|
2021-11-26 14:26:04 +08:00 |
jiaoyangna
|
b6bcd50dd3
|
身外化身修改提交
|
2021-11-26 14:11:23 +08:00 |
jiaoyangna
|
14b54c7d5e
|
变身卡名字颜色修改
|
2021-11-26 13:18:45 +08:00 |
jiaoyangna
|
2212df06ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:39:24 +08:00 |
jiaoyangna
|
1e17151d7f
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-11-26 11:35:57 +08:00 |
jiaoyangna
|
964a1b4fde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:34:57 +08:00 |
jiaoyangna
|
c0c8a6710c
|
身外化身提交
|
2021-11-26 11:08:48 +08:00 |
gaoxin
|
3a574880ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 10:19:35 +08:00 |
gaoxin
|
ad3ca2e0d2
|
【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型
|
2021-11-26 10:19:29 +08:00 |
jiaoyangna
|
34949242a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-11-25 18:57:48 +08:00 |
jiaoyangna
|
fd22b5a87f
|
天地洪炉提交
|
2021-11-25 18:55:20 +08:00 |
ZhangBiao
|
a8f666e901
|
【删除活动类型43】
|
2021-11-25 17:27:02 +08:00 |
ZhangBiao
|
cb331c612e
|
【删除活动类那个43】
|
2021-11-25 16:51:35 +08:00 |
jiaoyangna
|
a248330241
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
|
2021-11-25 16:10:14 +08:00 |
ZhangBiao
|
8da0a81588
|
【寻仙抽】提交
|
2021-11-25 15:59:31 +08:00 |
ZhangBiao
|
e4b0fd1824
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 18:14:37 +08:00 |
ZhangBiao
|
ac768ff163
|
【常驻活动】提交
|
2021-11-24 18:14:25 +08:00 |
gaoxin
|
4607bd2fed
|
Merge branch '0功能/账号id校验' into china/dev
|
2021-11-24 16:03:34 +08:00 |
ZhangBiao
|
aa52131d3f
|
【灵脉秘境】文字遮挡、跳转
|
2021-11-22 13:27:54 +08:00 |