Commit Graph

49 Commits (74c2f67d10c8c2b4ba5641c477e46f042b021485)

Author SHA1 Message Date
wangzhenxing 27bc8f5442 生命卡排序 2024-01-16 13:56:40 +08:00
wangzhenxing 7a232cc185 生命卡修改提交 2024-01-16 11:21:17 +08:00
wangzhenxing 48f78846a3 潜能修改 2024-01-11 14:04:35 +08:00
wangzhenxing 030431e3fc 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
PC-202302260912\Administrator 6d31ea6a3c 英雄图鉴显示法宝修改
(cherry picked from commit ebd474c54b)
2023-11-29 19:05:06 +08:00
wangzhenxing 1c65cd4052 法灵修改 2023-10-27 16:16:37 +08:00
wangzhenxing e795b4834b 法灵红点提交 2023-10-27 14:10:43 +08:00
wangzhenxing ed4865cc3c 法宝星级显示修改 2023-10-26 20:44:18 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
wangzhenxing ae5b5962b8 注释登录发送鸿蒙阵请求 2023-10-16 18:31:34 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +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
gaoxin 7df51e8929 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
2021-09-11 16:52:33 +08:00
zhangqiang f265cb07ef 【山河社稷图】红点帮错 公会技能属性名称修改 2021-06-02 17:39:11 +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
jiaoyangna d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
jiaoyangna fc75b356b0 公会修改 2021-02-24 10:21:44 +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 c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
zhangqiang f1a296ec06 【新战力计算】 魂印 公会技能 2021-01-25 18:14:33 +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
zhangqiang ec81feaa06 【公会技能】长按升级bug 2020-12-31 15:53:05 +08:00
zhangqiang 7402a7ce6c 【工會技能】长按升级bug 2020-12-31 15:29:08 +08:00
zhangqiang 35f211a2a4 【工会技能】 优化 连续升级 2020-12-29 16:15:11 +08:00
zhangqiang 9ecbe3b76d 【工会技能】 优化 把输出页签提前 2020-12-28 15:09:56 +08:00
zhangqiang a2bd473d75 再次修改工会技能升级 2020-08-29 16:23:31 +08:00
zhangqiang 220a8f216e 大闹天宫背景 大闹天宫女例会比例 公会技能更新战力调整位置 2020-08-29 16:15:41 +08:00
zhangqiang 6dec0b0307 修改公会技能升级 更新英雄战力 2020-08-26 20:56:28 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
zhangqiang e45e6c9325 公会技能升级优化 2020-08-04 18:37:30 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00