jiaoyangna
|
ffd7d0ecbe
|
超值返利修改提交
|
2021-12-17 16:41:08 +08:00 |
gaoxin
|
ab3d7e939b
|
【解锁提示】添加功能解锁提示
|
2021-12-26 19:12:25 +08:00 |
ZhangBiao
|
b203711459
|
Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-16 17:17:16 +08:00 |
jiaoyangna
|
11c4f914b5
|
至尊降世提交
|
2021-12-16 11:42:00 +08:00 |
ZhangBiao
|
0b190666d5
|
【商城界面】提交
|
2021-12-15 14:34:21 +08:00 |
ZhangBiao
|
b07f3ce2d5
|
【商城界面】提交
|
2021-12-14 19:16:30 +08:00 |
jiaoyangna
|
ad38176660
|
报错修改提交
|
2021-12-10 15:08:17 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
jiaoyangna
|
9b1ca0135c
|
【ID1010829】
增加开服竞技比拼活动——竞技试炼
|
2021-12-08 14:03:23 +08:00 |
jiaoyangna
|
9184852070
|
方寸寻宝添加音效
|
2021-12-07 14:41:09 +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
|
1253466912
|
天地烘炉提交
|
2021-12-02 15:18:56 +08:00 |
ZhangBiao
|
f431eea90c
|
【连购礼包】提交
|
2021-12-02 14:03:38 +08:00 |
gaoxin
|
0d1c025624
|
【活动】连续礼包,添加
|
2021-12-02 01:44:29 +08:00 |
jiaoyangna
|
f6c94a3cfe
|
变身卡详情提交
|
2021-11-26 19:36:20 +08:00 |
jiaoyangna
|
b6bcd50dd3
|
身外化身修改提交
|
2021-11-26 14:11:23 +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
|
fd22b5a87f
|
天地洪炉提交
|
2021-11-25 18:55:20 +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 |
jiaoyangna
|
db0fcea43e
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# 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/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-19 18:01:59 +08:00 |
jiaoyangna
|
4d887421ea
|
身外化身提交
|
2021-11-18 11:55:26 +08:00 |
jiaoyangna
|
e6f4e50656
|
法宝聚灵
|
2021-11-15 18:24:39 +08:00 |
ZhangBiao
|
c104bd65a7
|
【灵脉秘境】提交
|
2021-11-11 10:06:49 +08:00 |
gaoxin
|
b661b04ad1
|
【新假战斗】修复正常战斗报错,修复加战斗中主角性别错误
|
2021-11-10 13:22:32 +08:00 |
gaoxin
|
c9e2ddcaf8
|
【新假战斗】
|
2021-11-10 09:48:42 +08:00 |
ZhangBiao
|
76c3c5c0bf
|
【新·魂灵宝】提交
|
2021-11-09 14:39:27 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
jiaoyangna
|
681f8d5a57
|
神魂提交
|
2021-11-01 19:11:59 +08:00 |
gaoxin
|
0fcf94a9c8
|
【周卡】协议,界面,逻辑搭建完成
|
2021-10-29 09:42:33 +08:00 |
jiaoyangna
|
ec3cee0ebb
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-28 16:52:28 +08:00 |
ZhangBiao
|
695dd0459a
|
【周卡】
|
2021-10-28 15:22:17 +08:00 |
ZhangBiao
|
9ac870db81
|
Merge branch 'china/dev' into 0优化/界面优化
|
2021-10-28 09:34:12 +08:00 |
ZhangBiao
|
3b42cd525e
|
【三界降魔】新活动完成
|
2021-10-27 18:08:16 +08:00 |
ZhangBiao
|
26b5a670f9
|
【界面优化】背包装备优化
|
2021-10-26 14:04:02 +08:00 |
jiaoyangna
|
acc912a0e7
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.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
|
2021-10-22 15:52:33 +08:00 |
jiaoyangna
|
f5dc4a20b2
|
神魂出版提交
|
2021-10-22 15:47:59 +08:00 |
ZhangBiao
|
448ec131e8
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-10-21 13:07:13 +08:00 |
ZhangBiao
|
3293656507
|
【新百宝商会】提交
|
2021-10-21 13:06:25 +08:00 |
wangzhenxing
|
a17242b0c0
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
Assets/ManagedResources/~Lua/Data/ConfigData.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
|
2021-10-20 22:13:29 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
ZhangBiao
|
f75e42d9c9
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
|
2021-10-20 13:41:32 +08:00 |
ZhangBiao
|
2d982e67d3
|
【主角修为】提交
|
2021-10-19 15:34:43 +08:00 |
jiaoyangna
|
097d5cf1cc
|
神魂初版提交
|
2021-10-18 10:36:32 +08:00 |
ZhangBiao
|
f2b5f62ddd
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-10-09 11:00:18 +08:00 |
ZhangBiao
|
21bdecb465
|
【御剑行】提交
|
2021-10-08 20:49:25 +08:00 |
ZhangBiao
|
660a88b965
|
【御剑行】提交
|
2021-09-29 18:34:54 +08:00 |
ZhangBiao
|
422806200e
|
【御剑行】提交
|
2021-09-28 10:34:05 +08:00 |