Commit Graph

273 Commits (b00f8742369b91ba7781af8b6e3182b3a851a15b)

Author SHA1 Message Date
wangzhenxing 9c1823a57b 装备抽卡修改提交 2023-10-27 20:58:24 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
wangzhenxing ac172339ae 心愿抽卡修改提交 2023-05-27 19:04:30 +08:00
wangzhenxing ba747f657a 神印升品空白修改 2023-01-24 20:29:23 +08:00
wangzhenxing 19ce8e51d5 英雄升星扩展 2022-11-03 14:33:09 +08:00
wangzhenxing 4ef723e229 [神印]====显示修改 2022-05-05 11:52:48 +08:00
wangzhenxing 81122369c6 bug修改提交 2022-04-26 16:09:21 +08:00
wangzhenxing 7cdf302e90 神印修改提交 2022-04-24 14:20:11 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
wangzhenxing 9a2f342ef7 【功能】======寻仙招募优化 2022-04-01 17:10:37 +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 24475514b9 【bug】======命石属性描述修改 2022-03-29 13:39:05 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
张彪 62d9d6da20 【易经宝库】最终大奖显示特效 2022-03-02 16:10:06 +08:00
张彪 ee77648eb1 【寻仙招募】奖励预览报错 2022-03-02 13:39:40 +08:00
jiaoyangna 8d196f6759 天地洪炉心愿修改提交 2022-02-08 17:50:09 +08:00
张彪 e257033ea6 【天地洪炉】增加白金品质宝物碎片 2022-02-08 14:06:25 +08:00
ZhangBiao 6e10183d80 【命格】命石合成显示调整 2022-01-22 10:13:43 +08:00
wangzhenxing b18db8765d [飞升]=====飞升特效修改提交 2022-01-21 17:09:14 +08:00
wangzhenxing b64234bcb8 [飞升]=====特效修改提交 2022-01-20 18:18:40 +08:00
wangzhenxing 7de5fdac9e [飞升]=====特效问题修改 2022-01-20 17:58:57 +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 369f7aa1ef 【点将台】选择心愿神将,列表动画不正常 2022-01-17 14:26:17 +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
wangzhenxing 853fde91b2 [飞升]============飞升修改提交 2022-01-15 12:26:12 +08:00
jiaoyangna 3369bcc73c 心愿修改提交 2022-01-14 18:40:00 +08:00
jiaoyangna c11db3056f 神将修改 2022-01-14 17:13:36 +08:00
jiaoyangna d6521af965 许愿神将边框修改 2022-01-14 15:52:16 +08:00
ZhangBiao 898f88a0b9 【寻仙招募】修改奖励显示内容 2022-01-13 16:03:20 +08:00
ZhangBiao 2599afd6de 【寻仙招募】心愿选飞升石,查看奖励报错 2022-01-13 15:28:09 +08:00
wangzhenxing ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
ZhangBiao 2455410a0c 【命格】镶嵌按钮显示穿戴 2022-01-10 15:29:37 +08:00
wangzhenxing 1b39fbdbe9 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
ZhangBiao 54b01f4d86 【家园+易经宝库】提交 2022-01-06 18:42:20 +08:00
ZhangBiao e0c228bf3f 【易经宝库】提交 2022-01-06 18:27:09 +08:00
ZhangBiao 956826c46a 【家园】摘星阁提交 2022-01-06 17:53:53 +08:00
jiaoyangna 79364232f0 【ID1010966】
【优化】法宝聚灵调整
2022-01-06 14:52:02 +08:00
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
wangzhenxing 380b0bdb78 [飞升]=============飞升代码提交 2021-12-27 16:39:38 +08:00
ZhangBiao 745a9d1dae Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-20 14:07:56 +08:00
jiaoyangna b7b71930f5 进阶预览黑屏修改提交 2021-12-20 11:33:36 +08:00
jiaoyangna bf73593d04 进阶预览提交 2021-12-20 11:32:23 +08:00
ZhangBiao 08806bc18f 【寻仙招募】改为常驻后,奖励中的概率有效期去掉 2021-12-17 17:20:13 +08:00
ZhangBiao e1a9459101 【命格】提交 2021-12-14 16:17:49 +08:00
ZhangBiao d91811a555 【命格】提交 2021-12-13 17:26:08 +08:00
ZhangBiao c11848b98a 【命格】红点提交 2021-12-10 18:27:43 +08:00
ZhangBiao 9140a632f9 【命格】提交 2021-12-10 14:57:23 +08:00
ZhangBiao 982137c9b7 【命格】提交 2021-12-10 14:14:08 +08:00