root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,906 Commits
38 Branches
2218 Tags
31 GiB
Commit Graph

199 Commits (436955609b8e10cd93fdda989eea9b49c1a38b6d)

Author SHA1 Message Date
wangzhenxing 5a1440cd69 [全民福利]=====提交 2022-09-15 16:48:56 +08:00
wangzhenxing 66664bd3e2 [心愿抽卡]=======预设修改提交 2022-07-12 14:26:32 +08:00
wangzhenxing 396ca1a425 [洞府]=======洞府特权修改 2022-06-10 14:42:35 +08:00
wangzhenxing e509483e41 [寻仙招募]=====预设修改 2022-05-23 15:30:58 +08:00
luyao 25ee0998e7 一键探索 按钮背景更换 2022-04-28 20:05:23 +08:00
luyao e810e85e5e 洞府界面。升级按钮 背景修改 2022-04-28 19:35:57 +08:00
wangzhenxing 81122369c6 bug修改提交 2022-04-26 16:09:21 +08:00
wangzhenxing 7cdf302e90 神印修改提交 2022-04-24 14:20:11 +08:00
wangzhenxing df42d22d4c 公用背景预设修改提交 2022-04-22 14:07:30 +08:00
wangzhenxing e4de85a120 tips背景修改，公用弹窗背景显示修改 2022-04-22 13:09:45 +08:00
wangzhenxing 9999138d97 [资源]=======新提示背景框提交 2022-04-21 13:41:59 +08:00
wangzhenxing 4bb0977391 [bug]=======bug修改预设提交 2022-04-02 14:33:08 +08:00
wangzhenxing eff2800c35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-31 09:51:26 +08:00
wangzhenxing 57812ad22f [功能]=======命石修改，建木神树修改 2022-03-29 15:28:56 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
wangzhenxing 7de5fdac9e [飞升]=====特效问题修改 2022-01-20 17:58:57 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
jiaoyangna 76295739f3 【ID1019513】 
【品质调整】神将技能弹窗，不关闭也可以点返回
 2022-01-18 15:01:01 +08:00
ZhangBiao 54aeaa2ea8 【寻仙招募】提交 2022-01-18 12:09:43 +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
ZhangBiao cbea9006b3 【家园】资源替换 2022-01-14 17:38:46 +08:00
jiaoyangna 3f267894a8 神将修改提交 2022-01-14 16:14:52 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
wangzhenxing ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
ZhangBiao d0bdfb935c 【家园】特权增加文字提示条目 2022-01-11 13:25:18 +08:00
gaoxin 963591b530 【动画】修复动画导致部分列表显示错误 2022-01-07 18:21:10 +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
jiaoyangna f3349ca4d1 【ID1010966】 
【优化】法宝聚灵调整
 2022-01-06 15:18:30 +08:00
jiaoyangna 79364232f0 【ID1010966】 
【优化】法宝聚灵调整
 2022-01-06 14:52:02 +08:00
ZhangBiao 68ad9cf7e1 【家园】提交 2022-01-06 11:45:28 +08:00
ZhangBiao 893e33d920 【家园】提交 2022-01-06 10:33:08 +08:00
ZhangBiao 6f4942e87e 【家园】提交 2022-01-05 16:21:20 +08:00
ZhangBiao f0de43aad2 【家园】提交 2022-01-05 14:17:53 +08:00
jiaoyangna e079eff322 适配修改提交 2022-01-04 15:42:06 +08:00
ZhangBiao a07fdc40ac 【家园】提交 2022-01-04 15:10:35 +08:00
jiaoyangna ebc67f1602 战力修改提交 2022-01-04 14:21:54 +08:00
ZhangBiao 2b3afae7ea 【家园】特权 2021-12-31 18:13:10 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +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
jiaoyangna 73eebe80e0 探索提交 2021-12-29 14:33:19 +08:00
jiaoyangna 32cc5de541 探索提交 2021-12-29 14:30:02 +08:00
jiaoyangna 4e4ebd563c 探索提交 2021-12-29 14:24:44 +08:00
gaoxin d659eeba39 【动画】排行，邮件界面动画优化，部分简介界面动画关闭 2021-12-31 04:32:09 +08:00
gaoxin e90f96705d 【动画】通用弹窗动画优化 2021-12-30 22:08:29 +08:00
jiaoyangna 5c51490cf5 探索提交 2021-12-29 10:33:12 +08:00
jiaoyangna d06a5e6471 探索提交 2021-12-28 18:16:28 +08:00
jiaoyangna 978689d9a7 探索提交 2021-12-28 17:52:28 +08:00