Commit Graph

64 Commits (74c2f67d10c8c2b4ba5641c477e46f042b021485)

Author SHA1 Message Date
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 f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
wangzhenxing 478347bc6d 战斗============================被动441修改 2023-04-04 16:27:15 +08:00
wangzhenxing 1c60b69d1a [战斗]=======================每回合添加最大buff添加数,伤害数,治疗御甲数限制 2023-02-24 11:02:14 +08:00
wangzhenxing 3782873283 公会车迟斗法修改 2023-01-12 18:20:27 +08:00
wangzhenxing ac6e551a1f 【车迟斗法】=====入口提示修改 2022-05-17 10:35:54 +08:00
wangzhenxing 46499a8401 【车迟斗法】=======屏蔽车迟斗法开服七天后才能进入 2022-05-16 16:09:21 +08:00
wangzhenxing 3e9ed638b4 [bug]=====命石描述修改,车迟开启提示修改 2022-03-29 11:54:41 +08:00
wangzhenxing 91ace072a2 [功能]=====车迟斗法开服7日后开启 2022-03-28 15:29:10 +08:00
张彪 4d97370a24 【车迟斗法】跨服 2022-03-03 16:52:08 +08:00
张彪 f0f205ca9e 【车迟斗法提交】 2022-03-03 15:14:42 +08:00
张彪 0b75ce4df4 【车迟斗法】提交 2022-03-03 14:39:24 +08:00
张彪 5a416c5149 【车迟斗法】工会界面倒计时 2022-03-03 13:30:25 +08:00
gaoxin 0db39ccbe3 Merge branch 'china/ios' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
2021-07-22 19:39:14 +08:00
ZhangBiao b0d10a29d2 【公会】公会按钮位置调整 2021-07-22 17:41:01 +08:00
ZhangBiao db258d27cb 【副本界面】调整 2021-07-22 15:13:24 +08:00
JLIOSM1 3027e991c9 【IOS提审】提审服关闭公会红包,无尽秘宝按钮显示 2021-07-21 14:55:47 +08:00
wangzhenxing 4ad64a41f2 [bug]==========福利红包红点修改 2021-06-30 18:00:52 +08:00
wangzhenxing 5bcfe86999 【公会红包】====红包刷新逻辑修改 2021-06-01 16:59:27 +08:00
wangzhenxing d821836909 福利红包修改提交 2021-05-26 16:03:28 +08:00
gaoxin 43afe3d6f1 【内存】btview可能会导致重复卸载资源的问题 2021-04-22 13:40:04 +08:00
gaoxin 30b329a837 【ios】图片回收 2021-04-21 13:12:04 +08:00
JLIOSM1 c31a82ef7f 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
zhangqiang d2ab50c096 【特权优化】公会漏提 2021-03-31 11:20:45 +08:00
gaoxin 6e34c88fa5 【人物信息栏】修复战力刷新不及时的问题 2021-03-30 20:46:47 +08:00
zhangqiang cfaeff6759 【特权优化】 vip 公会 vip 升级战力提升 2021-03-30 19:49:49 +08:00
jiaoyangna d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
jiaoyangna e4f4649cf9 文本提交 2021-02-20 18:01:57 +08:00
jiaoyangna 602dbc924c 文本还原 2021-02-20 16:43:44 +08:00
gaoxin 78e7305c15 【本地化】导出中文 2021-02-05 15:58:37 +08:00
gaoxin 927025f6de 【本地化】中文字还原,合并用 2021-02-05 12:44:50 +08:00
gaoxin adf591cbec 【本地化】lua代码还原 2021-01-27 18:16:54 +08:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 802881378c Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
2021-01-26 11:08:54 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
DESKTOP-98AVA47\Administrator 040971534e 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
ZhangBiao 0bf6e05add 【社稷大典】提交6 2020-10-24 18:58:07 +08:00
gaoxin b3d15c1945 头像特效添加 2020-09-27 16:58:10 +08:00
gaoxin 97eaf77009 主界面底部界面经验条显示调整 2020-09-01 17:12:00 +08:00
JieLing 78729f680d 修复公会界面监听事件错误,导致公会技能升级卡顿的问题 2020-08-27 14:29:14 +08:00
gaoxin fcf0557f01 修复公会boss立绘会创建多次的问题 2020-08-26 17:58:46 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
zhangqiang 1ec1329fdf 公会副本入口提交 2020-08-25 11:18:20 +08:00
zhangqiang 351c811c67 添加副本红点检测位置 2020-08-24 09:48:13 +08:00
zhangqiang 8f72af20cc 公会副本提交 达人排行修改 2020-08-22 18:03:43 +08:00
zhangqiang 869481a2cd 公会副本部分提交 2020-08-19 17:28:17 +08:00