gaoxin
|
5d2838554d
|
Merge branch '0活动/新大圣升星' into china/dev
|
2022-01-14 14:00:20 +08:00 |
ZhangBiao
|
cc3791e0d5
|
【家园】修改到达上线提示文字、红点修改
|
2022-01-10 17:24:39 +08:00 |
gaoxin
|
dfb04baf75
|
【限时升星】添加可选择的升星有礼活动
|
2022-01-08 18:40:04 +08:00 |
ZhangBiao
|
6b1c28a920
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2022-01-06 16:40:24 +08:00 |
jiaoyangna
|
b1be355601
|
Merge branch 'tansuo' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/ExploreAtlas.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2022-01-06 16:07:59 +08:00 |
ZhangBiao
|
68ad9cf7e1
|
【家园】提交
|
2022-01-06 11:45:28 +08:00 |
ZhangBiao
|
2f03bf5ab7
|
【家园】提交
|
2022-01-05 19:12:54 +08:00 |
ZhangBiao
|
c0d27feac2
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2022-01-05 10:16:25 +08:00 |
ZhangBiao
|
19c27ae7bb
|
【家园】提交
|
2022-01-05 10:12:23 +08:00 |
ZhangBiao
|
a07fdc40ac
|
【家园】提交
|
2022-01-04 15:10:35 +08:00 |
ZhangBiao
|
27ead6dcff
|
【家园】提交
|
2021-12-31 16:30:53 +08:00 |
ZhangBiao
|
cf9cbc5ac9
|
【家园】摘星阁装备属性加持+战斗力
|
2021-12-31 13:44:11 +08:00 |
jiaoyangna
|
57b0689de6
|
【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
|
2021-12-30 18:06:36 +08:00 |
jiaoyangna
|
7b67ef38df
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-12-30 11:43:22 +08:00 |
ZhangBiao
|
44aa663ab0
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-30 11:24:38 +08:00 |
ZhangBiao
|
630d56c810
|
【家园】装备强化升级
|
2021-12-29 20:17:45 +08:00 |
jiaoyangna
|
f0a4cec767
|
【ID1010975】
【优化】超值返利每日首次登陆有红点提示
|
2021-12-29 17:10:48 +08:00 |
jiaoyangna
|
657574b61a
|
探索地图修改提交
|
2021-12-29 16:21:59 +08:00 |
jiaoyangna
|
89c298f593
|
探索地图修改提交
|
2021-12-29 16:05:16 +08:00 |
jiaoyangna
|
5c51490cf5
|
探索提交
|
2021-12-29 10:33:12 +08:00 |
ZhangBiao
|
197b28b3da
|
【家园】加速确认
|
2021-12-28 18:27:31 +08:00 |
jiaoyangna
|
978689d9a7
|
探索提交
|
2021-12-28 17:52:28 +08:00 |
jiaoyangna
|
5e75e2384e
|
探索提交
|
2021-12-28 15:31:46 +08:00 |
jiaoyangna
|
b256c7a9c5
|
探索提交
|
2021-12-28 14:50:45 +08:00 |
ZhangBiao
|
69cb591edb
|
【家园】升级进度条
|
2021-12-28 13:37:04 +08:00 |
jiaoyangna
|
9dafa85858
|
探索提交
|
2021-12-28 13:30:27 +08:00 |
ZhangBiao
|
b66cfdc61d
|
【家园】提交
|
2021-12-28 11:54:08 +08:00 |
jiaoyangna
|
d83373ecab
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
# Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/JumpViewNew.lua
# Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
|
2021-12-27 17:00:14 +08:00 |
ZhangBiao
|
337261f8b2
|
【家园】升级,取消,加速
|
2021-12-24 18:20:18 +08:00 |
jiaoyangna
|
5f9f7da264
|
探索提交
|
2021-12-24 17:49:54 +08:00 |
jiaoyangna
|
7f0e684bc0
|
一键探索修改提交
|
2021-12-24 11:18:03 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
ZhangBiao
|
6fe4e5d3f6
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 14:49:47 +08:00 |
ZhangBiao
|
f676ae8478
|
【家园】提交
|
2021-12-23 14:38:02 +08:00 |
jiaoyangna
|
7bb3325c99
|
探索提交
|
2021-12-23 13:09:34 +08:00 |
jiaoyangna
|
d2271d89b6
|
探索提交
|
2021-12-22 12:07:00 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# 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/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
ZhangBiao
|
f4b2a09f08
|
【商城界面】和信任商城
|
2021-12-17 12:08:15 +08:00 |
ZhangBiao
|
45241e1d5d
|
【商城界面】提交
|
2021-12-17 11:28:37 +08:00 |
ZhangBiao
|
5393485f65
|
【商城界面】提交
|
2021-12-16 19:22:46 +08:00 |
ZhangBiao
|
b203711459
|
Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-16 17:17:16 +08:00 |
ZhangBiao
|
c915a3b9eb
|
【协议】提交
|
2021-12-16 17:00:47 +08:00 |
ZhangBiao
|
68d6e39882
|
【协议】提交
|
2021-12-16 16:58:20 +08:00 |
ZhangBiao
|
e9954f49f2
|
【商城界面】提交
|
2021-12-16 11:59:18 +08:00 |
ZhangBiao
|
2858f2e400
|
【商城界面】提交
|
2021-12-16 10:46:11 +08:00 |
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
|
0b9bd476dd
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-13 17:26:43 +08:00 |
ZhangBiao
|
d91811a555
|
【命格】提交
|
2021-12-13 17:26:08 +08:00 |