Commit Graph

834 Commits (c593cdf2d6982edaa6bcb6d9bf1ce6299d6d996f)

Author SHA1 Message Date
jiaoyangna 5348a49256 Revert "冲突提交"
This reverts commit b5a29c9152.
2022-03-22 11:06:54 +08:00
jiaoyangna c93b9e3f04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 18:29:21 +08:00
jiaoyangna b5a29c9152 冲突提交 2022-03-21 18:29:03 +08:00
wangzhenxing def9ca5701 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 17:38:57 +08:00
wangzhenxing 47a9fc98e3 globaldefine常量提交 2022-03-21 17:38:27 +08:00
jiaoyangna 18803bfc29 东海寻仙提交 2022-03-18 13:25:09 +08:00
jiaoyangna 31b1721510 探索提交 2022-03-17 15:21:08 +08:00
gaoxin de178b9875 【锻器阁】未解锁的功能显示未解锁提示 2022-03-11 16:36:47 +08:00
张彪 4d97370a24 【车迟斗法】跨服 2022-03-03 16:52:08 +08:00
张彪 51196cf150 【灵兽宝阁】新增几档灵兽特惠礼包界面提交 2022-02-18 15:14:25 +08:00
张彪 7083b34f51 【战力冲刺】提交 2022-02-18 14:05:59 +08:00
张彪 14af727eab 【战力冲刺】提交 2022-02-17 16:27:36 +08:00
gaoxin 2342bd8af8 【拍脸】寻仙招募拍脸添加 2022-02-23 18:08:50 +08:00
jiaoyangna 7e62f47ca8 【ID1011130】
【活动优化】超值返利
2022-02-11 11:26:34 +08:00
张彪 d1bb3391ac 【超值基金】提交 2022-01-24 17:09:55 +08:00
jiaoyangna 90c21e5a73 协议提交 2022-01-20 16:17:26 +08:00
jiaoyangna 1c24a85612 添加红点 2022-01-20 11:22:39 +08:00
jiaoyangna a797e80b39 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-19 17:47:28 +08:00
jiaoyangna a544abe9cc 众志成城 2022-01-19 17:47:07 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
wangzhenxing 4034a90a33 [飞升]======优化修改提交 2022-01-19 15:29:47 +08:00
jiaoyangna ac24c2e0ce 【ID1010998】
【春节活动】签到领奖活动
2022-01-18 14:48:27 +08:00
wangzhenxing a6e05ae8e8 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 09:53:04 +08:00
ZhangBiao 4e00c5e9c3 【名望礼包】红点 2022-01-17 14:10:08 +08:00
wangzhenxing 3311a00b91 【飞升】=======globadefine修改 2022-01-15 13:25:48 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
jiaoyangna 0323c50be5 法宝角标修改 2022-01-14 11:31:33 +08:00
jiaoyangna e4ea506ed1 神将情报修改提交 2022-01-14 10:17:19 +08:00
wangzhenxing ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
gaoxin 0ee930c550 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 14:01:01 +08:00
gaoxin 5d2838554d Merge branch '0活动/新大圣升星' into china/dev 2022-01-14 14:00:20 +08:00
jiaoyangna 041f21d530 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 12:02:20 +08:00
ZhangBiao f94e79b6e2 【百宝商会】新增跳转 2022-01-11 11:29:43 +08:00
jiaoyangna 40e37473dc 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:09:44 +08:00
gaoxin ee60ae6c9a 【限时升星】显示优化,红点添加,条件屏蔽添加 2022-01-10 11:44: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 9c874f1789 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
2022-01-06 15:38:48 +08:00
ZhangBiao 499e1d2d49 【家园】界面微调 2022-01-06 10:56:59 +08:00
ZhangBiao 893e33d920 【家园】提交 2022-01-06 10:33:08 +08:00
ZhangBiao b45f74781c 【家园】提交 2022-01-05 17:06:34 +08:00
jiaoyangna 6ca1e17d52 【ID1010994】
增加单笔充值活动
2022-01-05 15:38:02 +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 a07fdc40ac 【家园】提交 2022-01-04 15:10:35 +08:00
gaoxin c07ba438a0 【职业筛选】颜色修改 2022-01-04 14:07:15 +08:00
gaoxin 9b2057bede 【山河筛选】添加职业呼吸效果 2022-01-03 02:17:03 +08:00
ZhangBiao 2b3afae7ea 【家园】特权 2021-12-31 18:13:10 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +08:00