Commit Graph

302 Commits (98e6123052373ce23d0b31e44cd30ffa0c57db2a)

Author SHA1 Message Date
zhangjiannan 19484d6b62 Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill.meta
#	Assets/ManagedResources/Icons/luofu_huobi_1.png
#	Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_2.png
#	Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_3.png
#	Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_4.png
#	Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
#	Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
2024-10-11 16:36:50 +08:00
PC-202302260912\Administrator 971ba9b2a5 替换文字 2024-09-12 19:29:03 +08:00
wangzhenxing 38a9fc2181 特训加速提交 2024-06-21 11:22:32 +08:00
wangzhenxing a578fb63ae 天下第一界面提交 2024-02-06 18:24:11 +08:00
wangzhenxing 76cd9f8354 新竞技场提交 2024-02-05 19:00:08 +08:00
xiejun e0fc4a5829 修改神印信息弹窗 2024-01-29 18:27:09 +08:00
xiejun 4e6e0f29bd 角色特训 2023-11-28 21:31:01 +08:00
xiejun 5b4dbf3c92 角色特训的数据结构和uidata 2023-11-21 17:34:34 +08:00
wangzhenxing d7c45359bb uidata 提交 2023-11-21 15:35:30 +08:00
wangzhenxing 77adfa025a 特训表提交 2023-11-17 17:41:45 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
wangzhenxing 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
wangzhenxing 1556e5c6a9 礼物合成提交 2023-09-18 17:41:06 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
wangzhenxing 18e10b4fb6 命格修改提交 2023-08-31 19:12:02 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
wangzhenxing cea83cf20a 战斗兼容老板剧情英雄释放技能 2023-06-07 16:26:57 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
yuanshuai bda6306f3d 神兵升级升星相关功能提交 2023-03-30 16:27:13 +08:00
yuanshuai 782c351cec Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua
2023-03-30 13:27:35 +08:00
yuanshuai 6c215136f2 神兵相关功能提交 2023-03-30 13:16:11 +08:00
wangzhenxing 207c1f3426 神兵信息弹窗修改提交 2023-03-29 17:21:33 +08:00
wangzhenxing c370823e04 神兵常量提交 2023-03-24 11:08:03 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +08:00
wangzhenxing 6d55ae95d7 Revert "多队塔提交"
This reverts commit 4a411833a5.
2023-03-20 11:42:40 +08:00
wangzhenxing 4a411833a5 多队塔提交 2023-03-20 11:22:44 +08:00
yuanshuai 98ddf9b5c2 法相相关脚本预设提交 2023-02-18 13:31:36 +08:00
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43:00 +08:00
yuanshuai d13e485b05 神将置换功能提交 2023-02-16 18:11:55 +08:00
yuanshuai 106c095086 宝箱红包类型道具获取概率弹窗 2022-12-07 18:26:11 +08:00
wangzhenxing 5c49a471da [gm]====送10万充提交 2022-11-28 18:40:45 +08:00
yuanshuai 45ad268ee8 神尊特权 幸运转盘 GM刷冲礼包功能优化 2022-11-03 10:57:45 +08:00
wangzhenxing 1e62991c2c [gm]=====开服冲榜提交 2022-10-31 18:13:41 +08:00
wangzhenxing ac078416dd [gm]======转盘提交 2022-10-27 15:32:13 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
wangzhenxing 436955609b 仙充直冲礼包提交 2022-10-13 14:54:03 +08:00
wangzhenxing efe732d91d [gm]=============刷冲特权提交 2022-09-23 15:24:10 +08:00
wangzhenxing a8f46604c9 [gm]======创角即送提交 2022-09-21 16:08:59 +08:00
wangzhenxing fdaec2ac28 [gm修改器]=====提交 2022-09-20 17:04:48 +08:00
wangzhenxing 5a1440cd69 [全民福利]=====提交 2022-09-15 16:48:56 +08:00
yuanshuai 23416c35cf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-09-09 18:09:59 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
wangzhenxing b6b1f53d64 [bt]=====无限资源阁提交 2022-09-09 16:45:58 +08:00
yuanshuai 96f8605bb1 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing 6925105782 [周卡]======周卡提交 2022-06-01 09:34:41 +08:00
yuanshuai 9c9018b1da 终身卡功能提交 2022-05-18 19:39:19 +08:00
yuanshuai 160d974cbc 变身卡界面调整提交 2022-04-24 22:13:28 +08:00
yuanshuai 26970aee68 身外化身功能提交 2022-04-24 16:50:24 +08:00