gaoxin
|
761cdeffcf
|
【周卡】策划反馈优化
|
2021-11-15 00:03:12 +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 |
gaoxin
|
24c550cee5
|
Merge branch '0活动开发聚集地/周卡' into china/dev
# Conflicts:
# Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta
|
2021-11-03 16:09:31 +08:00 |
jiaoyangna
|
681f8d5a57
|
神魂提交
|
2021-11-01 19:11:59 +08:00 |
gaoxin
|
d23318b53d
|
【周卡】红点添加,协议修改,推送逻辑添加
|
2021-10-29 16:43:53 +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
|
79f7339a3a
|
【三界降魔】提交
|
2021-10-28 16:03:23 +08:00 |
jiaoyangna
|
7e42d14443
|
星级修改提交
|
2021-10-28 09:45:33 +08:00 |
ZhangBiao
|
3b42cd525e
|
【三界降魔】新活动完成
|
2021-10-27 18:08:16 +08:00 |
jiaoyangna
|
9f59cb3b64
|
神魂提交
|
2021-10-27 17:04:33 +08:00 |
jiaoyangna
|
d4d9b88fe7
|
神魂修改提交
|
2021-10-27 15:24:46 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +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 |
gaoxin
|
7a5f41ef46
|
【积天豪礼】分离到主城
|
2021-11-10 00:58:39 +08:00 |
wangzhenxing
|
c494145ff8
|
主角技能添加屏蔽
|
2021-10-22 10:21:07 +08:00 |
wangzhenxing
|
ae47df29bb
|
【红点】=============修行技能红点提交
|
2021-10-22 10:08:53 +08:00 |
wangzhenxing
|
fb7ad25c56
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 17:49:46 +08:00 |
wangzhenxing
|
05669fe98b
|
红点常量提交
|
2021-10-21 17:49:30 +08:00 |
ZhangBiao
|
a6ebd138e4
|
【新百宝商会】提交
|
2021-10-21 17:28:53 +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
|
6a3c9ccd25
|
【主角修为】问号提交
|
2021-10-20 18:35:30 +08:00 |
jiaoyangna
|
06a8251a40
|
神魂界面提交
|
2021-10-20 18:02:09 +08:00 |
gaoxin
|
85b15d6cb7
|
Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡
|
2021-10-20 15:14:38 +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
|
7bd64b6a13
|
Merge branch 'china/dev' into 0功能/主角修为
|
2021-10-20 13:16:07 +08:00 |
ZhangBiao
|
76cfad3419
|
【主角修为】完成提交
|
2021-10-20 13:15:31 +08:00 |
gaoxin
|
7a9cdc15b2
|
Merge branch '0功能/山河社稷图每日奖励' into china/dev
|
2021-10-19 18:02:20 +08:00 |
ZhangBiao
|
48236ba797
|
【天枢密卷】增加跳转
|
2021-10-19 10:34:45 +08:00 |
gaoxin
|
47d6de27ff
|
【山河社稷图】添加每日奖励按钮及领取逻辑添加
|
2021-10-18 18:06:47 +08:00 |
gaoxin
|
3a559c912c
|
【挚礼月卡】月卡功能数据剥离到MonthCardManager
|
2021-10-18 16:22:11 +08:00 |
ZhangBiao
|
3d0e6a4be4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-18 11:35:58 +08:00 |
jiaoyangna
|
450d426232
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-15 10:05:22 +08:00 |
ZhangBiao
|
46d38b01ec
|
【御剑行】提交
|
2021-10-14 18:02:30 +08:00 |
ZhangBiao
|
cd04fc3d37
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-14 17:11:12 +08:00 |
jiaoyangna
|
bbd9c9e1c2
|
坐骑方向调整
|
2021-10-14 16:37:09 +08:00 |
ZhangBiao
|
67026aa355
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-14 16:13:07 +08:00 |
ZhangBiao
|
8ad554a64d
|
【御剑行】提交
|
2021-10-14 16:10:54 +08:00 |
ZhangBiao
|
3d1a5ebd4c
|
【御剑行】提交
|
2021-10-14 15:30:46 +08:00 |
jiaoyangna
|
4f580146bd
|
【ID1010465】
增加白金装备图鉴
|
2021-10-14 12:01:55 +08:00 |
ZhangBiao
|
4eb6e1d9ae
|
【御剑行】提交
|
2021-10-14 11:25:44 +08:00 |
ZhangBiao
|
2101e974ad
|
【御剑行】增加投注滑动条
|
2021-10-14 09:53:51 +08:00 |
wangzhenxing
|
2237084155
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-10-12 20:08:46 +08:00 |
wangzhenxing
|
e28ca0087f
|
红点提交
|
2021-10-12 19:50:41 +08:00 |
ZhangBiao
|
9604225256
|
【御剑行】可以完成循环_提交
|
2021-10-12 17:21:46 +08:00 |
wangzhenxing
|
c4d7edc289
|
玉虚bug修改
|
2021-10-12 15:33:39 +08:00 |
ZhangBiao
|
294147b9ba
|
【御剑行】提交
|
2021-10-11 14:37:33 +08:00 |