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 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
wangzhenxing
|
19af51d38f
|
[战斗]========= 放逐后的buff刷新修改,放逐后的被动触发屏蔽,控制类buff 叠层逻辑修改
|
2021-03-26 14:40:23 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |